diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 2e6ff3701..034e4968b 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -19,7 +19,7 @@ import com.fr.general.ComparatorUtils; import com.fr.general.FRLogFormatter; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.general.xml.GeneralXMLTools; import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; @@ -205,7 +205,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } String installHome = StableUtils.getInstallHome(); if (installHome != null && !".".equals(installHome)) { - String name = Inter.getLocText("FR-Engine_DEFAULT"); + String name = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_DEFAULT"); String envPath = designerEnvManager.getDefaultenvPath(installHome); designerEnvManager.putEnv(name, LocalDesignerWorkspaceInfo.create(name, envPath)); designerEnvManager.setCurEnvName(name); @@ -507,7 +507,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { return env; } } - String name = Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}); + String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default"); LocalDesignerWorkspaceInfo newDefaultEnv = LocalDesignerWorkspaceInfo.create(name, defaultenvPath); this.putEnv(name, newDefaultEnv); return newDefaultEnv; @@ -530,7 +530,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } } } - return Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default"); } @@ -1459,7 +1459,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { if ((tmpVal = reader.getAttrAsString("webinfLocation", null)) != null) { // marks:兼容6.1的 // marks:设置默认的目录. - String curReportServerName = Inter.getLocText("Server-Embedded_Server"); + String curReportServerName = com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server"); LocalDesignerWorkspaceInfo reportServer = LocalDesignerWorkspaceInfo.create(curReportServerName, tmpVal); this.putEnv(curReportServerName, reportServer); diff --git a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java index a470673a0..a90f7923c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java @@ -6,7 +6,7 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.designer.TargetComponent; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.*; -import com.fr.general.Inter; + /** * Author : daisy @@ -17,7 +17,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction { public ExitAuthorityEditAction(TargetComponent t) { super(t); - this.setName(Inter.getLocText(new String[]{"Exit", "DashBoard-Potence", "Edit"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png")); } diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java index f9c6923af..1cd5f115b 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -44,7 +44,7 @@ public class BBSAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -61,7 +61,7 @@ public class BBSAction extends UpdateAction @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_BBS"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BBS"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java index 7f6548ca4..c446caa6d 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java @@ -5,7 +5,7 @@ import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.general.CloudCenter; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0) try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -52,7 +52,7 @@ public void actionPerformed(ActionEvent arg0) @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_BUG"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BUG"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java index 68ff2fde0..552923b5f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java @@ -5,7 +5,7 @@ import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.general.CloudCenter; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -39,7 +39,7 @@ public class NeedAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -57,7 +57,7 @@ public class NeedAction extends UpdateAction @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_NEED"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_NEED"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java index d94a6e07c..0b6d33ee1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java @@ -5,7 +5,7 @@ import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.general.CloudCenter; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -38,7 +38,7 @@ public void actionPerformed(ActionEvent arg0) try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -56,7 +56,7 @@ public void actionPerformed(ActionEvent arg0) @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_QUESTIONS"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_QUESTIONS"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java index eaa1b2ef6..2e4c5142f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -39,7 +39,7 @@ public class SignAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -57,7 +57,7 @@ public class SignAction extends UpdateAction @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_SIGN"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_SIGN"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java index 83041d888..024039ee5 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -39,7 +39,7 @@ public class UpAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -57,7 +57,7 @@ public class UpAction extends UpdateAction @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_UPDATE"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_UPDATE"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java index 4040c514f..17d45f029 100644 --- a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -45,7 +45,7 @@ public class VideoAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -63,7 +63,7 @@ public class VideoAction extends UpdateAction @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_VIDEO"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_VIDEO"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java index b3a932ba5..2b02d75eb 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java @@ -6,7 +6,7 @@ package com.fr.design.actions.edit; import com.fr.base.BaseUtils; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.designer.TargetComponent; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.KeyEvent; @@ -20,7 +20,7 @@ public class CopyAction extends TemplateComponentAction { public CopyAction(TargetComponent t) { super(t); - this.setName(Inter.getLocText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)); diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java index f33e7328a..0c668c8c6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java @@ -10,7 +10,7 @@ import javax.swing.KeyStroke; import com.fr.base.BaseUtils; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.designer.TargetComponent; -import com.fr.general.Inter; + import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -24,7 +24,7 @@ public class CutAction extends TemplateComponentAction { public CutAction(TargetComponent t) { super(t); - this.setName(Inter.getLocText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)); diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java index 0406bacbc..5f88504b6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java @@ -10,7 +10,7 @@ import javax.swing.KeyStroke; import com.fr.base.BaseUtils; import com.fr.design.actions.TemplateComponentAction; import com.fr.design.designer.TargetComponent; -import com.fr.general.Inter; + import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -24,7 +24,7 @@ public class PasteAction extends TemplateComponentAction { public PasteAction(TargetComponent t) { super(t); - this.setName(Inter.getLocText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); this.setMnemonic('P'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)); diff --git a/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java index 53606a136..d483df5a7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java @@ -7,7 +7,7 @@ import java.awt.event.ActionEvent; import com.fr.design.actions.JTemplateAction; import com.fr.design.mainframe.JTemplate; -import com.fr.general.Inter; + /** * Close Report. @@ -19,7 +19,7 @@ public class CloseTemplateAction extends JTemplateAction> { public CloseTemplateAction(JTemplate jt) { super(jt); - this.setName(Inter.getLocText("M-Close_Template")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M-Close_Template")); this.setMnemonic('C'); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java index 687a2b67c..a4bf798f2 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java @@ -4,14 +4,14 @@ import java.awt.event.ActionEvent; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.TemplatePane; -import com.fr.general.Inter; + public class EditEnvAction extends UpdateAction { public EditEnvAction() { - this.setName(Inter.getLocText("M-Others") + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M-Others") + "..."); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java index 76258d8f1..64ed36435 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.itextfield.UITextField; import com.fr.file.filetree.FileNode; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; @@ -95,8 +95,8 @@ public class LocalePane extends BasicPane { }); - tabbedPane.addTab(Inter.getLocText("Preference-Predefined"), new UIScrollPane(predefinedTable)); - tabbedPane.addTab(Inter.getLocText("Preference-Custom"), new UIScrollPane(customTable)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Preference-Predefined"), new UIScrollPane(predefinedTable)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Preference-Custom"), new UIScrollPane(customTable)); loadData(); } @@ -144,7 +144,7 @@ public class LocalePane extends BasicPane { keyVector.addAll(sortKeys); - predefineTableModel.addColumn(Inter.getLocText("Key"), keyVector); + predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key"), keyVector); for (Map.Entry> entry : data.entrySet()) { predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue()); } @@ -159,7 +159,7 @@ public class LocalePane extends BasicPane { List list = new ArrayList(); Set keys = new HashSet(); - customTableModel.addColumn(Inter.getLocText("Key")); + customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key")); for (FileNode fileNode : fileNodes) { String fileName = fileNode.getName(); if (fileName.endsWith(".properties")) { @@ -216,6 +216,6 @@ public class LocalePane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Preference-Locale"); + return com.fr.design.i18n.Toolkit.i18nText("Preference-Locale"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index c4e26db6c..de57a4018 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -23,8 +23,9 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.general.log.Log4jConfig; +import com.fr.locale.InterProviderFactory; import com.fr.third.apache.log4j.Level; import javax.swing.*; @@ -128,8 +129,8 @@ public class PreferencePane extends BasicPane { // 语言选项 private void initLanguageItems() { LANGUAGE.clear(); - Map map = Inter.getSupportLocaleMap(); - LANGUAGE.add(Inter.getLocText("FR-Designer_Language_Default")); + Map map = InterProviderFactory.getProvider().getSupportLocaleMap(); + LANGUAGE.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Language_Default")); for (Locale locale : map.keySet()) { LANGUAGE.add(getLocaledLanguage(map.get(locale), locale)); } @@ -141,9 +142,9 @@ public class PreferencePane extends BasicPane { UITabbedPane jtabPane = new UITabbedPane(); JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - jtabPane.addTab(Inter.getLocText("FR-Designer_General"), generalPane); + jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_General"), generalPane); JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - jtabPane.addTab(Inter.getLocText("FR-Designer_Advanced"), advancePane); + jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), advancePane); contentPane.add(jtabPane, BorderLayout.NORTH); @@ -166,14 +167,12 @@ public class PreferencePane extends BasicPane { createJdkHomePane(advancePane); - String[] message = new String[]{"Display", "Oracle_All_Tables"}; - String[] sign = new String[]{"Oracle"}; - JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + Inter.getLocText("FR-Designer_Oracle_All_Tables")); - oracleSpace = new UICheckBox(Inter.getLocText(message, sign)); + JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables")); + oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Show_All_Oracle_Tables")); oraclePane.add(oracleSpace); - JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Product_improve")); - joinProductImprove = new UICheckBox(Inter.getLocText("FR-Designer_Join_Product_improve")); + JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Product_improve")); + joinProductImprove = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Join_Product_improve")); improvePane.add(joinProductImprove); JPanel spaceUpPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -185,22 +184,22 @@ public class PreferencePane extends BasicPane { private static String getLocaledLanguage(String key, Locale locale) { StringBuilder sb = new StringBuilder(); - sb.append(Inter.getLocText(key)).append("("); - sb.append(Inter.getLocText(key, locale)).append(")"); + sb.append(com.fr.design.i18n.Toolkit.i18nText(key)).append("("); + sb.append(com.fr.design.i18n.Toolkit.i18nText(key)).append(")"); return sb.toString(); } private void createFunctionPane(JPanel generalPane) { - JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Preference-Function")); + JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference-Function")); generalPane.add(functionPane); //添加supportUndo选择项 - supportUndoCheckBox = new UICheckBox(Inter.getLocText("Preference-Support_Undo")); + supportUndoCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Undo")); functionPane.add(supportUndoCheckBox); //添加maxUndoLimit //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"}; - String[] undoTimes = {Inter.getLocText("FR-Designer_max_undo_limit"), MAX_UNDO_LIMIT_5 + Inter.getLocText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_10 + Inter.getLocText("FR-Designer_time(s)") - , MAX_UNDO_LIMIT_15 + Inter.getLocText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_20 + Inter.getLocText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_50 + Inter.getLocText("FR-Designer_time(s)")}; + String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_max_undo_limit"), MAX_UNDO_LIMIT_5 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_10 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)") + , MAX_UNDO_LIMIT_15 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_20 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)"), MAX_UNDO_LIMIT_50 + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_time(s)")}; maxUndoLimit = new UIComboBox(undoTimes); functionPane.add(maxUndoLimit); @@ -214,21 +213,21 @@ public class PreferencePane extends BasicPane { //添加supportDefaultParentCalculate选择项 supportDefaultParentCalculateCheckBox = new UICheckBox( - Inter.getLocText("Preference-Support_Default_Parent_Calculate")); + com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Default_Parent_Calculate")); functionPane.add(supportDefaultParentCalculateCheckBox); } private void createEditPane(JPanel generalPane) { //samuel:编辑器设置 - JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText(new String[]{"Editor", "Set"})); + JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference")); generalPane.add(editPane); //设置是否支持将字符串编辑为公式 - supportStringToFormulaBox = new UICheckBox(Inter.getLocText("FR-Designer_Surport_String_To_Formula")); + supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Support_String_To_Formula")); editPane.add(supportStringToFormulaBox); //是否默认转化 - defaultStringToFormulaBox = new UICheckBox(Inter.getLocText("FR-Designer_Always")); + defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Always")); editPane.add(defaultStringToFormulaBox); //不支持转化则不能默认执行 @@ -238,7 +237,7 @@ public class PreferencePane extends BasicPane { } }); JPanel keyStrokePane = new JPanel(new BorderLayout()); - keyStrokePane.add(new UILabel(Inter.getLocText("Support-Auto_Complete_Shortcut") + ":"), BorderLayout.WEST); + keyStrokePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Support-Auto_Complete_Shortcut") + ":"), BorderLayout.WEST); shortCutLabel = new UILabel(); keyStrokePane.add(shortCutLabel, BorderLayout.CENTER); editPane.add(keyStrokePane); @@ -268,7 +267,7 @@ public class PreferencePane extends BasicPane { requestFocusInWindow(); label = new UILabel(text); add(GUICoreUtils.createBorderLayoutPane( - new UILabel(Inter.getLocText("Support-Current_Auto_Complete_Shortcut") + ":"), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Support-Current_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST, label, BorderLayout.CENTER), @@ -302,24 +301,24 @@ public class PreferencePane extends BasicPane { private void createGuiOfGridPane(JPanel generalPane) { // GridPane - JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Preference-Setting_Grid")); + JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-Setting_Grid")); generalPane.add(guiOfGridPane); - supportCellEditorDefCheckBox = new UICheckBox(Inter.getLocText("Preference-Support_Cell_Editor_Definition")); + supportCellEditorDefCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Cell_Editor_Definition")); guiOfGridPane.add(supportCellEditorDefCheckBox); - isDragPermitedCheckBox = new UICheckBox(Inter.getLocText("Preference-Is_Drag_Permited")); + isDragPermitedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Is_Drag_Permited")); guiOfGridPane.add(isDragPermitedCheckBox); } private void createColorSettingPane(JPanel generalPane) { // Color Setting Pane - JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Preference-Setting_Colors")); + JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-Setting_Colors")); generalPane.add(colorSettingPane); - new UILabel(Inter.getLocText("Preference-Grid_Line_Color")); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Grid_Line_Color")); - new UILabel(Inter.getLocText("Preference-Pagination_Line_Color")); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Pagination_Line_Color")); gridLineColorTBButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); gridLineColorTBButton.setEnabled(this.isEnabled()); @@ -328,10 +327,10 @@ public class PreferencePane extends BasicPane { paginationLineColorTBButton.setEnabled(this.isEnabled()); JPanel leftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - leftPane.add(new UILabel(Inter.getLocText("Preference-Grid_Line_Color") + ":")); + leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Grid_Line_Color") + ":")); leftPane.add(gridLineColorTBButton); JPanel rightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - rightPane.add(new UILabel(Inter.getLocText("Preference-Pagination_Line_Color") + ":")); + rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Pagination_Line_Color") + ":")); rightPane.add(paginationLineColorTBButton); colorSettingPane.add(leftPane); colorSettingPane.add(rightPane); @@ -341,9 +340,9 @@ public class PreferencePane extends BasicPane { //richer:选择导出log文件的目录. JPanel logPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); advancePane.add(logPane); - JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + Inter.getLocText("FR-Designer_Export_Setting")); + JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_Setting")); logPane.add(logExportPane); - UILabel logLabel = new UILabel(Inter.getLocText("FR-Designer_Select_Export_Log_Directory") + ":"); + UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Export_Log_Directory") + ":"); logExportPane.add(logLabel, BorderLayout.WEST); logExportDirectoryField = new UITextField(24); logExportPane.add(logExportDirectoryField, BorderLayout.CENTER); @@ -362,7 +361,7 @@ public class PreferencePane extends BasicPane { } }); - JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + Inter.getLocText("FR-Designer_Level_Setting")); + JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Level_Setting")); logPane.add(logLevelPane); logLevelComboBox = new UIComboBox(LOG); logLevelPane.add(logLevelComboBox); @@ -377,12 +376,12 @@ public class PreferencePane extends BasicPane { private void createLanPane(JPanel generalPane) { // ben:选择版本语言; JPanel languageAndDashBoard_pane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Choose_Language")); + JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Choose_Language")); generalPane.add(languageAndDashBoard_pane); languageAndDashBoard_pane.add(LanguagePane); languageComboBox = new UIComboBox(LANGUAGE.toArray()); languageComboBox.setFont(FRFont.getInstance("Dialog", Font.PLAIN, 12));//为了在中文系统中显示韩文 - ActionLabel languageLabel = new ActionLabel(Inter.getLocText("FR-Designer_Designer_Language")); + ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Designer_Language")); languageLabel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -396,7 +395,7 @@ public class PreferencePane extends BasicPane { dlg.setVisible(true); } }); - UILabel noticeLabel = new UILabel(Inter.getLocText("FR-Designer_Work_After_Restart_Designer"));//sail:提示重启后生效 + UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));//sail:提示重启后生效 double p = TableLayout.PREFERRED; double rowSize[] = {p}; double columnSize[] = {p, p, p}; @@ -431,16 +430,16 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; // 长度单位选择 - JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Setting-Ruler-Units")); + JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Setting-Ruler-Units")); advancePane.add(lengthPane); - pageLengthComboBox = new UIComboBox(new String[]{Inter.getLocText("FR-Designer_PageSetup-mm"), Inter.getLocText("FR-Designer_Unit_CM"), Inter.getLocText("FR-Designer_Unit_INCH")}); + pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-mm"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH")}); pageLengthComboBox.setPreferredSize(new Dimension(80, 20)); pageLengthComboBox.setMinimumSize(new Dimension(80, 20)); - reportLengthComboBox = new UIComboBox(new String[]{Inter.getLocText("FR-Designer_PageSetup-mm"), Inter.getLocText("FR-Designer_Unit_CM"), Inter.getLocText("FR-Designer_Unit_INCH"), Inter.getLocText("FR-Designer_Unit_PT")}); + reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-mm"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT")}); reportLengthComboBox.setPreferredSize(new Dimension(80, 20)); reportLengthComboBox.setMinimumSize(new Dimension(80, 20)); - UILabel pagelengthLabel = new UILabel(Inter.getLocText("FR-Designer_Page-Setup-Scale-Units") + ":"); - UILabel reportLengthLabel = new UILabel(Inter.getLocText("FR-Designer_Report-Design-Ruler-Units") + ":"); + UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Page-Setup-Scale-Units") + ":"); + UILabel reportLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Report-Design-Ruler-Units") + ":"); Component[][] lengthComponents = { {pagelengthLabel, pageLengthComboBox, reportLengthLabel, reportLengthComboBox}, }; @@ -453,13 +452,13 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; double columnSize[] = {p, p, p}; - JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Web_Preview_Port_Setting")); + JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Web_Preview_Port_Setting")); advancePane.add(serverPortPane); portEditor = new IntegerEditor(); portEditor.setPreferredSize(new Dimension(80, 20)); portEditor.setMinimumSize(new Dimension(80, 20)); - UILabel notiJlabel = new UILabel(Inter.getLocText("FR-Designer_Work_After_Restart_Designer")); - UILabel serverPortLabel = new UILabel(Inter.getLocText("FR-Designer_Web_Preview_Port") + ":"); + UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer")); + UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Web_Preview_Port") + ":"); Component[][] portComponents = { {serverPortLabel, portEditor, notiJlabel}, }; @@ -472,7 +471,7 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; double columnSize[] = {p, p, p}; - JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Preference-JDK_Home")); + JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-JDK_Home")); advancePane.add(serverPortPane); jdkHomeTextField = new UITextField(); UIButton chooseBtn = new UIButton("..."); @@ -494,8 +493,8 @@ public class PreferencePane extends BasicPane { } }); panel.setPreferredSize(new Dimension(300, 20)); - UILabel notiJlabel = new UILabel(Inter.getLocText("FR-Designer_Work_After_Restart_Designer")); - UILabel serverPortLabel = new UILabel(Inter.getLocText("Preference-JDK_Home") + ":"); + UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer")); + UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-JDK_Home") + ":"); Component[][] portComponents = { {serverPortLabel, panel, notiJlabel}, }; @@ -504,9 +503,9 @@ public class PreferencePane extends BasicPane { } private JPanel createMemoryPane() { - JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Preference_CachingTemplate")); - UILabel memoryLabel = new UILabel(Inter.getLocText("FR-Designer_Preference_MaxCachingTemplate")); - UILabel memoryTipLabel = new UILabel(Inter.getLocText("FR-Designer_Preference_CachingTemplateTip")); + JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_CachingTemplate")); + UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_MaxCachingTemplate")); + UILabel memoryTipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference_CachingTemplateTip")); memoryTipLabel.setBorder(BorderFactory.createEmptyBorder( 0, CACHING_GAP, 0, 0)); cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT); JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); @@ -519,7 +518,7 @@ public class PreferencePane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("M_Window-Preference"); + return com.fr.design.i18n.Toolkit.i18nText("M_Window-Preference"); } /** @@ -672,12 +671,12 @@ public class PreferencePane extends BasicPane { } int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Designer_Language_Change_Successful"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Language_Change_Successful"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, - new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later")}, null ); if (rv == JOptionPane.OK_OPTION) { diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 9357ad7cd..9b400f052 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -15,7 +15,7 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.utils.DesignUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.stable.EnvChangedListener; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; @@ -109,7 +109,7 @@ public class SwitchExistEnv extends MenuDef { try { workspace = DesignerWorkspaceGenerator.generate(selectedEnv); if (workspace == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return; } @@ -125,7 +125,7 @@ public class SwitchExistEnv extends MenuDef { } }); } catch (AuthException exception) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java index 947fc67f6..5cb36f3df 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java @@ -8,7 +8,7 @@ import com.fr.design.utils.DesignUtils; import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.general.web.ParameterConstants; import com.fr.stable.project.ProjectConstants; import com.fr.stable.web.AbstractWebletCreator; @@ -52,8 +52,8 @@ public final class WebPreviewUtils { browseUrl(currentTemplate, baseRoute, map, actionType, jt); } else { // 说明模板没有保存在报表运行环境下面,提示用户 - int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Web_Preview_Message"), - Inter.getLocText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Web_Preview_Message"), + com.fr.design.i18n.Toolkit.i18nText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (JOptionPane.OK_OPTION == selVal) { if (!jt.saveAsTemplate2Env()) { @@ -96,8 +96,8 @@ public final class WebPreviewUtils { DesignUtils.visitEnvServerByParameters(baseRoute, parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()])); } } else { - int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Web_Preview_Message"), - Inter.getLocText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Web_Preview_Message"), + com.fr.design.i18n.Toolkit.i18nText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (JOptionPane.OK_OPTION == selVal) { if (!jt.saveAsTemplate()) { return; diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java index 475590025..00a4cf991 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java @@ -6,7 +6,7 @@ package com.fr.design.actions.help; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -39,7 +39,7 @@ public class AboutAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M_Help-About_Software"); + return com.fr.design.i18n.Toolkit.i18nText("M_Help-About_Software"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 4ca906a20..0981ea680 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -20,7 +20,7 @@ import javax.swing.KeyStroke; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.ProductConstants; import com.fr.design.utils.gui.GUICoreUtils; @@ -42,14 +42,14 @@ public class AboutDialog extends JDialog implements ActionListener { JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); - okButton = new UIButton(Inter.getLocText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); okButton.addActionListener(this); tabbedPane = new UITabbedPane(); sysPane = new SystemInfoPane(); - tabbedPane.addTab(Inter.getLocText("About"), aboutPanel); - tabbedPane.addTab(Inter.getLocText("System"), sysPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); buttonPanel.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 5bc1465f7..d67af5484 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.CloudCenter; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.stable.ProductConstants; import com.fr.stable.StringUtils; import com.fr.stable.bridge.StableFactory; @@ -50,33 +50,33 @@ public class AboutPane extends JPanel { getBuildTitle(), GeneralUtils.readFullBuildNO(), new String[]{ - Inter.getLocText("FR-Designer-Basic_Copy_Build_NO"), - Inter.getLocText("FR-Designer-Basic_Copy_Build_NO_OK") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO_OK") }); contentPane.add(buildCopyPane); BoxCenterAligmentPane boxCenterAlignmentPane = new BoxCenterAligmentPane(getCopyRight()); contentPane.add(boxCenterAlignmentPane); - boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("About-All_Rights_Reserved")); + boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("About-All_Rights_Reserved")); contentPane.add(boxCenterAlignmentPane); contentPane.add(new BoxCenterAlignmentCopyablePane( - Inter.getLocText("FR-Designer-Basic_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key"), DesignerEnvManager.getEnvManager().getActivationKey(), new String[]{ - Inter.getLocText("FR-Designer-Basic_Copy_Activation_Key"), - Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key_Copy_OK") })); addPhoneAndQQPane(contentPane); // 官网 - JPanel urlActionPane = getURLActionPane(Inter.getLocText("FR-Designer_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL)); + JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL)); // 支持邮箱 String defaultEmail = CloudCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL); - JPanel emailPane = getEmailActionPane(Inter.getLocText("FR-Designer_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + FRContext.getLocale(), defaultEmail)); + JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + FRContext.getLocale(), defaultEmail)); contentPane.add(urlActionPane); contentPane.add(emailPane); @@ -94,7 +94,7 @@ public class AboutPane extends JPanel { if (FRContext.getLocale().equals(Locale.US)) { return; } - boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE)); + boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE)); contentPane.add(boxCenterAlignmentPane); // 繁体版不显示QQ if (FRContext.getLocale().equals(Locale.TAIWAN)) { @@ -116,7 +116,7 @@ public class AboutPane extends JPanel { } private JPanel getRemarkPane(){ - String remark = Inter.getLocText("Fine-Designer_About_Remark_Info",PRESIDENT_PHONE); + String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_About_Remark_Info",PRESIDENT_PHONE); UILabel label = new UILabel(); label.setSize(new Dimension(580,30)); @@ -173,12 +173,12 @@ public class AboutPane extends JPanel { } private String getCopyRight() { - return append(Inter.getLocText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL, + return append(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL, ProductConstants.HISTORY, StringUtils.BLANK, CloudCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME)); } private String getBuildTitle() { - return append(ProductConstants.APP_NAME, Inter.getLocText("FR-Designer_About_Version"), + return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_Version"), StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java index f182ad354..ee9a18453 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicDialog; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -46,7 +46,7 @@ public class FeedBackAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("product_feedback"); + return com.fr.design.i18n.Toolkit.i18nText("product_feedback"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java index d4f212f3d..301789976 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java @@ -20,7 +20,6 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.DesignUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -68,9 +67,9 @@ public class FeedBackPane extends BasicPane { private static final int TEL_MAX_LENGTH = 11; private static final String ALLOWED_INTEGER_TYPE = "0123456789"; private SwingWorker worker; - private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Send"), true); - private UIButton ok = new UIButton(Inter.getLocText("OK")); - private UIButton cancle = new UIButton(Inter.getLocText("Cancel")); + private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); + private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; private boolean isSendSuccessful = false; @@ -97,7 +96,7 @@ public class FeedBackPane extends BasicPane { public FeedBackPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); initDetailArea(); - UILabel tip = new UILabel(Inter.getLocText("feedback_info")); + UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info")); tip.setBorder(TIP_BORDER); this.add(tip, BorderLayout.NORTH); UIScrollPane scrollPane = new UIScrollPane(initDetailPane()); @@ -136,7 +135,7 @@ public class FeedBackPane extends BasicPane { } }; this.detailField.setForeground(Color.gray); - this.detailField.setText(Inter.getLocText("feedback_tip")); + this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip")); detailField.addKeyListener(new KeyAdapter() { @Override @@ -157,7 +156,7 @@ public class FeedBackPane extends BasicPane { detailField.setForeground(Color.black); String text = detailField.getText(); // 判断在中文输入状态是否还包含提示符 要删掉 - String tip = Inter.getLocText("feedback_tip"); + String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip"); if (text.contains(tip)) { text = text.substring(0, text.indexOf(tip)); detailField.setText(text); @@ -180,11 +179,11 @@ public class FeedBackPane extends BasicPane { private JPanel initDetailPane() { double p = TableLayout.PREFERRED; - UILabel info = new UILabel(Inter.getLocText("detail_description") + ":"); + UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("detail_description") + ":"); info.setBorder(INNER_LEFT_BORDER); JPanel contactPane = getContactPane(); contactPane.setBorder(INNER_LEFT_BORDER); - UILabel contact = new UILabel(Inter.getLocText("contact_info") + ":"); + UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("contact_info") + ":"); contact.setBorder(INNER_LEFT_BORDER); JPanel jPanel = new JPanel(); jPanel.add(detailField); @@ -207,8 +206,8 @@ public class FeedBackPane extends BasicPane { double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{new UILabel("QQ:", SwingConstants.RIGHT), qq}, - new Component[]{new UILabel(Inter.getLocText("email") + ":", SwingConstants.RIGHT), email}, - new Component[]{new UILabel(Inter.getLocText("mobile_number") + ":", SwingConstants.RIGHT), phone} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("email") + ":", SwingConstants.RIGHT), email}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("mobile_number") + ":", SwingConstants.RIGHT), phone} }; double[] rowSize = {p, p, p}; double[] columnSize = {p, p}; @@ -220,7 +219,7 @@ public class FeedBackPane extends BasicPane { JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, GAP, 0)); controlPane.add(buttonsPane, BorderLayout.EAST); - sendButton = new UIButton(Inter.getLocText("Send")); + sendButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Send")); buttonsPane.add(sendButton); buttonsPane.setBorder(SEND_BORDER); sendButton.addActionListener(new ActionListener() { @@ -236,7 +235,7 @@ public class FeedBackPane extends BasicPane { private void doWithSendPane() { Object[] options = new Object[]{ok, cancle}; - send = new JOptionPane(Inter.getLocText("sending"), + send = new JOptionPane(com.fr.design.i18n.Toolkit.i18nText("sending"), JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null, options, options[0]); ok.setEnabled(false); ok.addActionListener(new ActionListener() { @@ -247,7 +246,7 @@ public class FeedBackPane extends BasicPane { feedbackDialog.dispose(); } else { ok.setEnabled(false); - send.setMessage(Inter.getLocText("sending")); + send.setMessage(com.fr.design.i18n.Toolkit.i18nText("sending")); setWorker(send); worker.execute(); } @@ -293,12 +292,9 @@ public class FeedBackPane extends BasicPane { if (model) { //发送成功 isSendSuccessful = true; - send.setMessage(Inter.getLocText("HJS-Send_Successfully") + "!"); + send.setMessage(com.fr.design.i18n.Toolkit.i18nText("HJS-Send_Successfully") + "!"); } else { isSendSuccessful = false; - String[] message = new String[]{"HJS-Send_Failed", "try_resending"}; - String[] operator = new String[]{",", ""}; - send.setMessage(Inter.getLocText(message, operator)); } } catch (Exception e) { isSendSuccessful = false; @@ -313,7 +309,7 @@ public class FeedBackPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("product_feedback"); + return com.fr.design.i18n.Toolkit.i18nText("product_feedback"); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java index c0684cb9c..ebfb10083 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java @@ -8,7 +8,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -48,7 +48,7 @@ public class ForumAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -66,7 +66,7 @@ public class ForumAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("Forum"); + return com.fr.design.i18n.Toolkit.i18nText("Forum"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java index 703c5632e..6e08a7258 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java @@ -7,7 +7,7 @@ package com.fr.design.actions.help; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; @@ -37,7 +37,7 @@ public class SupportQQAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -52,7 +52,7 @@ public class SupportQQAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("Support_QQ"); + return com.fr.design.i18n.Toolkit.i18nText("Support_QQ"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java index f24e42877..f33a0473a 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java @@ -12,7 +12,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableColumnModel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.ProductConstants; public class SystemInfoPane extends JPanel { @@ -25,8 +25,8 @@ public class SystemInfoPane extends JPanel { return false; } }; - tableModel.addColumn(Inter.getLocText("Property")); - tableModel.addColumn(Inter.getLocText("Value")); + tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Property")); + tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Value")); Properties properties = System.getProperties(); Object[] keys = new Object[properties.size()]; diff --git a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java index f51ce77cb..32efb23dd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java @@ -15,7 +15,7 @@ import com.fr.base.Utils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.general.CloudCenter; -import com.fr.general.Inter; + import com.fr.general.http.HttpClient; import com.fr.stable.OperatingSystem; import com.fr.stable.StableUtils; @@ -86,7 +86,7 @@ public class TutorialAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_COMMUNITY_HELP"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java index 2532d0b0d..15473d9d6 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java @@ -3,7 +3,7 @@ package com.fr.design.actions.help; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.start.ServerStarter; import javax.swing.*; @@ -34,7 +34,7 @@ public class WebDemoAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("FR-Product_Demo"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Product_Demo"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index 0ab5edd25..cdebcf80b 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import javax.swing.*; @@ -87,28 +87,28 @@ public class AlphaFineConfigPane extends BasicPane { double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP}; - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_SearchRange")); - isContainRecommendCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_Recommend")); - isContainActionCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Set")); - isContainPluginCheckbox = new UICheckBox(Inter.getLocText("FR-Designer-Plugin_Addon")); - isContainDocumentCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_COMMUNITY_HELP")); - isContainTemplateCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Templates")); - isContainFileContentCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_Templates_Content")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_SearchRange")); + isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend")); + isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); + isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon")); + isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")); + isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")); + isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates_Content")); JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize); northPane.add(searchConfigPane); contentPane.add(northPane); } private void createShortcutsPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_Shortcut_Config")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Shortcut_Config")); shortcutsField = new UITextField(); shortcutsField.setEditable(false); shortcutsField.selectAll(); shortcutsField.setPreferredSize(new Dimension(100, 20)); initFieldListener(); - northPane.add(new UILabel(Inter.getLocText("FR-Designer_Open") + ":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":")); northPane.add(shortcutsField); - UILabel label = new UILabel(Inter.getLocText("FR-Designer-AlphaFine_SetShortcuts")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-AlphaFine_SetShortcuts")); label.setForeground(Color.RED); northPane.add(label); contentPane.add(northPane); @@ -138,8 +138,8 @@ public class AlphaFineConfigPane extends BasicPane { } private void createOnlinePane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_EnableInternet")); - isSearchOnlineCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_EnableInternetSearch")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableInternet")); + isSearchOnlineCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableInternetSearch")); isSearchOnlineCheckbox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -162,8 +162,8 @@ public class AlphaFineConfigPane extends BasicPane { } private void createOpenPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_AlphaFine_Enable")); - isEnabledCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_AlphaFine_EnableAlphaFine")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Enable")); + isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableAlphaFine")); northPane.add(isEnabledCheckbox); contentPane.add(northPane); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java index fc565bd6d..1213db6c7 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java @@ -4,7 +4,7 @@ import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -67,7 +67,7 @@ public class RemindPane extends JPanel { } }); - noRemindLabel = new UILabel(Inter.getLocText("FR-Designer-Alphafine_No_Remind")); + noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Alphafine_No_Remind")); noRemindLabel.setFont(MEDIUM_FONT); noRemindLabel.setForeground(Color.WHITE); checkLabel = new UILabel(); diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java index 0be0a7c32..56f2018e1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java @@ -13,7 +13,7 @@ import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.file.ConnectionConfig; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.locale.InterProviderFactory; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; @@ -44,7 +44,7 @@ public class ConnectionListAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("Server-Define_Data_Connection"); + return com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java index 375f264da..bd5f44d73 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java @@ -13,7 +13,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.MenuKeySet; import com.fr.file.FunctionConfig; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.transaction.Configurations; import com.fr.transaction.Worker; @@ -76,7 +76,7 @@ public class FunctionManagerAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M_Server-Function_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("M_Server-Function_Manager"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java index 2e5294f35..b206df6df 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java @@ -14,7 +14,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.design.parameter.ParameterManagerPane; -import com.fr.general.Inter; + import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -83,7 +83,7 @@ public class GlobalParameterAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M_Server-Global_Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index 2969cf444..86738a470 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -19,7 +19,7 @@ import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.file.ProcedureConfig; import com.fr.file.TableDataConfig; -import com.fr.general.Inter; + import com.fr.locale.InterProviderFactory; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; @@ -52,7 +52,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS @Override public String getMenuName() { - return Inter.getLocText("DS-Server_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java index d3b473b1f..f0fef3ead 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.utils.DesignUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -33,7 +33,7 @@ public class PlatformManagerAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M_Server-Platform_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java index bd77bfa0c..e3890885f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.extra.WebViewDlgHelper; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -36,7 +36,7 @@ public class PluginManagerAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java index 60969bd8d..076156884 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java @@ -11,7 +11,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.file.ProcedureConfig; -import com.fr.general.Inter; + import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -20,7 +20,7 @@ import java.awt.event.ActionEvent; public class ProcedureListAction extends UpdateAction { public ProcedureListAction() { - this.setName(Inter.getLocText("Datasource-Stored_Procedure") + "(P)" + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure") + "(P)" + "..."); this.setMnemonic('P'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png")); } diff --git a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java index d176b8627..f7b237ca0 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.Dimension; @@ -35,14 +35,14 @@ public abstract class ConditionAttributesPane extends BasicBeanPane { JPanel propertyChangePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); this.add(propertyChangePane); - propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Property") + ":", null)); + propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Property") + ":", null)); // 选择要改变的属性. JPanel addItemPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); ToolBarDef toolbarDef = new ToolBarDef(); menuDef = new CellHighlightAddMenuDef(); - menuDef.setName(Inter.getLocText("Highlight-Click_to_Choose_Property_To_Modify")); + menuDef.setName(com.fr.design.i18n.Toolkit.i18nText("Highlight-Click_to_Choose_Property_To_Modify")); menuDef.setIconPath("com/fr/design/images/control/addPopup.png"); toolbarDef.addShortCut(menuDef); diff --git a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java index 9de32327d..e16676d7e 100644 --- a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java @@ -32,7 +32,7 @@ import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.editor.ColumnIndexEditor; import com.fr.design.editor.editor.ColumnNameEditor; import com.fr.design.editor.editor.Editor; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -121,7 +121,7 @@ public class DSColumnLiteConditionPane extends LiteConditionPane extends BasicBeanPa private static final long serialVersionUID = 1L; // peter:这两个变量在弹出公式编辑器的时候,需要用. - private UIRadioButton commonRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_LiteCondition_Common")); - private UIRadioButton formulaRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_LiteCondition_Formula")); + private UIRadioButton commonRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Common")); + private UIRadioButton formulaRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula")); private JPanel conditionCardPane; protected BasicBeanPane defaultConditionPane; // card2 private UITextArea formulaTextArea; private UIButton modifyButton; private UIButton addButton; - private UIRadioButton andRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_LiteCondition_ConditionB-AND") + " "); - private UIRadioButton orRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_LiteCondition_ConditionB-OR")); + private UIRadioButton andRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_ConditionB-AND") + " "); + private UIRadioButton orRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_ConditionB-OR")); protected JTree conditionsTree;// Conditions private UIButton removeButton; private UIButton moveUpButton; @@ -124,7 +124,7 @@ public abstract class LiteConditionPane extends BasicBeanPa boolean result = isExistedInParentTreeNode(parentTreeNode, newJoinCondition); if (result) { JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), - Inter.getLocText("BindColumn-This_Condition_has_been_existed")); + com.fr.design.i18n.Toolkit.i18nText("BindColumn-This_Condition_has_been_existed")); return; } @@ -223,7 +223,7 @@ public abstract class LiteConditionPane extends BasicBeanPa } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), - Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", Inter.getLocText("FR-Designer_Remove"), + com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION); if (returnVal == JOptionPane.OK_OPTION) { DefaultTreeModel treeModel = (DefaultTreeModel) conditionsTree.getModel(); @@ -447,30 +447,30 @@ public abstract class LiteConditionPane extends BasicBeanPa private void initButtonPane(JPanel buttonPane) { - removeButton = new UIButton(Inter.getLocText("FR-Designer_Remove")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); buttonPane.add(removeButton); removeButton.setIcon(BaseUtils.readIcon("com/fr/base/images/cell/control/remove.png")); removeButton.setEnabled(false); removeButton.addActionListener(actionListener3); - moveUpButton = new UIButton(Inter.getLocText("Utils-Move_Up")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); buttonPane.add(moveUpButton); moveUpButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/up.png")); moveUpButton.addActionListener(actionListener4); - moveDownButton = new UIButton(Inter.getLocText("Utils-Move_Down")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); buttonPane.add(moveDownButton); moveDownButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/down.png")); moveDownButton.addActionListener(actionListener5); // peter:加括号 - bracketButton = new UIButton(Inter.getLocText("ConditionB-Add_bracket")); + bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Add_bracket")); buttonPane.add(bracketButton); bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png")); bracketButton.addActionListener(actionListener6); // peter:去掉括号 - unBracketButton = new UIButton(Inter.getLocText("ConditionB-Remove_bracket")); + unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Remove_bracket")); buttonPane.add(unBracketButton); unBracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/unBracket.png")); unBracketButton.addActionListener(actionListener7); @@ -492,7 +492,7 @@ public abstract class LiteConditionPane extends BasicBeanPa this.add(conditonTypePane, BorderLayout.NORTH); conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM)); - UILabel conditionTypeLabel = new UILabel(Inter.getLocText("FR-Designer_Type") + ":"); + UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + ":"); conditonTypePane.add(conditionTypeLabel, BorderLayout.WEST); conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0)); @@ -530,10 +530,10 @@ public abstract class LiteConditionPane extends BasicBeanPa formulaPane.setPreferredSize(new Dimension(450, 40)); formulaConditionPane.add(formulaPane, BorderLayout.CENTER); formulaPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 2)); - formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); + formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); formulaTextArea = new UITextArea(); formulaPane.add(new JScrollPane(formulaTextArea), BorderLayout.CENTER); - UIButton editFormulaButton = new UIButton(Inter.getLocText("FR-Designer_LiteCondition_Define")); + UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Define")); formulaPane.add(GUICoreUtils.createBorderPane(editFormulaButton, BorderLayout.NORTH), BorderLayout.EAST); editFormulaButton.addActionListener(actionListener1); applyCardsPane(); @@ -564,14 +564,14 @@ public abstract class LiteConditionPane extends BasicBeanPa addControlPane.add(Box.createHorizontalStrut(STRUT_ONE)); - addButton = new UIButton(Inter.getLocText("FR-Designer_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png")); addButton.setMnemonic('A'); addControlPane.add(addButton); addButton.addActionListener(actionListener2); addControlPane.add(Box.createHorizontalStrut(STRUT_TWO)); - modifyButton = new UIButton(Inter.getLocText("FR-Designer_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png")); + modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png")); modifyButton.setMnemonic('M'); addControlPane.add(modifyButton); modifyButton.addActionListener(actionListener8); @@ -583,7 +583,7 @@ public abstract class LiteConditionPane extends BasicBeanPa @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Submit_Condition"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Submit_Condition"); } // samuel:移出来，方便调用 @@ -654,10 +654,10 @@ public abstract class LiteConditionPane extends BasicBeanPa private void applyCardsPane() { CardLayout cl = (CardLayout) (conditionCardPane.getLayout()); if (this.commonRadioButton.isSelected()) { - this.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_LiteCondition_Common_Condition"), null)); + this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Common_Condition"), null)); cl.show(conditionCardPane, "DEFAULT"); } else { - this.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_LiteCondition_Formula_Condition"), null)); + this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula_Condition"), null)); cl.show(conditionCardPane, "FORMULA"); } } diff --git a/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java index 859f280d7..1d8c82618 100644 --- a/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java @@ -19,7 +19,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; public class ObjectLiteConditionPane extends LiteConditionPane { @@ -79,7 +79,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane(); - Component[][] components = { { new UILabel(Inter.getLocText("FR-Designer_ConditionB-Operator") + ":"), new UILabel() }, + Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConditionB-Operator") + ":"), new UILabel() }, { conditionOPComboBox, conditionValuePane } }; double p = TableLayout.PREFERRED; diff --git a/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java index cf7642c3a..4921af9ef 100644 --- a/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java @@ -9,7 +9,7 @@ import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + public abstract class SingleConditionPane extends BasicPane { private static final long serialVersionUID = -4274960170813368817L; @@ -26,7 +26,7 @@ public abstract class SingleConditionPane extends BasicPane { if(cancel == null) { cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); - cancel.setToolTipText(Inter.getLocText("FR-Action_Remove")); + cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); } diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index 1959f6fc0..088fc47a9 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java @@ -4,7 +4,7 @@ package com.fr.design.constants; import com.fr.base.BaseUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -219,7 +219,7 @@ public interface UIConstants { @Override public String toString() { - return Inter.getLocText("Loading") + "..."; + return com.fr.design.i18n.Toolkit.i18nText("Loading") + "..."; } }; /** @@ -228,7 +228,7 @@ public interface UIConstants { public static final Object CONNECTION_FAILED = new Object() { public String toString() { - return Inter.getLocText(new String[]{"Database", "Datasource-Connection_failed"}) + "!"; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!"; } }; diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java index 94b142f32..aeab603af 100644 --- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java @@ -26,7 +26,6 @@ import com.fr.design.mainframe.DockingView; import com.fr.design.menu.LineSeparator; import com.fr.design.menu.MenuDef; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; @@ -36,7 +35,11 @@ import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.tree.TreeCellEditor; import java.awt.*; -import java.awt.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; import java.util.EventObject; import java.util.HashMap; import java.util.Map; @@ -75,7 +78,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp */ @Override public String getViewTitle() { - return Inter.getLocText("FR-Designer_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData"); } /** @@ -117,18 +120,14 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp dg.setButtonEnabled(true); String tempName = nPanel.getObjectName(); if (StringUtils.isBlank(tempName)) { - nPanel.setShowText(Inter.getLocText(new String[]{"DS-TableData", "ISEMPTY", "PLEASE", "GIVE-NAME"}, new String[]{"", "，", "", "！"})); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); dg.setButtonEnabled(false); } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) { - String[] waring = new String[]{"DS-TableData", "Utils-has_been_existed", "PLEASE", "Rename"}; - String[] sign = new String[]{tempName, "，", "", "！"}; - nPanel.setShowText(Inter.getLocText(waring, sign)); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName)); dg.setButtonEnabled(false); } else if (isProcedureName(oldName)) { if (isIncludeUnderline(tempName)) { - String[] datasource_underline = new String[]{"Datasource-Stored_Procedure", "Name", "can_not_include_underline"}; - String[] sign = new String[]{"", "", "!"}; - nPanel.setShowText(Inter.getLocText(datasource_underline, sign)); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); dg.setButtonEnabled(false); } } else { @@ -138,7 +137,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp } private boolean isProcedureName(String oldName) { - return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, Inter.getLocText("Datasource-Stored_Procedure")); + return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")); } @@ -383,7 +382,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp private TableDataTree dataTree; public PreviewTableDataAction(TableDataTree dataTree) { - this.setName(Inter.getLocText("FR-Designer_Preview")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); this.setMnemonic('p'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.PREVIEW_ICON_PATH)); this.dataTree = dataTree; @@ -422,7 +421,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp protected class ConnectionTableAction extends com.fr.design.actions.server.ConnectionListAction { public ConnectionTableAction() { - this.setName(Inter.getLocText("Server-Define_Data_Connection")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_CONNECTION_ICON_PATH)); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index ecf63f335..0932e1569 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -33,7 +33,7 @@ import com.fr.design.mainframe.DesignerFrame; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.ConnectionConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.workspace.WorkContext; @@ -208,9 +208,9 @@ public class ChoosePane extends BasicBeanPane implements Refresha } protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) { - UILabel l1 = new UILabel(Inter.getLocText("FR-Designer_Database") + ":"); - UILabel l2 = new UILabel(Inter.getLocText("FR-Designer_Model") + ":"); - UILabel l3 = new UILabel(Inter.getLocText("FR-Designer_Table") + ":"); + UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database") + ":"); + UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model") + ":"); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Table") + ":"); if (labelSize > 0) { Dimension pSize = new Dimension(labelSize, 25); @@ -248,7 +248,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha @Override protected com.fr.data.impl.Connection doInBackground() { schemaBox.setRefreshingModel(true); - schemaBox.addItem(Inter.getLocText("FR-Designer_Loading") + "..."); + schemaBox.addItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading") + "..."); schemaBox.setSelectedItem(null); schemaBox.setRefreshingModel(false); return getConnection(); @@ -327,7 +327,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha DBUtils.refreshDatabase(); String schema = StringUtils.isEmpty(schemaBox.getSelectedItem()) ? null : schemaBox.getSelectedItem(); DataCoreUtils.refreshTables(getConnection(), TableProcedure.TABLE, schema); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Refresh_Successfully") + "!", Inter.getLocText("FR-Designer_Refresh_Database"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Database"), JOptionPane.INFORMATION_MESSAGE); } @@ -405,7 +405,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha String schema = StringUtils.isEmpty(this.schemaBox.getSelectedItem()) ? null : this.schemaBox.getSelectedItem(); TableProcedure[] sqlTableArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.TABLE, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace()); if (sqlTableArray.length > 0) { - ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + Inter.getLocText("FR-Designer_SQL-Table")); + ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table")); rootTreeNode.add(tableTreeNode); for (int i = 0; i < sqlTableArray.length; i++) { ExpandMutableTreeNode tableChildTreeNode = new ExpandMutableTreeNode(sqlTableArray[i]); @@ -414,7 +414,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha } TableProcedure[] sqlViewArray = DataCoreUtils.getTables(selectedDatabase, TableProcedure.VIEW, schema, DesignerEnvManager.getEnvManager().isOracleSystemSpace()); if (sqlViewArray.length > 0) { - ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + Inter.getLocText("FR-Designer_SQL-View")); + ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View")); rootTreeNode.add(viewTreeNode); for (int i = 0; i < sqlViewArray.length; i++) { ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(sqlViewArray[i]); @@ -455,8 +455,8 @@ public class ChoosePane extends BasicBeanPane implements Refresha } if (!connect) { DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); - JOptionPane.showMessageDialog(designerFrame, Inter.getLocText("Datasource-Connection_failed"), - Inter.getLocText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); failedToFindTable(); return null; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java index 8e0a9e529..220969b3d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java @@ -7,7 +7,7 @@ import javax.swing.JPanel; import com.fr.base.BaseUtils; import com.fr.design.data.datapane.FlashLookLabelMouseAdapter.ReleaseAction; -import com.fr.general.Inter; + public class EditOrNewLabel extends UILabel { @@ -16,7 +16,7 @@ public class EditOrNewLabel extends UILabel { public EditOrNewLabel(Editable editable, JPanel editPane) { super(BaseUtils.readIcon("/com/fr/design/images/m_file/edit.png")); - this.setToolTipText(Inter.getLocText("Edit")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.editable = editable; this.editTablePane = editPane; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java index a02b4d6a6..18d8bdcb0 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/RefreshLabel.java @@ -7,7 +7,7 @@ import java.awt.event.ActionListener; import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; -import com.fr.general.Inter; + @@ -19,7 +19,7 @@ public class RefreshLabel extends UIButton { this.refreshable = refreshable; - this.setToolTipText(Inter.getLocText("Refresh_Database")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Refresh_Database")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.addActionListener(new ActionListener() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java index 5d763ea06..229820626 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ReportTableDataPane.java @@ -7,7 +7,7 @@ import com.fr.data.TableDataSource; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -36,7 +36,7 @@ public class ReportTableDataPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); } public void populate(TableDataSource tds) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 5c98a0c9d..158a11b8c 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -8,8 +8,7 @@ import com.fr.data.impl.*; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.ExtraDesignClassManager; import com.fr.design.data.tabledata.tabledatapane.*; -import com.fr.design.fun.TableDataCreatorProvider; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import java.util.ArrayList; @@ -32,32 +31,32 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createReportTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(Inter.getLocText("DS-Database_Query"), + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"), "ds", "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class); - TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(Inter.getLocText("DS-Class"), + TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class); - TableDataNameObjectCreator table = new TableDataNameObjectCreator(Inter.getLocText("DS-Embedded_TableData"), + TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), "Embedded", "/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class); - TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(Inter.getLocText("DS-Relation_TableData"), + TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), "Multi", "/com/fr/design/images/data/multi.png", ConditionTableData.class, MultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(Inter.getLocText(new String[]{"File", "DS-TableData"}), + TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), "File", "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallHeightPane.class); - TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(Inter.getLocText(new String[]{"Tree", "DS-TableData"}), + TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), "Tree", "/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(Inter.getLocText("Datasource-Stored_Procedure"), + TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), "Proc", "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class) { @@ -70,28 +69,28 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createServerTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(Inter.getLocText("DS-Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, DBTableDataPane.class); - TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(Inter.getLocText("DS-Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, + TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, ClassTableDataPane.class); - TableDataNameObjectCreator table = new TableDataNameObjectCreator(Inter.getLocText("DS-Embedded_TableData"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class, + TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class); - TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(Inter.getLocText(new String[]{"File", "DS-TableData"}), "/com/fr/design/images/data/file.png", FileTableData.class, + TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallPane.class); - TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(Inter.getLocText(new String[]{"Tree", "DS-TableData"}), "/com/fr/design/images/data/tree.png", + TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png", RecursionTableData.class, GlobalTreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(Inter.getLocText("DS-Relation_TableData"), "/com/fr/design/images/data/multi.png", + TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png", ConditionTableData.class, GlobalMultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(Inter.getLocText("Datasource-Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png", + TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class) { public boolean shouldInsertSeparator() { return true; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java index ef8dfa323..2b18c3e78 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java @@ -8,7 +8,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.icon.WarningIcon; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -113,7 +113,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator { * @return 提示 */ public String createTooltip() { - return b ? Inter.getLocText("Connect_SQL_Cannot_Null") : null; + return b ? com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") : null; } public String getPrefix() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java index 168a64a41..6b9f388a7 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java @@ -10,14 +10,19 @@ import com.fr.design.gui.ilist.ListModelElement; import com.fr.file.ProcedureConfig; import com.fr.file.TableDataConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * TableDataList Pane. @@ -40,29 +45,23 @@ public class TableDataPaneListPane extends JListControlPane implements TableData String tempName = getEditingName(); Object editingType = getEditingType(); if (StringUtils.isEmpty(tempName)) { - String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"}; - String[] sign = new String[]{",", "!"}; isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Inter.getLocText(warning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); setWarnigText(editingIndex); return; } if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeted(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) { - String[] waning = new String[]{"already_exists", "TableData", "Please_Rename"}; - String[] sign = new String[]{"", tempName + ",", "!"}; isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Inter.getLocText(waning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips")); setWarnigText(editingIndex); } else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) { - String[] datasource_underline = new String[]{"Datasource-Stored_Procedure", "Name", "can_not_include_underline"}; - String[] sign = new String[]{"", "", "!"}; isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Inter.getLocText(datasource_underline, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); setWarnigText(editingIndex); } if (nameableList.getSelectedValue() instanceof ListModelElement) { @@ -246,9 +245,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData NameObject nameObject = (NameObject) tableDataArray[i]; if (exsitTableDataNameList.contains(nameObject.getName())) { - String[] waring = new String[]{"TableData", "Error_TableDataNameRepeat"}; - String[] sign = new String[]{": " + nameObject.getName()}; - throw new Exception(Inter.getLocText(waring, sign)); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", nameObject.getName())); } exsitTableDataNameList.add(nameObject.getName()); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java index 49991911b..00a46a5f8 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java @@ -12,7 +12,7 @@ import com.fr.design.data.tabledata.wrapper.StoreProcedureNameWrapper; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectOP; -import com.fr.general.Inter; + import com.fr.general.NameObject; import java.util.*; @@ -100,19 +100,19 @@ public class TableDataSourceOP implements UserObjectOP { } private ExpandMutableTreeNode initTemplateDataNode(Map templateDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("DS-TableData"), TEMPLATE_TABLE_DATA), true); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-TableData"), TEMPLATE_TABLE_DATA), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap)); return templateNode; } private ExpandMutableTreeNode initServerDataNode(Map serverDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("DS-Server_TableData"), SERVER_TABLE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"), SERVER_TABLE_DATA), false); templateNode.addChildTreeNodes(getNodeArrayFromMap(serverDataMap)); return templateNode; } private ExpandMutableTreeNode initStoreProcedureNode(Map storeProcedureMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false); templateNode.addChildTreeNodes(getNodeArrayFromMap(storeProcedureMap)); return templateNode; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index d3277bd19..71866d7c7 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -29,7 +29,7 @@ import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; @@ -84,7 +84,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { ToolTipManager.sharedInstance().registerComponent(dataTree); ToolTipManager.sharedInstance().setDismissDelay(3000); ToolTipManager.sharedInstance().setInitialDelay(0); - addMenuDef = new MenuDef(Inter.getLocText("FR-Action_Add")); + addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH); createAddMenuDef(); @@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { protected void initbuttonGroup() { // Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")}; final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA}; - String[] textArray = {Inter.getLocText(new String[]{"Template", "DS-TableData"}), Inter.getLocText("DS-Server_TableData")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")}; buttonGroup = new UIHeadGroup(textArray) { public void tabChanged(int index) { if (op != null) { @@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { private class EditAction extends UpdateAction { public EditAction() { - this.setName(Inter.getLocText("FR-Designer_Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)); } @@ -250,7 +250,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { private class RemoveAction extends UpdateAction { public RemoveAction() { - this.setName(Inter.getLocText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); } @@ -263,8 +263,8 @@ public class TableDataTreePane extends BasicTableDataTreePane { return; } - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", - Inter.getLocText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { // richer:这个地方为什么要在DataSourceTree里面去remove呢？多此一举吧 op.removeAction(selectedNO.getName()); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java index 3bbad7039..d9ec8f5f5 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java @@ -16,7 +16,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.script.Calculator; import com.fr.stable.StringUtils; @@ -53,7 +53,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { public TreeTableDataDictPane(String treeName) { this.setLayout(new BorderLayout(5, 30)); this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0)); - selectTableDataLabel = new UILabel(Inter.getLocText(new String[]{"Please_Select", "Single", "DS-TableData"}) + " :"); + selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_TableData_Select_One") + " :"); setTableDataNameComboBox(treeName); tableDataNameComboBox.setPreferredSize(new Dimension(180, 20)); JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -68,8 +68,8 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { this.add(tableFlowPane, BorderLayout.NORTH); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(centerPane, BorderLayout.CENTER); - parentMarkRadio = new UIRadioButton(Inter.getLocText("FR-Designer_Build_Tree_Accord_Parent_Marked_Filed"), true); - lengthMarkRadio = new UIRadioButton(Inter.getLocText("FR-Designer_Build_Tree_Accord_Marked_Filed_Length")); + parentMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build_Tree_Accord_Parent_Marked_Filed"), true); + lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build_Tree_Accord_Marked_Filed_Length")); parentMarkRadio.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (isBuildByParentFiled()) { @@ -90,15 +90,15 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { markButtonGroup.add(parentMarkRadio); markButtonGroup.add(lengthMarkRadio); - originFieldDependsOnParentLabel = new UILabel(Inter.getLocText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT); - parentFieldLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Parent_Marked_Field") + " :", SwingConstants.RIGHT); - treeDataFieldLabel1 = new UILabel(" " + Inter.getLocText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT); - originFieldDependsOnLengthLabel = new UILabel(Inter.getLocText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT); - treeDataFieldLabel2 = new UILabel(" " + Inter.getLocText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT); + originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT); + parentFieldLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parent_Marked_Field") + " :", SwingConstants.RIGHT); + treeDataFieldLabel1 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT); + originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Original_Marked_Filed") + " :", SwingConstants.RIGHT); + treeDataFieldLabel2 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree_Data_Field") + " :", SwingConstants.RIGHT); -// originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))}); -// parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))}); -// originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(Inter.getLocText("Columns"))}); +// originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); +// parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); +// originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[] {new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); originFieldDependsOnParentPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); parentFieldPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); originFieldDependsOnLengthPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); @@ -127,7 +127,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { buildTreePanel.add(xxx, BorderLayout.CENTER); centerPane.add(buildTreePanel, BorderLayout.NORTH); JPanel previewPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - UIButton treeDataPreviewButton = new UIButton(Inter.getLocText("FR-Designer_Preview")); + UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); previewPanel.add(treeDataPreviewButton); treeDataPreviewButton.addActionListener(new ActionListener() { @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java index 5d551c9b2..69dd0bc32 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerBean; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -38,9 +38,9 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { rs.add(tableNameComboBox, BorderLayout.CENTER); rs.add(GUICoreUtils.createFlowPane(new Component[]{new RefreshLabel(this), previewLabel}, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST); rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER)); - UILabel l1 = new UILabel(Inter.getLocText("FR-Designer_Database"), UILabel.LEFT); - UILabel l2 = new UILabel(Inter.getLocText("FR-Designer_Model"), UILabel.LEFT); - UILabel l3 = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Database", "FR-Designer_Table"}), UILabel.LEFT); + UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT); + UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT); if (labelSize > 0) { Dimension pSize = new Dimension(labelSize, 20); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index 956625f13..3999b694b 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -10,7 +10,6 @@ import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.file.ConnectionConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; @@ -18,13 +17,18 @@ import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Connection List Pane. */ public class ConnectionListPane extends JListControlPane implements ConnectionShowPane { - public static final String TITLE_NAME = Inter.getLocText("Server-Define_Data_Connection"); + public static final String TITLE_NAME = com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); private boolean isNamePermitted = true; private HashMap renameMap = new HashMap(); @@ -37,10 +41,8 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { - String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"}; - String[] sign = new String[]{",", "!"}; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), Inter.getLocText(warning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name")); setWarnigText(editingIndex); isNamePermitted = false; return; @@ -49,7 +51,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh && isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - String message = Inter.getLocText(new String[]{"Utils-has_been_existed", "DashBoard-ConnectionList", "Please_Rename"}, new String[]{"", tempName + ",", "!"}); + String message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); setWarnigText(editingIndex); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java index f6ad9ca49..75127e5ee 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionManagerPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.file.ConnectionConfig; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -28,7 +28,7 @@ public class ConnectionManagerPane extends LoadingBasicPane implements Connectio @Override protected String title4PopupWindow() { - return Inter.getLocText("Server-Define_Data_Connection"); + return com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); } public HashMap getRenameMap() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java index 9c86b52bb..810f6adcc 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.ilist.TableViewList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import javax.swing.*; @@ -112,15 +112,15 @@ public class ConnectionTableProcedurePane extends BasicPane { // 根据环境是否为中文设置不同的显示 if (GeneralContext.isChineseEnv()) { - first.add(new UILabel(Inter.getLocText("FR-Designer_SQL-Table"), + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table"), BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING)); - second.add(new UILabel(Inter.getLocText("FR-Designer_SQL-View"), + second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View"), BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING)); } else { UILabel ui1 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING); UILabel ui2 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING); - ui1.setToolTipText(Inter.getLocText("FR-Designer_SQL-Table")); - ui2.setToolTipText(Inter.getLocText("FR-Designer_SQL-View")); + ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table")); + ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View")); first.add(ui1); second.add(ui2); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index e7e3ef820..cf0e93d2a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.scrollruler.ModLineBorder; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.EncodeConstants; @@ -48,8 +48,8 @@ public abstract class DatabaseConnectionPane 0 && ((String) value).charAt(0) == '=') - type = Inter.getLocText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Formula"); else - type = Inter.getLocText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); }else if(value instanceof Integer) - type = Inter.getLocText("Integer"); + type = com.fr.design.i18n.Toolkit.i18nText("Integer"); else if(value instanceof Double) - type = Inter.getLocText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Double"); else if(value instanceof Date) - type = Inter.getLocText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Date"); else if(value instanceof Boolean) - type = Inter.getLocText("Parameter-Boolean"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); else if(value instanceof BaseFormula) - type = Inter.getLocText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Formula"); else - type = Inter.getLocText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); return StoreProcedureParameterPane.getInfo4Value(type); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java index 876c956a7..cc1b79187 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassNameSelectPane.java @@ -4,7 +4,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.filetree.ClassFileTree; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.tree.TreeSelectionModel; @@ -20,7 +20,7 @@ public class ClassNameSelectPane extends BasicPane { this.add(webDirectoryPane, BorderLayout.NORTH); webDirectoryPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); webDirectoryPane.add(new UILabel( - Inter.getLocText("Function-Choose_Function_Class") + ":")); + com.fr.design.i18n.Toolkit.i18nText("Function-Choose_Function_Class") + ":")); classFileTree = new ClassFileTree(); classFileTree.refreshEnv(); @@ -31,7 +31,7 @@ public class ClassNameSelectPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Function-Function_Class_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Function-Function_Class_Name"); } /* @@ -53,7 +53,7 @@ public class ClassNameSelectPane extends BasicPane { public void checkValid() throws Exception { String classPath = classFileTree.getSelectedClassPath(); if (classPath == null) { - throw new Exception(Inter.getLocText("Function-The_selected_file_cannot_be_null")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Function-The_selected_file_cannot_be_null")); } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 978e5b950..01e8c27b2 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -15,9 +15,10 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; +import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; import javax.swing.*; @@ -44,7 +45,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { classNameTextField = new UITextField(36); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(Inter.getLocText("Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Select")); browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); @@ -63,7 +64,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { dlg.setVisible(true); } }); - UIButton editButton = new UIButton(Inter.getLocText("Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit")); editButton.setPreferredSize(new Dimension( editButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); @@ -89,11 +90,10 @@ public class ClassTableDataPane extends AbstractTableDataPane { }); Component[][] components = { - {new UILabel(Inter.getLocText("DS-Class_Name") + ":"), reportletNamePane}, - {null, new UILabel(Inter.getLocText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")}, - {null, new UILabel(Inter.getLocText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, - {null,new UILabel(Inter.getLocText(new String[]{"Function-The_class_must_be_located_in","Function-J2EE_server"}, - new String[]{" ","\"",File.separator,ProjectConstants.WEBINF_NAME,File.separator,"classes\""}))} + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, + {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(northPane, BorderLayout.NORTH); @@ -112,7 +112,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { new RemoveParaAction() }; } - }, " " + Inter.getLocText("FR-Designer_TableData-Default-Para")); + }, " " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData-Default-Para")); jpanel.add(editorPane, BorderLayout.CENTER); @@ -121,7 +121,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { public class AddParaAction extends UITableEditAction { public AddParaAction() { - this.setName(Inter.getLocText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -137,7 +137,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { } private class RemoveParaAction extends UITableEditAction { public RemoveParaAction() { - this.setName(Inter.getLocText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/remove.png")); } @@ -155,7 +155,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("DS-Class_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("DS-Class_TableData"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index 47d8ab27d..574dcc5aa 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -35,7 +35,7 @@ import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.sql.SqlUtils; import com.fr.script.Calculator; import com.fr.stable.ArrayUtils; @@ -54,8 +54,8 @@ import java.util.List; public class DBTableDataPane extends AbstractTableDataPane { private static final int BOTTOM = 6; - private static final String PREVIEW_BUTTON = Inter.getLocText("FR-Designer_Preview"); - private static final String REFRESH_BUTTON = Inter.getLocText("FR-Designer_Refresh"); + private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"); + private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"); private ConnectionTableProcedurePane connectionTableProcedurePane; private UITableEditorPane editorPane; @@ -133,7 +133,7 @@ public class DBTableDataPane extends AbstractTableDataPane { JPanel paraMeanPane = new JPanel(new BorderLayout()); paraMeanPane.setPreferredSize(new Dimension(680, 90)); - UILabel paraMean = new UILabel(Inter.getLocText("FR-Designer-Datasource-Param_DES")); + UILabel paraMean = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Datasource-Param_DES")); paraMeanPane.add(paraMean, BorderLayout.CENTER); @@ -171,7 +171,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-DS-Database_Query"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-DS-Database_Query"); } private void refresh() { @@ -195,7 +195,7 @@ public class DBTableDataPane extends AbstractTableDataPane { toolBarDef.addShortCut(SeparatorDef.DEFAULT); toolBarDef.addShortCut(dbTableDataMenuHandler.createQueryAction()); } - isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData")); isShareCheckBox.setBackground(Color.WHITE); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); @@ -271,10 +271,10 @@ public class DBTableDataPane extends AbstractTableDataPane { String dbName = this.connectionTableProcedurePane.getSelectedDatabaseConnnectonName(); if (StringUtils.isBlank(dbName) || StringUtils.isBlank(this.sqlTextPane.getText())) { try { - throw new Exception(Inter.getLocText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { // JOptionPane.showMessageDialog(DBTableDataPane.this, - // Inter.getLocText("Connect_SQL_Cannot_Null") + "."); + // com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") + "."); } } @@ -328,13 +328,13 @@ public class DBTableDataPane extends AbstractTableDataPane { private class EditPageQueryAction extends UpdateAction { public EditPageQueryAction() { - this.setName(Inter.getLocText("FR-Designer-LayerPageReport_PageQuery")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_PageQuery")); this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/text.png")); } public void actionPerformed(ActionEvent e) { - final QueryPane pane = new QueryPane(Inter.getLocText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); + final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); pane.populate(pageQuery); BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); dialog.addDialogActionListener(new DialogActionAdapter() { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java index c7e0146e8..6fa627131 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilist.CheckBoxList; import com.fr.design.gui.ilist.CheckBoxList.CheckBoxListSelectionChangeListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.file.TableDataConfig; -import com.fr.general.Inter; + import com.fr.general.data.DataModel; import com.fr.general.data.TableDataException; import com.fr.script.Calculator; @@ -27,7 +27,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane { this.setLayout(new BorderLayout(gap,0)); JPanel northPanel = new JPanel(new BorderLayout()); JPanel type = new JPanel(); - type.add(new UILabel(Inter.getLocText("Utils-File_type") + ":")); + type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":")); String[] item = {"TXT", "Excel", "XML"}; fileTypeComboBox = new UIComboBox(item); fileTypeComboBox.setPreferredSize(new Dimension(100, 20)); @@ -133,7 +133,7 @@ public class FileTableDataPane extends AbstractTableDataPane { // 最上面的pane，文件选择 JPanel centerPanel = new JPanel(); centerPanel.setPreferredSize(new Dimension(522, 200)); - centerPanel.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer-File_address"))); + centerPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-File_address"))); addToCenterPanel(centerPanel); // 下面的pane，参数面板 @@ -151,7 +151,7 @@ public class FileTableDataPane extends AbstractTableDataPane { JPanel setPanel = new JPanel(); southPanel.add(setPanel, BorderLayout.CENTER); setPanel.setPreferredSize(new Dimension(setPanelWidth, 460)); - setPanel.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer_Set"))); + setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"))); JPanel controlPane = textSetPanel(width,height); setPanel.add(controlPane, BorderLayout.NORTH); fileTypeComboBox.addActionListener(getFileTypeListener(setPanel,width,height)); @@ -162,7 +162,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } private void addToCenterPanel(JPanel centerPanel){ - localFileRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-Local_file") + ":", true); + localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Local_file") + ":", true); urlFileRadioButton = new UIRadioButton("URL:", false); ButtonGroup bg = new ButtonGroup(); bg.add(localFileRadioButton); @@ -176,10 +176,10 @@ public class FileTableDataPane extends AbstractTableDataPane { urlText = new UITextField(); urlText.setPreferredSize(new Dimension(195, 20)); urlText.setEditable(false); - chooseFile = new UIButton(Inter.getLocText("FR-Designer_Selection")); + chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection")); chooseFile.addActionListener(chooseFileListener); - testConnection = new UIButton(Inter.getLocText("Datasource-Test_Connection")); + testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); testConnection.setEnabled(false); testConnection.addActionListener(testConnectionListener);// 测试连接按钮 @@ -199,7 +199,7 @@ public class FileTableDataPane extends AbstractTableDataPane { centerPanel.add(filePath, BorderLayout.NORTH); // 中间的pane，提示信息 - String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "
" + String tipContent = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "
" + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; tips = new UILabel(tipContent); centerPanel.add(tips, BorderLayout.CENTER); @@ -209,7 +209,7 @@ public class FileTableDataPane extends AbstractTableDataPane { public void actionPerformed(ActionEvent arg0) { String uri = ParameterHelper.analyze4Templatee( urlText.getText(), params); if (!checkURL(uri)) { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), Inter.getLocText("FR-Designer_Add_JS_warning")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning")); return; } params = getEditorPaneParameter(); @@ -221,10 +221,10 @@ public class FileTableDataPane extends AbstractTableDataPane { FRContext.getLogger().error(e.getMessage(), e); } if (in == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Datasource-Connection_failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Datasource-Connection_successfully")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); try { in.close(); } catch (IOException e) { @@ -236,7 +236,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private void previewPanel(JPanel jPanel){ JPanel previewPanel = new JPanel(new BorderLayout()); - UIButton preview = new UIButton(Inter.getLocText("FR-Designer_Preview")); + UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); preview.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { preview(); @@ -257,7 +257,7 @@ public class FileTableDataPane extends AbstractTableDataPane { controlPane.setLayout(new BorderLayout(8,8)); controlPane.setPreferredSize(new Dimension(width, height)); JPanel comboboxPanel = new JPanel(new BorderLayout(8,8)); - encodeLabel = new UILabel(Inter.getLocText("FR-Designer-Encoding_Type") + ":"); + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Encoding_Type") + ":"); encodingComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); encodingComboBox.setSelectedIndex(4); encodingComboBox.setPreferredSize(new Dimension(90, 20)); @@ -288,7 +288,7 @@ public class FileTableDataPane extends AbstractTableDataPane { JPanel northPane = new JPanel(new BorderLayout(8,8)); controlPane.setLayout(new BorderLayout()); controlPane.setPreferredSize(new Dimension(width,height)); - needColumnNameCheckBox = new UICheckBox(Inter.getLocText("FR-Designer-FirstRow_IS_ColumnName"), false); + needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FirstRow_IS_ColumnName"), false); needColumnNameCheckBox.setPreferredSize(new Dimension(checkBoxWidth, 20)); northPane.add(needColumnNameCheckBox, BorderLayout.EAST); controlPane.add(northPane, BorderLayout.NORTH); @@ -314,7 +314,7 @@ public class FileTableDataPane extends AbstractTableDataPane { if (urlFileRadioButton.isSelected()) { String url = urlText.getText().trim(); if (!checkURL(url)) { - throw new Exception(Inter.getLocText("FR-Designer_Add_JS_warning")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning")); } } @@ -347,16 +347,16 @@ public class FileTableDataPane extends AbstractTableDataPane { double p = TableLayout.PREFERRED; double columnSize[] = {f, p, p}; double rowSize[] = {B, B, B, B, B, B, B}; - needColumnNameCheckBox = new UICheckBox(Inter.getLocText("FR-Designer-FirstRow_IS_ColumnName"), true); - dismenberLabel = new UILabel(Inter.getLocText("FR-Designer_Dismenber") + ":"); - tableDismemberRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_TableDismember"), false); - tableDismemberRadioButton.setToolTipText(Inter.getLocText("FR-Designer_TableDismember")); - spaceDismenberRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Space"), true); - spaceDismenberRadioButton.setToolTipText(Inter.getLocText("FR-Designer_Space")); - commaDismenberRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_CommaDismenber"), false); - commaDismenberRadioButton.setToolTipText(Inter.getLocText("FR-Designer_CommaDismenber")); - otherDismenberRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_Other") + ":", false); - otherDismenberRadioButton.setToolTipText(Inter.getLocText("FR-Designer_Other")); + needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FirstRow_IS_ColumnName"), true); + dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dismenber") + ":"); + tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember"), false); + tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableDismember")); + spaceDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Space"), true); + spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Space")); + commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CommaDismenber"), false); + commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CommaDismenber")); + otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other") + ":", false); + otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other")); otherDismenberTextField = new UITextField(8); otherDismenberTextField.setEditable(false); otherDismenberRadioButton.addChangeListener(new ChangeListener() { @@ -374,8 +374,8 @@ public class FileTableDataPane extends AbstractTableDataPane { bg2.add(spaceDismenberRadioButton); bg2.add(commaDismenberRadioButton); bg2.add(otherDismenberRadioButton); - igoreOneMoreDelimiterCheckBox = new UICheckBox(Inter.getLocText("FR-Designer-Series_Dismenber_As_Single"), true); - encodeLabel = new UILabel(Inter.getLocText("FR-Designer-Encoding_Type") + ":"); + igoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Series_Dismenber_As_Single"), true); + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Encoding_Type") + ":"); charsetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY); Component[][] comps = { {encodeLabel,charsetComboBox,null}, @@ -475,7 +475,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } else { setPanel.add(textSetPanel(width,height), BorderLayout.NORTH); } - String tipContent = Inter.getLocText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" + String tipContent = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; tips.setText(tipContent); setPanel.revalidate(); @@ -487,7 +487,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private class RefreshAction extends UITableEditAction { public RefreshAction() { - this.setName(Inter.getLocText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); } @@ -759,7 +759,7 @@ public class FileTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"File", "DS-TableData"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"); } private void preview() { @@ -782,7 +782,7 @@ public class FileTableDataPane extends AbstractTableDataPane { xmlNodeTree = new XMLNodeTree(); this.add(new JScrollPane(xmlNodeTree)); - keyPointLaber = new UILabel(Inter.getLocText("FR-Designer_KeyPoint") + ":"); + keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_KeyPoint") + ":"); refreshAction = new RefreshParameterAction(); ToolBarDef toolbarDef = new ToolBarDef(); toolbarDef.addShortCut(refreshAction); @@ -800,7 +800,7 @@ public class FileTableDataPane extends AbstractTableDataPane { private class RefreshParameterAction extends UpdateAction { public RefreshParameterAction() { - this.setName(Inter.getLocText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); this.setMnemonic('r'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); } @@ -939,7 +939,7 @@ public class FileTableDataPane extends AbstractTableDataPane { } private void loadedTreeModel(){ - ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(Inter.getLocText("FR-Designer_loadedTreeModel")); + ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_loadedTreeModel")); rootTreeNode.setExpanded(false); rootTreeNode.setAllowsChildren(false); DefaultTreeModel loadedTreeModel = new DefaultTreeModel(rootTreeNode); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index 7e140b464..bd06b39e3 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -10,7 +10,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itoolbar.UIToolbar; -import com.fr.general.Inter; + public class MaxMemRowCountPanel extends UIToolbar { private static final int ALL_IN_MEMORY = 0; @@ -51,7 +51,7 @@ public class MaxMemRowCountPanel extends UIToolbar { this.setFloatable(false); this.setRollover(true); this.setBackground(UIConstants.NORMAL_BACKGROUND); - String[] cacheList = { Inter.getLocText("Save_All_Records_In_Memory"), Inter.getLocText("Max-Mem-Row-Count") }; + String[] cacheList = { com.fr.design.i18n.Toolkit.i18nText("Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Max-Mem-Row-Count") }; switchCache = new UIComboBox(cacheList); switchCache.addActionListener(switchStateL); numberSpinner = new UISpinner(0, Integer.MAX_VALUE, 1); @@ -73,7 +73,7 @@ public class MaxMemRowCountPanel extends UIToolbar { switchCache.setSelectedIndex(MAX_IN_MEMORY); this.add(new UILabel(" ")); this.add(numberSpinner); - this.add(new UILabel(" " + Inter.getLocText("Row"))); + this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Row"))); this.validate(); this.repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java index 0742b542e..ad688e590 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itextfield.UITextField; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -66,7 +66,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane extends UITableModelAdapter { @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + Inter.getLocText("File"))); + FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); if(file == null) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index b01207c8c..7c00fa0f4 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -28,7 +28,7 @@ import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.ConnectionConfig; -import com.fr.general.Inter; + import com.fr.script.Calculator; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -51,7 +51,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp "com.mysql.jdbc.Driver", "org.gjt.mm.mysql.Driver" }; // 需要隐藏面板的数据库的驱动 - private static final String PREVIEW_BUTTON = Inter.getLocText("FR-Designer_Preview"); + private static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"); private ConnectionTableProcedurePane connectionTableProcedurePane; private JPanel cardpane; private CardLayout cardLayout; @@ -88,7 +88,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp storeProcedureContextPane.setPreferredSize(new Dimension(680, 600)); JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - namePane.add(new UILabel(Inter.getLocText("FR-Designer_Datasource-Stored_Procedure") + ":")); + namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure") + ":")); namePane.add(queryText); inAutoeditorPane = new UITableEditorPane(new StoreProcedureTableModel()); autoEditorPane = new UITableEditorPane(new AutoStoreProcedureTableModel()); @@ -153,7 +153,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp toolBarDef.addShortCut(new PreviewAction()); toolBarDef.addShortCut(new RefreshAction()); toolBarDef.addShortCut(SeparatorDef.DEFAULT); - isShareCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData")); maxPanel = new MaxMemRowCountPanel(); maxPanel.setBorder(null); UIToolbar toolbar = ToolBarDef.createJToolBar(); @@ -170,7 +170,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Datasource-Stored_Procedure"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure"); } @Override @@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp warningLabel.setText(StringUtils.EMPTY); } catch (Exception ex) { if (ex instanceof SQLException) { - warningLabel.setText(Inter.getLocText(new String[]{"Database", "Datasource-Connection_failed"})); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); } else { warningLabel.setText(ex.getMessage()); } @@ -237,9 +237,9 @@ public class ProcedureDataPane extends AbstractTableDataPane imp if (StringUtils.isBlank(dbName)) { try { - throw new Exception(Inter.getLocText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { - JOptionPane.showMessageDialog(ProcedureDataPane.this, Inter.getLocText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); } } @@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp storeProcedureContext.setText(procedureText); warningLabel.setText(""); } catch (Exception e) { - warningLabel.setText(Inter.getLocText(new String[]{"Database", "Datasource-Connection_failed"})); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); storeProcedureContext.setText(""); editorPane.populate(new StoreProcedureParameter[0]); } @@ -357,7 +357,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp protected class RefreshAction extends UITableEditAction { public RefreshAction() { - this.setName(Inter.getLocText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java index 9ab922316..d87b2dfbb 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java @@ -33,15 +33,15 @@ public class ProcedureListPane extends JListControlPane { String tempName = getEditingName(); if(StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - //JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), Inter.getLocText("NOT_NULL_Des") + "," + Inter.getLocText("Please_Rename") + "!"); + //JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), com.fr.design.i18n.Toolkit.i18nText("NOT_NULL_Des") + "," + com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!"); setWarnigText(nameableList.getSelectedIndex()); return; } for(int i = 0; i < allDSNames.length; i++) { String dsname = allDSNames[i]; if (ComparatorUtils.equals(dsname, tempName)) { -// JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), Inter.getLocText(new String[]{"already_exists", "TableData"}) -// + tempName + "," + Inter.getLocText("Please_Rename") + "!"); +// JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), com.fr.design.i18n.Toolkit.i18nText(new String[]{"already_exists", "TableData"}) +// + tempName + "," + com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!"); setWarnigText(nameableList.getSelectedIndex()); break; } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java index e5b4b8f07..3c306e8df 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.file.ProcedureConfig; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -22,7 +22,7 @@ public class ProcedureManagerPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Datasource-Stored_Procedure"); + return com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"); } public void populate(ProcedureConfig procedureConfig) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java index 766846e11..065d7ebfe 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.general.NameObject; import javax.swing.*; @@ -29,13 +29,13 @@ public class StoreProcedureParameterPane extends BasicPane { }; private static NameObject[] nameAndValue = new NameObject[]{ - new NameObject(Inter.getLocText("Cursor"), StoreProcedureConstants.CURSOR), - new NameObject(Inter.getLocText("Parameter-String"), StoreProcedureConstants.VARCHAR), - new NameObject(Inter.getLocText("Integer"), StoreProcedureConstants.INTEGER), - new NameObject(Inter.getLocText("Double"), StoreProcedureConstants.DECIMAL), - new NameObject(Inter.getLocText("Date"), StoreProcedureConstants.DATE), - new NameObject(Inter.getLocText("Parameter-Boolean"), StoreProcedureConstants.BOOLEAN), - new NameObject(Inter.getLocText("Formula"), StoreProcedureConstants.FORMULA), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Cursor"), StoreProcedureConstants.CURSOR), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-String"), StoreProcedureConstants.VARCHAR), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Integer"), StoreProcedureConstants.INTEGER), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Double"), StoreProcedureConstants.DECIMAL), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Date"), StoreProcedureConstants.DATE), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"), StoreProcedureConstants.BOOLEAN), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Formula"), StoreProcedureConstants.FORMULA), new NameObject("IN",StoreProcedureConstants.IN), new NameObject("OUT",StoreProcedureConstants.OUT), new NameObject("INOUT",StoreProcedureConstants.INOUT) @@ -61,7 +61,7 @@ public class StoreProcedureParameterPane extends BasicPane { public void checkValid() throws Exception{ StoreProcedureParameter spp=this.update(); if(spp.getSchema()!= StoreProcedureConstants.OUT && spp.getType() == StoreProcedureConstants.CURSOR){ - throw new Exception(Inter.getLocText("IN_and_INOUT_type_not_as_cursor")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("IN_and_INOUT_type_not_as_cursor")); } } @@ -71,11 +71,11 @@ public class StoreProcedureParameterPane extends BasicPane { schemaCombo = new UIComboBox(); initUIComboBox(schemaCombo, schemaName); JPanel namePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - namePane.add(new UILabel(" " + Inter.getLocText("Name") + ":"), BorderLayout.WEST); + namePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Name") + ":"), BorderLayout.WEST); nameField = new UITextField(10); namePane.add(nameField, BorderLayout.CENTER); namePane.add(new UILabel(" "), BorderLayout.EAST); - valuePane.add(new UILabel(" " + Inter.getLocText("CellWrite-InsertRow_DEFAULT") + ":"), BorderLayout.WEST); + valuePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_DEFAULT") + ":"), BorderLayout.WEST); valuePane.add(valueEditPane, BorderLayout.CENTER); valuePane.add(new UILabel(" "), BorderLayout.EAST); Component[][] components = {{null}, @@ -95,7 +95,7 @@ public class StoreProcedureParameterPane extends BasicPane { private JPanel addPane(String s, int i, UIComboBox combo){ JPanel pane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - pane.add(new UILabel(" " + Inter.getLocText(s) + ":"), BorderLayout.WEST); + pane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText(s) + ":"), BorderLayout.WEST); combo.setSelectedIndex(i); pane.add(combo, BorderLayout.CENTER); pane.add(new UILabel(" "), BorderLayout.EAST); @@ -105,7 +105,7 @@ public class StoreProcedureParameterPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Parameter"); } public void populate(StoreProcedureParameter stpParameter) { @@ -124,24 +124,24 @@ public class StoreProcedureParameterPane extends BasicPane { Object value = valueEditPane.update(); String type = ""; if(value instanceof CursorEditor) - type=Inter.getLocText("Cursor"); + type=com.fr.design.i18n.Toolkit.i18nText("Cursor"); else if(value instanceof String ){ if(((String) value).length() > 0 && ((String) value).charAt(0) == '=') - type = Inter.getLocText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Formula"); else - type = Inter.getLocText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); }else if(value instanceof Integer) - type = Inter.getLocText("Integer"); + type = com.fr.design.i18n.Toolkit.i18nText("Integer"); else if(value instanceof Double) - type = Inter.getLocText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Double"); else if(value instanceof Date) - type = Inter.getLocText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Date"); else if(value instanceof Boolean) - type = Inter.getLocText("Parameter-Boolean"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); else if(value instanceof BaseFormula) - type = Inter.getLocText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Formula"); else - type = Inter.getLocText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); int typeVl = getInfo4Value(type); p.setType(typeVl); String schema = (String)schemaCombo.getSelectedItem(); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java index 54c996f6e..b9276310f 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java @@ -13,12 +13,12 @@ import com.fr.design.gui.itableeditorpane.UITableModelAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.general.Inter; + public class StoreProcedureTableModel extends UITableModelAdapter { public StoreProcedureTableModel() { - super(new String[] { Inter.getLocText("Parameter"), Inter.getLocText("Type"), Inter.getLocText("Model"), Inter.getLocText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Type"), com.fr.design.i18n.Toolkit.i18nText("Model"), com.fr.design.i18n.Toolkit.i18nText("Value") }); if (shouldResponseDoubleClickAction()) { table.addMouseListener(new MouseAdapter() { @@ -36,7 +36,7 @@ public class StoreProcedureTableModel extends UITableModelAdapter @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Tree", "DS-TableData"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index 845f03e32..c3ad8fa4e 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -14,7 +14,7 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.util.ArrayList; @@ -79,7 +79,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { getWorker().cancel(true); } }); - loadingBar = new AutoProgressBar(dialog, Inter.getLocText("FR-Designer_Loading_Data"), "", 0, 100) { + loadingBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading_Data"), "", 0, 100) { public void doMonitorCanceled() { getDialog().setVisible(false); getWorker().cancel(true); @@ -101,7 +101,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { return columnNameList; } if (!createStore(false)) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Engine_No-tableData")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_No-tableData")); return new ArrayList(); } columnNameList = Arrays.asList(procedureDataModel.getColumnName()); @@ -176,7 +176,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { return null; } }.execute(); - connectionBar = new AutoProgressBar(dialog, Inter.getLocText("Utils-Now_create_connection"), "", 0, 100) { + connectionBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Utils-Now_create_connection"), "", 0, 100) { public void doMonitorCanceled() { connectionBar.close(); worker.cancel(true); @@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { connectionBar.close(); // bug 61345 预览失败时，关闭窗口 dialog.setVisible(false); - throw new Exception(Inter.getLocText("Datasource-Connection_failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); } connectionBar.close(); storeProcedure.resetDataModelList(); diff --git a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java b/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java index c705b0e1d..a50b84641 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/BasicPane.java @@ -2,7 +2,7 @@ package com.fr.design.dialog; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.stable.core.PropertyChangeAdapter; import com.fr.design.utils.gui.GUICoreUtils; @@ -309,7 +309,7 @@ public abstract class BasicPane extends JPanel { nameTextField = new UITextField(30); JPanel northPane = new JPanel(new BorderLayout(4, 4)); - northPane.add(new UILabel(Inter.getLocText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST); northPane.add(nameTextField, BorderLayout.CENTER); northPane.add(showfield = new UILabel(" "), BorderLayout.EAST); showfield.setForeground(new Color(204, 0, 1)); diff --git a/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java b/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java index fc8643d97..40eff1707 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java +++ b/designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java @@ -23,7 +23,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; public class InformationWarnPane extends JPanel{ @@ -80,7 +80,7 @@ public class InformationWarnPane extends JPanel{ }); arrow.setBounds(90,100,30,30); - UILabel more = new UILabel(""+Inter.getLocText("More-information")+""); + UILabel more = new UILabel(""+com.fr.design.i18n.Toolkit.i18nText("More-information")+""); more.setBounds(125,102,55,25); moreText = new UITextArea(moreInfo); @@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{ private JPanel createControlButtonPane() { controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - okButton = new UIButton("" + Inter.getLocText("OK") + "") { + okButton = new UIButton("" + com.fr.design.i18n.Toolkit.i18nText("OK") + "") { @Override public Dimension getPreferredSize() { // TODO Auto-generated method stub diff --git a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java index fd8c77b87..0326540ab 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java @@ -19,7 +19,7 @@ import javax.swing.JSeparator; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + /** * Wizard dialog. @@ -104,25 +104,25 @@ public class JWizardDialog extends BasicDialog { workArea.setLayout(cardLayout); // Buttons - buttonBack = new UIButton(Inter.getLocText("Previous")); + buttonBack = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Previous")); buttonBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { back(); } }); - buttonNext = new UIButton(Inter.getLocText("Next")); + buttonNext = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Next")); buttonNext.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { next(); } }); - buttonFinish = new UIButton(Inter.getLocText("Finish")); + buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Finish")); buttonFinish.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { finish(); } }); - buttonCancel = new UIButton(Inter.getLocText("Cancel")); + buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); buttonCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { cancel(); diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index 84a529a47..dad7a8731 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -4,7 +4,7 @@ import com.fr.base.FRContext; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -100,7 +100,7 @@ public abstract class UIDialog extends JDialog { } private void addCancelButton(JPanel buttonsPane) { - cancelButton = new UIButton(Inter.getLocText("Cancel")); + cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); cancelButton.setName(CANCEL_BUTTON); cancelButton.setMnemonic('C'); buttonsPane.add(cancelButton); @@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog { } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(Inter.getLocText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); okButton.setName(OK_BUTTON); okButton.setMnemonic('O'); buttonsPane.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java index 40c6059c4..7768cd036 100644 --- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java @@ -20,7 +20,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -67,7 +67,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); JPanel content = (JPanel) jf.getContentPane(); content.setLayout(new BorderLayout()); - content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula"))}), BorderLayout.NORTH); + content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}), BorderLayout.NORTH); GUICoreUtils.centerWindow(jf); jf.setSize(290, 400); jf.setVisible(true); @@ -97,7 +97,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, @Override public void stateChanged(ChangeEvent e) { if (globalNameListener != null) { - globalNameListener.setGlobalName(Inter.getLocText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); } Object oldValue = currentEditor.getValue(); setCurrentEditor(upButton.getSelectedIndex()); @@ -116,7 +116,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); } public Editor getCurrentEditor() { @@ -164,7 +164,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (globalNameListener != null) { - globalNameListener.setGlobalName(Inter.getLocText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); } Object oldValue = currentEditor.getValue(); setCurrentEditor(j); @@ -222,7 +222,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, String name = currentEditor.getName(); Object columnIndex = currentEditor.getValue(); //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了? - if (columnIndex == null && ComparatorUtils.equals(name, Inter.getLocText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { columnIndex = ((FormulaEditor) currentEditor).getFormula(); } @@ -238,7 +238,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, Object columnIndex = currentEditor.getValue(); Object columnName = StringUtils.EMPTY; - if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); } @@ -254,7 +254,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, Object columnIndex = currentEditor.getValue(); Object columnName = StringUtils.EMPTY; - if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); } @@ -283,7 +283,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, int i; boolean containFormulaType = false; for (i = 0; i < cards.length; i++) { - if (ComparatorUtils.equals(cards[i].getName(), Inter.getLocText("FR-Engine_Parameter-Formula"))) { + if (ComparatorUtils.equals(cards[i].getName(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula"))) { containFormulaType = true; break; } @@ -302,8 +302,8 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager(); if (designerEnvManager.isSupportStringToFormula()) { if (!designerEnvManager.isDefaultStringToFormula()) { - int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Edit_String_To_Formula") - + "?", Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); + int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_String_To_Formula") + + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); if (returnValue == JOptionPane.OK_OPTION) { setCurrentEditor(j); diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java index b54dfcaa1..88651f32b 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.imenu.UIPopupEastAttrMenu; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -101,7 +101,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); } public Editor getCurrentEditor() { @@ -153,7 +153,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (globalNameListener != null) { - globalNameListener.setGlobalName(Inter.getLocText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); } Object oldValue = currentEditor.getValue(); setCurrentEditor(j); @@ -207,7 +207,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName Object columnIndex = currentEditor.getValue(); //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了? //MoMeak：我也想注释了，但是有bug啊。。。 - if (columnIndex == null && ComparatorUtils.equals(name, Inter.getLocText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { columnIndex = ((FormulaEditor) currentEditor).getFormula(); } @@ -219,7 +219,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName Object columnIndex = currentEditor.getValue(); Object columnName = StringUtils.EMPTY; - if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); } @@ -235,7 +235,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName Object columnIndex = currentEditor.getValue(); Object columnName = StringUtils.EMPTY; - if (ComparatorUtils.equals(name, Inter.getLocText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); } @@ -264,7 +264,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName int i; boolean containFormulaType = false; for (i = 0; i < cards.length; i++) { - if (ComparatorUtils.equals(cards[i].getName(), Inter.getLocText("FR-Engine_Parameter-Formula"))) { + if (ComparatorUtils.equals(cards[i].getName(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula"))) { containFormulaType = true; break; } @@ -283,8 +283,8 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName DesignerEnvManager designerEnvManager = DesignerEnvManager.getEnvManager(); if (designerEnvManager.isSupportStringToFormula()) { if (!designerEnvManager.isDefaultStringToFormula()) { - int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Edit_String_To_Formula") - + "?", Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); + int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_String_To_Formula") + + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); if (returnValue == JOptionPane.OK_OPTION) { setCurrentEditor(j); diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java index 083131f0a..aaecbcef4 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java @@ -20,7 +20,7 @@ import com.fr.design.editor.editor.WidgetNameEditor; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -83,7 +83,7 @@ public class ValueEditorPaneFactory { * @return 返回公式编辑器面板 */ public static ValueEditorPane createFormulaValueEditorPane() { - return createValueEditorPane(new Editor[]{new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula"))}, + return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}, StringUtils.EMPTY, StringUtils.EMPTY); } @@ -227,12 +227,12 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] basicEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new SpinnerIntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor }; @@ -244,15 +244,15 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] formEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor, - new WidgetNameEditor(Inter.getLocText("FR-Designer_Widget")) + new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget")) }; } @@ -262,16 +262,16 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] extendedEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(Inter.getLocText("FR-Designer_Cell")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")) }; } @@ -281,17 +281,17 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] extendedCellGroupEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(Inter.getLocText("FR-Designer_Cell")), - new ColumnRowGroupEditor(Inter.getLocText("FR-Designer-Cell_Group")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group")) }; } @@ -302,8 +302,8 @@ public class ValueEditorPaneFactory { */ public static Editor[] cellGroupEditor() { return new Editor[]{ - new ColumnRowEditor(Inter.getLocText("FR-Designer_Cell")), - new ColumnRowGroupEditor(Inter.getLocText("FR-Designer-Cell_Group")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group")) }; } @@ -316,7 +316,7 @@ public class ValueEditorPaneFactory { */ public static Editor[] URLEditors(String popupName, String textEditorValue) { return new Editor[]{ - new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("FR-Designer_None") : popupName), + new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName), new TextEditor() }; } @@ -330,9 +330,9 @@ public class ValueEditorPaneFactory { */ public static Editor[] dateEditors(String popupName, String textEditorValue) { return new Editor[]{ - new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? Inter.getLocText("FR-Designer_None") : popupName), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), - new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")) + new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")) }; } @@ -342,20 +342,20 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] allEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); // formulaEditor.setEnabled(true); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(Inter.getLocText("FR-Designer_Cell")), + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), new ColumnSelectedEditor(), //23328 allEditors中删除控件选项 -// new WidgetNameEditor(Inter.getLocText("Widget")) +// new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Widget")) }; } @@ -369,7 +369,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), }; } @@ -380,12 +380,12 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] noCRnoColumnEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), @@ -398,7 +398,7 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] numberEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ new IntegerEditor(), new DoubleEditor(), @@ -413,9 +413,9 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] dateEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), formulaEditor, new ParameterEditor(), }; @@ -427,14 +427,14 @@ public class ValueEditorPaneFactory { * @return 存储过程的编辑器 */ public static Editor[] StoreProcedureEditors() { - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); return new Editor[]{ new CursorEditor(), new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, Inter.getLocText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), new BooleanEditor(), formulaEditor }; @@ -451,10 +451,10 @@ public class ValueEditorPaneFactory { list.add(new TextEditor()); list.add(new IntegerEditor()); list.add(new DoubleEditor()); - list.add(new DateEditor(true, Inter.getLocText("FR-Designer_Date"))); + list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"))); list.add(new BooleanEditor()); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); list.add(formulaEditor); @@ -493,12 +493,12 @@ public class ValueEditorPaneFactory { JPanel paneLeft = FRGUIPaneFactory.createBorderLayout_S_Pane(); pane.add(paneLeft); - paneLeft.add(new UILabel(" " + Inter.getLocText("FR-Designer_Actual_Value") + ":"), BorderLayout.NORTH); + paneLeft.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value") + ":"), BorderLayout.NORTH); paneLeft.add(keyColumnPane, BorderLayout.CENTER); JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane(); pane.add(paneRight); - paneRight.add(new UILabel(" " + Inter.getLocText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH); + paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH); paneRight.add(valueDictPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java index 7f8dce7f2..78ee449d9 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/BooleanEditor.java @@ -5,7 +5,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -42,7 +42,7 @@ public class BooleanEditor extends Editor { booleanCheckBox = new UICheckBox("true"); this.add(booleanCheckBox, BorderLayout.CENTER); this.setValue(value); - this.setName(Inter.getLocText("Parameter-Boolean")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean")); booleanCheckBox.addItemListener(new ItemListener() { @Override public void itemStateChanged(ItemEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java index ae0e7aff8..d092db22b 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnIndexEditor.java @@ -1,7 +1,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.icombobox.IntComboBox; -import com.fr.general.Inter; + import java.awt.*; import java.awt.event.ActionListener; @@ -26,7 +26,7 @@ public class ColumnIndexEditor extends Editor { * @param value */ public ColumnIndexEditor(int value) { - this(value, Inter.getLocText("Datasource-Column_Index")); + this(value, com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); } public ColumnIndexEditor(int value, String name) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java index 957088fe7..3cd7dddb2 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java @@ -1,7 +1,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.icombobox.UIComboBoxRenderer; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -23,7 +23,7 @@ public class ColumnNameEditor extends ColumnIndexEditor { } public ColumnNameEditor(String[] columnNames) { - this(columnNames, Inter.getLocText("ColumnName")); + this(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")); } public ColumnNameEditor(final String[] columnNames, String name) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java index 037129e59..9bfb26987 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -6,7 +6,7 @@ import com.fr.design.data.datapane.TableDataComboBox; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.general.data.TableDataColumn; import com.fr.stable.StringUtils; @@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor { protected String[] columnNames; public ColumnSelectedEditor() { - this.setName(Inter.getLocText(new String[]{"Data", "Columns"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column")); this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); columnNames = new String[0]; diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java index 19357338c..461d657f1 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java @@ -5,17 +5,17 @@ import java.awt.Dimension; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + //TODO:august what's this? public class CursorEditor extends Editor { private UILabel label; public CursorEditor(){ this.setLayout(FRGUIPaneFactory.createCenterFlowLayout()); - label = new UILabel(Inter.getLocText("Cursor")); + label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Cursor")); this.add(label); this.setPreferredSize(new Dimension(10,20)); - this.setName(Inter.getLocText("Cursor")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Cursor")); this.setEnabled(false); } @@ -36,7 +36,7 @@ public class CursorEditor extends Editor { @Override public void setValue(CursorEditor value) { - label.setText(Inter.getLocText("Cursor")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Cursor")); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/DoubleEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/DoubleEditor.java index e20a1aa3d..0604c677a 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/DoubleEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/DoubleEditor.java @@ -1,7 +1,7 @@ package com.fr.design.editor.editor; import com.fr.base.Utils; -import com.fr.general.Inter; + /** * 双精度编辑器 @@ -16,7 +16,7 @@ public class DoubleEditor extends NumberEditor { } public DoubleEditor(Double value) { - super(value, Inter.getLocText("Parameter-Double")); + super(value, com.fr.design.i18n.Toolkit.i18nText("Parameter-Double")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/FloatEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/FloatEditor.java index 68fee105b..00909d7f0 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/FloatEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/FloatEditor.java @@ -1,7 +1,7 @@ package com.fr.design.editor.editor; import com.fr.base.Utils; -import com.fr.general.Inter; + /** * 单精度型编辑器 @@ -16,7 +16,7 @@ public class FloatEditor extends NumberEditor { } public FloatEditor(Float value) { - super(value, Inter.getLocText("Parameter-Float")); + super(value, com.fr.design.i18n.Toolkit.i18nText("Parameter-Float")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java index 4c5e9932e..86fbe305b 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/IntegerEditor.java @@ -1,7 +1,7 @@ package com.fr.design.editor.editor; import com.fr.base.Utils; -import com.fr.general.Inter; + /** * 整数编辑器 @@ -18,7 +18,7 @@ public class IntegerEditor extends NumberEditor { } public IntegerEditor(Integer value) { - super(value, Inter.getLocText("FR-Designer_Parameter_Integer")); + super(value, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java index bf867f49f..42d117862 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java @@ -5,7 +5,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.icombobox.IntComboBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -51,8 +51,8 @@ public class OldColumnIndexEditor extends Editor { } protected void initComponents() { - indexCheckBox = new UIRadioButton(Inter.getLocText("Datasource-Column_Index")); - nameCheckBox = new UIRadioButton(Inter.getLocText("ColumnName")); + indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); + nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName")); indexCheckBox.addActionListener(actionListener); nameCheckBox.addActionListener(actionListener); javax.swing.ButtonGroup buttonGroup = new javax.swing.ButtonGroup(); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java index 445ef4a71..813ca021f 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ParameterEditor.java @@ -3,7 +3,7 @@ package com.fr.design.editor.editor; import com.fr.base.Parameter; import com.fr.design.gui.icombobox.ParameterComboBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import java.awt.*; @@ -28,7 +28,7 @@ public class ParameterEditor extends Editor { this.add(parameterCombobox, BorderLayout.CENTER); this.setValue(parameter); - this.setName(Inter.getLocText("Parameter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java index 5448a0868..140ea8d94 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/SpinnerIntegerEditor.java @@ -3,7 +3,7 @@ package com.fr.design.editor.editor; import com.fr.base.Utils; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import java.awt.*; @@ -21,7 +21,7 @@ public class SpinnerIntegerEditor extends Editor { spinner = new UISpinner(-Integer.MAX_VALUE, Integer.MAX_VALUE, 1, 0); this.add(spinner, BorderLayout.CENTER); this.spinner.addKeyListener(textKeyListener); - this.setName(Inter.getLocText("FR-Designer_Parameter_Integer")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java index 630f6956a..0632be2e4 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/TextEditor.java @@ -5,7 +5,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import java.awt.BorderLayout; @@ -45,7 +45,7 @@ public class TextEditor extends Editor { this.textField.addKeyListener(textKeyListener); this.setValue(value); - this.setName(Inter.getLocText("Parameter-String")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter-String")); } public UITextField getTextField() { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/XMLANameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/XMLANameEditor.java index 18cf7b7c4..567670164 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/XMLANameEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/XMLANameEditor.java @@ -5,7 +5,7 @@ package com.fr.design.editor.editor; import com.fr.design.gui.icombobox.UIComboBoxRenderer; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -34,7 +34,7 @@ public class XMLANameEditor extends ColumnIndexEditor{ * @param columnNames 度量值 */ public XMLANameEditor(String[] columnNames) { - this(columnNames, Inter.getLocText("Measure")); + this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Measure")); } /** diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java index 9719bc097..d2b30d312 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java @@ -3,7 +3,7 @@ package com.fr.design.extra; import com.fr.base.BaseUtils; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -98,7 +98,7 @@ public abstract class PluginAbstractLoadingViewPane extends PluginAbstract @Override public String textForInstallButton() { - return Inter.getLocText("FR-Designer-Plugin_Install"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install"); } diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java index be3c8601d..ca1620aeb 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginControlPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilist.UIList; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.license.Licensed; @@ -59,7 +59,7 @@ public class PluginControlPane extends BasicPane { doSearch(searchTextField.getText()); } }); - add(GUICoreUtils.createFlowPane(new UILabel(Inter.getLocText("FR-Designer-Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH); + add(GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH); pluginList = new UIList(); DefaultListCellRenderer renderer = new DefaultListCellRenderer() { @@ -74,12 +74,12 @@ public class PluginControlPane extends BasicPane { } String extraInfo = ""; if (context.isLicDamaged()) { - extraInfo = "(" + Inter.getLocText("FR-Plugin-Plugin_Damaged") + ")"; + extraInfo = "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Plugin_Damaged") + ")"; } else if (!context.isFree()) { if (context.isAvailable()) { - extraInfo = "(" + (context.isOnTrial() ? Inter.getLocText("FR-Plugin-Designer_Trial") : Inter.getLocText("FR-Plugin-Designer_Authorized")) + context.getLeftDays() + Inter.getLocText("FR-Plugin-Designer_Left") + ")"; + extraInfo = "(" + (context.isOnTrial() ? com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Trial") : com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Authorized")) + context.getLeftDays() + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Left") + ")"; } else { - extraInfo = "(" + (context.isOnTrial() ? Inter.getLocText("FR-Plugin-Designer_Trial") : Inter.getLocText("FR-Plugin-Designer_Authorized")) + Inter.getLocText("FR-Plugin-Designer_Expired") + ")"; + extraInfo = "(" + (context.isOnTrial() ? com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Trial") : com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Authorized")) + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Designer_Expired") + ")"; } } setText(((PluginView) value).getName() + extraInfo); @@ -95,7 +95,7 @@ public class PluginControlPane extends BasicPane { PluginDescriptionLabel label = new PluginDescriptionLabel(); - label.setText(Inter.getLocText("FR-Designer-Plugin_Plugin")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin")); JPanel leftPane = GUICoreUtils.createBorderLayoutPane( jScrollPane, BorderLayout.CENTER, label, BorderLayout.NORTH diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginDetailPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginDetailPane.java index 831ccbbc5..2d87777fa 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginDetailPane.java @@ -1,7 +1,7 @@ package com.fr.design.extra; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.view.PluginView; import com.fr.stable.StringUtils; @@ -26,7 +26,7 @@ public class PluginDetailPane extends BasicPane { public PluginDetailPane() { setLayout(new BorderLayout()); PluginDescriptionLabel label = new PluginDescriptionLabel(); - label.setText(Inter.getLocText("FR-Designer-Plugin_Plugin_Description")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin_Description")); add(label, BorderLayout.NORTH); textPane = new JEditorPane(); diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java index 1e30a1656..c02d2c416 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java @@ -5,7 +5,7 @@ import com.fr.config.MarketConfig; import com.fr.design.extra.tradition.callback.UpdateOnlineCallback; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; @@ -59,13 +59,13 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane plugins) { controlPane.loadPlugins(plugins); - tabbedPane.setTitleAt(2, Inter.getLocText("FR-Designer-Plugin_All_Plugins") + "(" + plugins.size() + ")"); + tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_All_Plugins") + "(" + plugins.size() + ")"); } /** @@ -176,15 +176,15 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane plugins) { controlPane.loadPlugins(plugins); - tabbedPane.setTitleAt(1, Inter.getLocText("FR-Designer-Plugin_Update") + "(" + plugins.size() + ")"); + tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update") + "(" + plugins.size() + ")"); } /** @@ -155,7 +155,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane map = new HashMap(); map.put("name", pluginName); @@ -172,7 +172,7 @@ public class PluginUtils { return ""; } - return Inter.getLocText(getInterKeyByErrorCode(errorCode)); + return com.fr.design.i18n.Toolkit.i18nText(getInterKeyByErrorCode(errorCode)); } private static String getInterKeyByErrorCode(PluginErrorCode errorCode) { @@ -246,7 +246,7 @@ public class PluginUtils { int leftDays = plugin.getLeftDays(); if (leftDays == Integer.MAX_VALUE) { - return Inter.getLocText("FR-Plugin-Store_Permanent"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Store_Permanent"); } Calendar deadline = Calendar.getInstance(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java index 931f5d68a..daa665f25 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java @@ -14,7 +14,7 @@ import com.fr.design.extra.exe.SearchOnlineExecutor; import com.fr.design.extra.exe.callback.JSCallback; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.concurrent.ThreadFactoryBuilder; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.json.JSONException; import com.fr.json.JSONObject; @@ -380,11 +380,11 @@ public class PluginWebBridge { int rv = JOptionPane.showOptionDialog( null, message, - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, - new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later")}, null ); if (rv == JOptionPane.OK_OPTION) { @@ -556,7 +556,7 @@ public class PluginWebBridge { public void clearUserInfo() { MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY); BBSLoginUtils.bbsLogout(); - uiLabel.setText(Inter.getLocText("FR-Base_UnSignIn")); + uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); } public void getPackInfo(final JSObject callback){ @@ -575,7 +575,7 @@ public class PluginWebBridge { * 国际化 */ public String parseI18(final String key) { - return Inter.getLocText(I18N_PREFIX + key); + return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key); } /** diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginsReaderFromStore.java b/designer-base/src/main/java/com/fr/design/extra/PluginsReaderFromStore.java index 06a2706d5..747e12acf 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginsReaderFromStore.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginsReaderFromStore.java @@ -2,7 +2,7 @@ package com.fr.design.extra; import com.fr.general.CloudCenter; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; @@ -37,7 +37,7 @@ public class PluginsReaderFromStore { String charSet = EncodeConstants.ENCODING_UTF_8; resText = URLDecoder.decode(URLDecoder.decode(resText, charSet), charSet); } catch (Exception e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_PluginMarket_Coding")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_PluginMarket_Coding")); } return parseResText(resText, plugins); } @@ -75,7 +75,7 @@ public class PluginsReaderFromStore { } } } catch (JSONException e) { - throw new Exception(Inter.getLocText("FR-Designer-Plugin_Read_Plugin_List_Error")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Read_Plugin_List_Error")); } } return new ArrayList<>(plugins); diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java index 71224c3a8..d2a20e05f 100644 --- a/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java +++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginDialog.java @@ -2,7 +2,7 @@ package com.fr.design.extra; import com.fr.design.dialog.UIDialog; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -22,7 +22,7 @@ public class QQLoginDialog extends UIDialog { setSize(DEFAULT_SHOP); GUICoreUtils.centerWindow(this); setResizable(false); - setTitle(Inter.getLocText("FR-Designer-Plugin_Manager")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java index 1d6b7c7a3..dd7e9b915 100644 --- a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java @@ -168,7 +168,7 @@ public class QQLoginWebPane extends JFXPanel { new Scene( HBoxBuilder.create().styleClass("modal-dialog").children( LabelBuilder.create().text(msg).build(), - ButtonBuilder.create().text(Inter.getLocText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler() { + ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler() { @Override public void handle(ActionEvent actionEvent) { // take action and close the dialog. @@ -177,7 +177,7 @@ public class QQLoginWebPane extends JFXPanel { dialog.close(); } }).build(), - ButtonBuilder.create().text(Inter.getLocText("FR-Engine_Cancel")).cancelButton(true).onAction(new EventHandler() { + ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Cancel")).cancelButton(true).onAction(new EventHandler() { @Override public void handle(ActionEvent actionEvent) { // abort action and close the dialog. diff --git a/designer-base/src/main/java/com/fr/design/extra/ShopManagerPane.java b/designer-base/src/main/java/com/fr/design/extra/ShopManagerPane.java index 49d89733d..4adb07457 100644 --- a/designer-base/src/main/java/com/fr/design/extra/ShopManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/ShopManagerPane.java @@ -1,7 +1,7 @@ package com.fr.design.extra; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import java.awt.BorderLayout; import java.awt.Component; @@ -26,6 +26,6 @@ public class ShopManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java index dfca29ea8..5cf9258ab 100644 --- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java @@ -9,7 +9,7 @@ import com.fr.general.CommonIOUtils; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.general.http.HttpClient; import com.fr.json.JSONObject; @@ -64,8 +64,8 @@ public class WebViewDlgHelper { if (!file.exists()) { int rv = JOptionPane.showConfirmDialog( null, - Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE ); @@ -81,8 +81,8 @@ public class WebViewDlgHelper { } else { int rv = JOptionPane.showConfirmDialog( null, - Inter.getLocText("Fine-Plugin_Shop_Need_Install_Version"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Shop_Need_Install_Version"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE ); @@ -96,7 +96,7 @@ public class WebViewDlgHelper { BasicPane traditionalStorePane = new BasicPane() { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); } }; traditionalStorePane.setLayout(new BorderLayout()); @@ -201,8 +201,8 @@ public class WebViewDlgHelper { private static void confirmDownLoadShopJS() { int rv = JOptionPane.showConfirmDialog( null, - Inter.getLocText("FR-Designer-Plugin_Shop_Need_Install"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE ); @@ -249,8 +249,8 @@ public class WebViewDlgHelper { UITabbedPane tabbedPane = new UITabbedPane(); PluginInstalledPane installedPane = new PluginInstalledPane(); tabbedPane.addTab(installedPane.tabTitle(), installedPane); - tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane)); - tabbedPane.addTab(Inter.getLocText("FR-Designer-Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); return tabbedPane; } @@ -266,7 +266,7 @@ public class WebViewDlgHelper { } }); } catch (PluginVerifyException e) { - JOptionPane.showMessageDialog(null, e.getMessage(), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); return false; } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -282,7 +282,7 @@ public class WebViewDlgHelper { if (get()) { IOUtils.unzip(new File(StableUtils.pathJoin(PluginConstants.DOWNLOAD_PATH, PluginConstants.TEMP_FILE)), installHome); PluginStoreConstants.refreshProps(); // 下载完刷新一下版本号等 - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Shop_Installed"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE); } } catch (InterruptedException | ExecutionException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -305,8 +305,8 @@ public class WebViewDlgHelper { if (!ComparatorUtils.equals(isLatest, LATEST)) { int rv = JOptionPane.showConfirmDialog( null, - Inter.getLocText("FR-Designer-Plugin_Shop_Need_Update"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Update"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE ); diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java index b9d04ecd1..8928c3671 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java @@ -2,7 +2,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginOperateUtils; import com.fr.design.extra.PluginUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -37,13 +37,13 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("success"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Success")); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Install_Success")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Success")); } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText(Inter.getLocText("FR-Plugin_Install_Dependence")), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -62,8 +62,8 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Plugin_Has_Install_Lower"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Install_Lower"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -76,8 +76,8 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback); }else { jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed")); - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE); } } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java index 49da09b9c..7055df6c9 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallOnlineCallback.java @@ -1,7 +1,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginOperateUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -35,13 +35,13 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { String pluginInfo = PluginOperateUtils.getSuccessInfo(result); if (result.isSuccess()) { jsCallback.execute("success"); - FineLoggerFactory.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Install_Success")); - JOptionPane.showMessageDialog(null, pluginInfo + Inter.getLocText("FR-Plugin_Install_Success")); + FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Success")); + JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Success")); } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Plugin_Has_Install_Lower"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Install_Lower"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -55,8 +55,8 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback); }else { jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed")); - JOptionPane.showMessageDialog(null, pluginInfo, Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Install_Failed")); + JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java index 3f01f42e5..a945e8544 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/ModifyStatusCallback.java @@ -1,7 +1,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginUtils; -import com.fr.general.Inter; + import com.fr.plugin.manage.control.PluginTaskCallback; import com.fr.plugin.manage.control.PluginTaskResult; @@ -22,10 +22,10 @@ public class ModifyStatusCallback implements PluginTaskCallback{ public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("success"); - String modifyMessage = isActive ? Inter.getLocText("FR-Plugin_Has_Been_Disabled") : Inter.getLocText("FR-Plugin_Has_Been_Actived"); + String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Been_Disabled") : com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Been_Actived"); JOptionPane.showMessageDialog(null, modifyMessage); } else { - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java index be67ce617..d3d1b2ab0 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java @@ -1,7 +1,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -25,13 +25,13 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("success"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Success")); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Delete_Success")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Success")); }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText(Inter.getLocText("FR-Plugin_Delete_Dependence")), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -44,8 +44,8 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback)); } else { jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Failed")); - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java index 586538a93..2d7ed2c06 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java @@ -2,7 +2,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginOperateUtils; import com.fr.design.extra.PluginUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -37,13 +37,13 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("success"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Success")); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Update_Success")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Success")); } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText(Inter.getLocText("FR-Plugin_Update_Dependence")), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -62,8 +62,8 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { } else if(result.errorCode() == PluginErrorCode.NoPluginToUpdate){ int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Plugin_No_Plugin_Update"), - Inter.getLocText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_No_Plugin_Update"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -76,8 +76,8 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback); }else { jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed")); - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java index 8219fbe06..cad84e8c9 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java @@ -1,7 +1,7 @@ package com.fr.design.extra.exe.callback; import com.fr.design.extra.PluginOperateUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.manage.control.AbstractDealPreTaskCallback; import com.fr.plugin.manage.control.PluginTask; @@ -31,12 +31,12 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback { String pluginInfo = PluginOperateUtils.getSuccessInfo(result); if (result.isSuccess()) { jsCallback.execute("success"); - FineLoggerFactory.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Update_Success")); - JOptionPane.showMessageDialog(null,pluginInfo + Inter.getLocText("FR-Plugin_Update_Success")); + FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Success")); + JOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Success")); } else { jsCallback.execute("failed"); - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed")); - JOptionPane.showMessageDialog(null, pluginInfo, Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Update_Failed")); + JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } } diff --git a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java index 78661fabd..645fa3df4 100644 --- a/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java +++ b/designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java @@ -2,7 +2,7 @@ package com.fr.design.extra.tradition.callback; import com.fr.design.extra.PluginStatusCheckCompletePane; import com.fr.design.extra.PluginUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.error.PluginErrorCode; @@ -31,13 +31,13 @@ public class UpdateOnlineCallback implements ProgressCallback { public void done(PluginTaskResult result){ if (result.isSuccess()) { - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success")); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Successful")); } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText(Inter.getLocText("FR-Designer-Plugin_Install_Dependence")), - Inter.getLocText("FR-Designer-Plugin_Install_Success"), + com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence")), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, null, @@ -49,8 +49,8 @@ public class UpdateOnlineCallback implements ProgressCallback { } PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane)); } else { - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Failed")); - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Delete_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } } diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java index 7e2f34593..12dad2ea8 100644 --- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java +++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java @@ -18,7 +18,7 @@ import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; import com.fr.stable.StableUtils; @@ -123,7 +123,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C try { historyList.remove(contains(selected)); selected.getEditingFILE().closeTemplate(); - FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "alraedy_close"}, new String[]{selected.getEditingFILE().getName(), "."})); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Closed_Warn_Text", selected.getEditingFILE().getName())); MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index b152e1fe8..2ebd5fe9c 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -13,7 +13,7 @@ import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.file.FILE; import com.fr.file.FileNodeFILE; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; import com.fr.stable.OperatingSystem; @@ -166,14 +166,14 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M this.addMouseMotionListener(this); this.setBorder(null); this.setForeground(new Color(58, 56, 58)); - this.setFont(new Font(Inter.getLocText("FR-Designer_Song_TypeFace"), 0, 12)); + this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Song_TypeFace"), 0, 12)); openedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); selectedIndex = openedTemplate.size() - 1; Toolkit.getDefaultToolkit().addAWTEventListener(awt, AWTEvent.MOUSE_EVENT_MASK); } private UIMenuItem initCloseOther() { - UIMenuItem closeOther = new UIMenuItem(Inter.getLocText("FR-Designer_FS_Close_Other_Templates")); + UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Close_Other_Templates")); setListDownItemPreferredSize(closeOther); closeOther.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -674,8 +674,8 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M //如果在权限编辑情况下，不允许切换到表单类型的工作簿 if (BaseUtils.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) { DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex)); - JOptionPane.showMessageDialog(this, Inter.getLocText("FR-Designer_Form-AuthorityEdited_Cannot_be_Supported") - + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-AuthorityEdited_Cannot_be_Supported") + + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); this.repaint(); return; } @@ -714,11 +714,11 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); - FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."})); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } } HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate); diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java index 522495e80..fae11eed7 100644 --- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java @@ -1 +1 @@ -package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(Inter.getLocText("Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(Inter.getLocText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."})); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."})); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return Inter.getLocText("Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file +package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 1f4630cc2..8743c7eda 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -15,7 +15,7 @@ import com.fr.file.filetree.FileNode; import com.fr.file.filetree.IOFileNodeFilter; import com.fr.general.ComparatorUtils; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.ProductConstants; @@ -156,7 +156,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { @Override public void refresh() { reportletsTree.refresh(); - FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"File-tree", "Refresh_Successfully"}) + "!"); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Tree_Refresh_Successfully") + "!"); } /** @@ -168,15 +168,15 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (reportPaths.length == 0) { return; } - if (JOptionPane.showConfirmDialog(null, Inter.getLocText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) { + if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) { return; } for (String reportPath : reportPaths) { FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false)); if (nodeFile.isLocked()) { - if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("fileLocked_undeleted"), - Inter.getLocText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { + if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"), + com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { refreshDockingView(); } break; @@ -186,7 +186,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { FileAssistUtils.moveToTrash(nodeFile.getPath()); deleteHistory(path.replaceAll("/", "\\\\")); } else { - JOptionPane.showMessageDialog(this, Inter.getLocText("Warning-Template_Do_Not_Exsit"), ProductConstants.PRODUCT_NAME, + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Warning-Template_Do_Not_Exsit"), ProductConstants.PRODUCT_NAME, JOptionPane.INFORMATION_MESSAGE); } } diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java index 478446294..0d5622d6e 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java @@ -19,7 +19,7 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.parser.FRLexer; import com.fr.parser.FRParser; import com.fr.stable.EncodeConstants; @@ -88,7 +88,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { String text = formulaTextArea.getText(); // 判断在中文输入状态是否还包含提示符 要删掉 //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column - String tip = "\n\n\n" + Inter.getLocText("FR-Designer_FormulaPane_Tips"); + String tip = "\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips"); if (text.contains(tip)) { text = text.substring(0, text.indexOf(tip)); insertPosition = 0; @@ -160,7 +160,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { JPanel searchPane = new JPanel(new BorderLayout(4, 4)); searchPane.add(keyWordTextField, BorderLayout.CENTER); - UIButton searchButton = new UIButton(Inter.getLocText("FR-Designer_FormulaPane_Search")); + UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Search")); searchPane.add(searchButton, BorderLayout.EAST); tipsPane.add(searchPane, BorderLayout.NORTH); initKeyWordTextFieldKeyListener(); @@ -187,7 +187,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(textPane, BorderLayout.CENTER); JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UILabel formulaLabel = new UILabel(Inter.getLocText("FormulaD-Input_formula_in_the_text_area_below") + ":" + UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Input_formula_in_the_text_area_below") + ":" + " "); formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); initFormulaTextArea(); @@ -200,7 +200,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { initTipsPane(); - UIButton checkValidButton = new UIButton(Inter.getLocText("FormulaD-Check_Valid")); + UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Check_Valid")); checkValidButton.addActionListener(checkValidActionListener); JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); @@ -476,7 +476,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { @Override protected String title4PopupWindow() { - return Inter.getLocText("FormulaD-Formula_Definition"); + return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Formula_Definition"); } /** @@ -495,7 +495,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { if (content.trim().equals("=")) { this.formulaTextArea.setForeground(Color.gray); //Tips:You_Can_Input_B1_To_Input_The_Data_Of_The_First_Row_Second_Column - this.formulaTextArea.setText("\n\n\n" + Inter.getLocText("FR-Designer_FormulaPane_Tips")); + this.formulaTextArea.setText("\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips")); this.formulaTextArea.setCaretPosition(0); ifHasBeenWriten = 0; this.listModel.removeAllElements(); @@ -567,7 +567,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { * 不需要eval * TODO 但有个问题,有些函数的参数个数是有规定的,何以判别之 */ - (expression != null ? Inter.getLocText("FormulaD-Valid_Formula") : Inter.getLocText("FormulaD-Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME, + (expression != null ? com.fr.design.i18n.Toolkit.i18nText("FormulaD-Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("FormulaD-Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME, JOptionPane.INFORMATION_MESSAGE); } } @@ -587,7 +587,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList); functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); functionTypeScrollPane.setPreferredSize(new Dimension(140, 200)); - functionPane.add(this.createNamePane(Inter.getLocText("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST); + functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST); initTypeListCellRenderer(); initGroupTypeModel(); initTypeListSelectionListener(); @@ -701,7 +701,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList); functionNameScrollPane.setPreferredSize(new Dimension(140, 200)); functionPane.add( - this.createNamePane(Inter.getLocText("FormulaD-Function_name") + ":", functionNameScrollPane), + this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_name") + ":", functionNameScrollPane), BorderLayout.CENTER); functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); initFunctionNameListCellRenderer(); @@ -715,7 +715,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea); desScrollPane.setBorder(null); - this.add(this.createNamePane(Inter.getLocText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); + this.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); descriptionTextArea.setBackground(Color.white); descriptionTextArea.setLineWrap(true); descriptionTextArea.setWrapStyleWord(true); @@ -788,7 +788,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane variablesTreePane = new UIScrollPane(variablesTree); variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); this.add(this.createNamePane( - Inter.getLocText("FR-Designer_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); variablesTree.setRootVisible(false); variablesTree.setShowsRootHandles(true); variablesTree.addMouseListener(applyTextMouseListener); @@ -817,7 +817,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { private class LookDetailAction extends UpdateAction { public LookDetailAction() { - this.setName(Inter.getLocText("FR-Designer_FormulaPane_Function_Detail")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail")); this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); } @@ -832,7 +832,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { BasicPane basicPane = new BasicPane() { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_FormulaPane_Function_Detail"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail"); } }; basicPane.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -923,24 +923,24 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { rootNode.add(bindCellNode); } - rootNode.add(new TextFolderUserObject(Inter.getLocText("FormulaD-Data_Fields"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Data_Fields"), BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"), variableResolver.resolveColumnNames()).createMutableTreeNode()); // Set cutReport Variable - rootNode.add(new TextFolderUserObject(Inter.getLocText("FR-Designer_FormulaPane_Variables"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables"), BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText(new String[]{"Datasource-Datasource", "Parameter"}), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText("ParameterD-Report_Parameter"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("ParameterD-Report_Parameter"), BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"), variableResolver.resolveReportParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(Inter.getLocText("M_Server-Global_Parameters"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveGlobalParameterVariables()).createMutableTreeNode()); diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java index 40ace6a48..752f005a2 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java @@ -2,7 +2,7 @@ package com.fr.design.formula; import com.fr.base.BaseFormula; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -25,7 +25,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { @Override protected void extendCheckBoxPane(JPanel checkBoxPane) { // peter:添加公式是否兼容Excel的属性 - reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FR-Designer_Export-Save-Formula")); + reserveCheckBox4Result = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export-Save-Formula")); reserveCheckBox4Result.setSelected(false); reserveCheckBox4Result.addChangeListener(new ChangeListener() { @@ -38,7 +38,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { } } }); - reserveCheckBox4Write = new UICheckBox(Inter.getLocText("FR-Designer_Write-Save-Formula")); + reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write-Save-Formula")); reserveCheckBox4Write.setSelected(false); checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java index 0384debe4..4d0da51eb 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java @@ -12,7 +12,7 @@ import com.fr.function.RANGE; import com.fr.function.SUM; import com.fr.function.TIME; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.ExtraClassManager; import com.fr.stable.EncodeConstants; import com.fr.stable.OperatingSystem; @@ -78,7 +78,7 @@ public abstract class FunctionConstants { public static FunctionGroup PLUGIN = new FunctionGroup() { @Override public String getGroupName() { - return Inter.getLocText("FR-Base_Formula_Plugin"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Formula_Plugin"); } @Override @@ -96,7 +96,7 @@ public abstract class FunctionConstants { public static FunctionGroup CUSTOM = new FunctionGroup() { @Override public String getGroupName() { - return Inter.getLocText("FormulaD-Custom_Function"); + return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function"); } @Override @@ -117,25 +117,25 @@ public abstract class FunctionConstants { } }; - public static NameAndFunctionList COMMON = new NameAndFunctionList(Inter.getLocText("FormulaD-Most_Recently_Used"), new Function[] { + public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Most_Recently_Used"), new Function[] { new SUM(), new COUNT(), new AVERAGE(), new CHAR(), new DATE(), new MAX(), new MIN(), new TIME(), new RANGE() }); public static NameAndTypeAndFunctionList[] EMBFUNCTIONS = new NameAndTypeAndFunctionList[] { - new NameAndTypeAndFunctionList(Inter.getLocText("FormulaD-Math_&_Trig"), Function.MATH), - new NameAndTypeAndFunctionList(Inter.getLocText("FR-Designer_FormulaD-Text"), Function.TEXT), - new NameAndTypeAndFunctionList(Inter.getLocText("FormulaD-Date_&_Time"), Function.DATETIME), - new NameAndTypeAndFunctionList(Inter.getLocText("FR-Designer_FormulaD-Logical"), Function.LOGIC), - new NameAndTypeAndFunctionList(Inter.getLocText("FR-Designer_FormulaD-Array"), Function.ARRAY), - new NameAndTypeAndFunctionList(Inter.getLocText("FR-Designer_FormulaD-Report"), Function.REPORT), - new NameAndTypeAndFunctionList(Inter.getLocText("FR-Designer_FormulaD-Other"), Function.OTHER), - new NameAndTypeAndFunctionList(Inter.getLocText(new String[]{"Level_coordinates", "FormulaD-Functions"}), Function.HA) + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Math_&_Trig"), Function.MATH), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Text"), Function.TEXT), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Date_&_Time"), Function.DATETIME), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Logical"), Function.LOGIC), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA) }; public static FunctionGroup ALL = new FunctionGroup() { @Override public String getGroupName() { - return Inter.getLocText("FR-Designer_FormulaD-All"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-All"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java index 595704e16..a18c13cd7 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java @@ -16,7 +16,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.FunctionConfig; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.stable.project.ProjectConstants; @@ -44,7 +44,7 @@ public class FunctionManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Function-Function_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Function-Function_Manager"); } /** @@ -94,7 +94,7 @@ public class FunctionManagerPane extends BasicPane { @Override public NameableCreator[] createNameableCreators() { - NameableCreator funcDef = new NameObjectCreator(Inter.getLocText("FR-Designer_Function"), FunctionDef.class, + NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function"), FunctionDef.class, FunctionContentPane.class); return new NameableCreator[]{funcDef}; } @@ -123,7 +123,7 @@ public class FunctionManagerPane extends BasicPane { JPanel reportletNamePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); classNameTextField = new UITextField(25); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); reportletNamePane.add(browserButton); browserButton.addActionListener(new ActionListener() { @@ -138,11 +138,11 @@ public class FunctionManagerPane extends BasicPane { }).setVisible(true); } }); - UIButton editorButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); + UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); reportletNamePane.add(editorButton); editorButton.addActionListener(createEditorButtonActionListener()); - northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(Inter.getLocText("DS-Class_Name") + ":"), + northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane}, FlowLayout.LEFT)); DescriptionTextArea descriptionArea = new DescriptionTextArea(); descriptionArea.setWrapStyleWord(true); @@ -151,12 +151,12 @@ public class FunctionManagerPane extends BasicPane { String path1 = getEscapePath(File.separator + ProjectConstants.WEBINF_NAME + File.separator + ProjectConstants.CLASSES_NAME); String path2 = getEscapePath(WorkContext.getCurrent().getPath() + File.separator + ProjectConstants.CLASSES_NAME); - descriptionArea.setText(Inter.getLocText("FR-Designer_Function_Description_Area_Text", path1, path2)); + descriptionArea.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function_Description_Area_Text", path1, path2)); JPanel descriptionPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); //Description Pane this.add(descriptionPane, BorderLayout.SOUTH); descriptionPane.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); - descriptionPane.add(new UILabel(Inter.getLocText("FR-Designer_Description") + ":"), BorderLayout.NORTH); + descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Description") + ":"), BorderLayout.NORTH); this.descriptionTextArea = new UITextArea(6, 24); descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java index 9c8fab0f0..cf8071cba 100644 --- a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.EncodeConstants; import com.fr.stable.JavaCompileInfo; @@ -79,9 +79,9 @@ public class JavaEditorPane extends BasicPane { UIScrollPane jt = new UIScrollPane(javaText); JPanel toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - UIButton saveButton = new UIButton(Inter.getLocText("Save")); + UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Save")); saveButton.setAction(new SaveAction()); - UIButton compileButton = new UIButton(Inter.getLocText("Compile")); + UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Compile")); compileButton.setAction(new CompilerAction()); toolbarPane.add(saveButton); toolbarPane.add(compileButton); @@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane { this.add(jt, BorderLayout.CENTER); UILabel label = new UILabel(); label.setText("" + - Inter.getLocText(new String[]{"Attention", "Compile_Success_And_Then_Save"}, new String[]{":", "!"}) + + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") + ""); label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20)); this.add(label, BorderLayout.SOUTH); @@ -141,7 +141,7 @@ public class JavaEditorPane extends BasicPane { private class SaveAction extends AbstractAction { //新建文件命令 public SaveAction() { - super(Inter.getLocText("Save")); + super(com.fr.design.i18n.Toolkit.i18nText("Save")); } public void actionPerformed(ActionEvent e) { saveTextToFile(javaText.getText()); @@ -157,18 +157,18 @@ public class JavaEditorPane extends BasicPane { } try { WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8)); - JOptionPane.showMessageDialog(null, Inter.getLocText(new String[]{"Save", "Successfully"}) + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "！"); fireSaveActionListener(); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - JOptionPane.showMessageDialog(null, Inter.getLocText(new String[]{"Save", "Failed"}) + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "！"); } } private class CompilerAction extends AbstractAction { public CompilerAction() { - super(Inter.getLocText("Compile")); + super(com.fr.design.i18n.Toolkit.i18nText("Compile")); } public void actionPerformed(ActionEvent e) { new SwingWorker() { @@ -185,7 +185,7 @@ public class JavaEditorPane extends BasicPane { className = info.getIntactClassName(); String message = info.getCompileMessage(); if (StringUtils.isEmpty(message)) { - message = Inter.getLocText("Compile_Success") + "!"; + message = com.fr.design.i18n.Toolkit.i18nText("Compile_Success") + "!"; } JOptionPane.showMessageDialog(null, message); } catch (InterruptedException e1) { @@ -199,7 +199,7 @@ public class JavaEditorPane extends BasicPane { } protected String title4PopupWindow() { - return Inter.getLocText("FormulaD-Custom_Function"); + return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function"); } public static final String DEFAULT_TABLEDATA_STRING = "package com.fr.data;\n" + diff --git a/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java index 094723687..5348c12b4 100644 --- a/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.icombobox.SortOrderComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -38,7 +38,7 @@ public abstract class SortFormulaPane extends JPanel { sortFormulaTextField = new UITextField(16); //Lance:添加一公式编辑器按钮 sortFormulaTextFieldButton = new UIButton("..."); - sortFormulaTextFieldButton.setToolTipText(Inter.getLocText("Formula") + "..."); + sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "..."); sortFormulaTextFieldButton.setPreferredSize(new Dimension(25, sortFormulaTextFieldButton.getPreferredSize().height)); sortFormulaTextFieldButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -46,9 +46,9 @@ public abstract class SortFormulaPane extends JPanel { } }); - this.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsetText), //new UILabel(Inter.getLocText("Select_sort_order") + ":"), + this.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsetText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_sort_order") + ":"), sortOrderComboBox, new UILabel(InsetText), - new UILabel(Inter.getLocText("Formula") + ":="), sortFormulaTextField, //selectButton, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Formula") + ":="), sortFormulaTextField, //selectButton, sortFormulaTextFieldButton}, FlowLayout.LEFT)); } diff --git a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index 0f19e219d..2a2b6db5c 100644 --- a/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -35,11 +35,11 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver protected void initComponents() { formulaTextField = new UITextField(); - formulaTextField.setGlobalName(Inter.getLocText("ExpandD-Sort_After_Expand")); + formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand")); // 添加一公式编辑器按钮 formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); - formulaTextFieldButton.setToolTipText(Inter.getLocText("FR-Designer_Formula") + "..."); + formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula") + "..."); formulaTextFieldButton.setPreferredSize(new Dimension(24, 20)); formulaTextFieldButton.setOpaque(false); formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); @@ -107,7 +107,7 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver @Override protected String title4PopupWindow() { - return Inter.getLocText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java b/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java index b0a1f27bc..47d1532fa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java +++ b/designer-base/src/main/java/com/fr/design/gui/HyperlinkFilterHelper.java @@ -4,7 +4,7 @@ import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + /** * Created by mengao on 2017/9/22. @@ -18,7 +18,7 @@ public class HyperlinkFilterHelper { return false; } //先屏蔽掉这个，之后还有别的 - String[] names = {Inter.getLocText("FR-Hyperlink_Chart_Float")}; + String[] names = {com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Float")}; for (String name : names) { if (!jTemplate.isJWorkBook() && ComparatorUtils.equals(itemName, name)) { return false; @@ -33,7 +33,7 @@ public class HyperlinkFilterHelper { return false; } //先屏蔽掉这个，之后还有别的 - String[] names = {Inter.getLocText("FR-Hyperlink_Chart_Float"), Inter.getLocText("FR-Hyperlink_Chart_Cell")}; + String[] names = {com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Float"), com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Cell")}; for (String name : names) { if (!jTemplate.isJWorkBook() && ComparatorUtils.equals(itemName, name)) { if (jTemplate.getEditingReportIndex() == BaseJForm.ELEMENTCASE_TAB && ComparatorUtils.equals(itemName, names[0])) { @@ -53,7 +53,7 @@ public class HyperlinkFilterHelper { } private static boolean whetherAddFormLink(JTemplate jTemplate, String itemName) { - String formName = Inter.getLocText("Hyperlink-Form_link"); + String formName = com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); return !(jTemplate.isJWorkBook() && ComparatorUtils.equals(itemName, formName)); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java index 68f94321b..8c2c28853 100644 --- a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + /** @@ -25,7 +25,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane { this.add(pane, BorderLayout.NORTH); JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - colPane.add(new UILabel(Inter.getLocText("Column") + ":")); + colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column") + ":")); pane.add(colPane); initColSpinner(); @@ -34,7 +34,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane { JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pane.add(rowPane); - rowPane.add(new UILabel(Inter.getLocText("Row") + ":")); + rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row") + ":")); initRowSpinner(); rowPane.add(rowSpinner); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index 02bf0301d..3bd04b057 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -20,7 +20,7 @@ import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.core.PropertyChangeAdapter; @@ -297,7 +297,7 @@ public abstract class JListControlPane extends JControlPane { * @return 是则true */ public boolean isContainsRename() { - String rename = Inter.getLocText("FR-Please_Rename") + "!"; + String rename = com.fr.design.i18n.Toolkit.i18nText("FR-Please_Rename") + "!"; String[] names = this.nameableList.getAllNames(); for (int i = names.length - 1; i >= 0; i--) { if (ComparatorUtils.equals(names[i], rename)) { @@ -367,7 +367,7 @@ public abstract class JListControlPane extends JControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(Inter.getLocText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -385,7 +385,7 @@ public abstract class JListControlPane extends JControlPane { */ protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { - this.setName(Inter.getLocText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -396,8 +396,8 @@ public abstract class JListControlPane extends JControlPane { if (filterNameableCreator(creator)) { continue; } - boolean isTrue = ComparatorUtils.equals(creator.menuName(), Inter.getLocText("Datasource-Stored_Procedure")) || - ComparatorUtils.equals(creator.menuName(), Inter.getLocText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), Inter.getLocText("DS-Multi_Dimensional_Database")); + boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || + ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); } @@ -430,7 +430,7 @@ public abstract class JListControlPane extends JControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(Inter.getLocText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -458,7 +458,7 @@ public abstract class JListControlPane extends JControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(Inter.getLocText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -493,7 +493,7 @@ public abstract class JListControlPane extends JControlPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(Inter.getLocText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -526,7 +526,7 @@ public abstract class JListControlPane extends JControlPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(Inter.getLocText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); @@ -557,7 +557,7 @@ public abstract class JListControlPane extends JControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(Inter.getLocText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index bb6d7dbab..77c79a04f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -25,7 +25,7 @@ import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; @@ -337,7 +337,7 @@ public abstract class UIListControlPane extends UIControlPane { * @return 是则true */ public boolean isContainsRename() { - String rename = Inter.getLocText("FR-Please_Rename") + "!"; + String rename = com.fr.design.i18n.Toolkit.i18nText("FR-Please_Rename") + "!"; String[] names = this.nameableList.getAllNames(); for (int i = names.length - 1; i >= 0; i--) { if (ComparatorUtils.equals(names[i], rename)) { @@ -457,7 +457,7 @@ public abstract class UIListControlPane extends UIControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(Inter.getLocText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -513,7 +513,7 @@ public abstract class UIListControlPane extends UIControlPane { protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { super(true); - this.setName(Inter.getLocText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -539,8 +539,8 @@ public abstract class UIListControlPane extends UIControlPane { if (!whetherAdd(creator.menuName())) { continue; } - boolean isTrue = ComparatorUtils.equals(creator.menuName(), Inter.getLocText("Datasource-Stored_Procedure")) || - ComparatorUtils.equals(creator.menuName(), Inter.getLocText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), Inter.getLocText("DS-Multi_Dimensional_Database")); + boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || + ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); } @@ -577,7 +577,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(Inter.getLocText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -606,7 +606,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(Inter.getLocText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -641,7 +641,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(Inter.getLocText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -674,7 +674,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(Inter.getLocText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); @@ -705,7 +705,7 @@ public abstract class UIListControlPane extends UIControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(Inter.getLocText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java index a07e4c2ce..9c1b65b5d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; @@ -228,7 +228,7 @@ public class UISimpleListControlPane extends BasicPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(Inter.getLocText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); this.setMnemonic('U'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/up.png")); @@ -261,7 +261,7 @@ public class UISimpleListControlPane extends BasicPane { */ private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(Inter.getLocText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); @@ -292,7 +292,7 @@ public class UISimpleListControlPane extends BasicPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(Inter.getLocText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java index bf0028e3d..409a59886 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetConstants.java @@ -1,6 +1,6 @@ package com.fr.design.gui.core; -import com.fr.general.Inter; + public class WidgetConstants { @@ -39,7 +39,7 @@ public class WidgetConstants { // FileEditor // public static final int FILE = 13; -// public static final String NAME_FILE = Inter.getLocText("File"); +// public static final String NAME_FILE = com.fr.design.i18n.Toolkit.i18nText("File"); public static final int BUTTON = 14; @@ -55,24 +55,24 @@ public class WidgetConstants { public static final int MULTI_FILE = 19; // 默认控件 - public static final String DEFAULT_WIDGETCONFIG = Inter.getLocText("Widget-Form_Widget_Config"); + public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config"); // 报表控件，与默认控件不同，比如label，table,SEARCH等，这里是不需要的 - public static final String REPORT_WIDGETCONFIG = Inter.getLocText("Widget-Default_Widget_Config"); + public static final String REPORT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Default_Widget_Config"); - public static final String FORM_CHARTWIDGET = Inter.getLocText("Widget-Chart_Widget_Config"); + public static final String FORM_CHARTWIDGET = com.fr.design.i18n.Toolkit.i18nText("Widget-Chart_Widget_Config"); // 表单容器控件 - public static final String FORM_WIDGETCONTAINER = Inter.getLocText("Widget-Form_Widget_Container"); + public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); - public static final String POLY_REPORT_WIDGET = Inter.getLocText("Poly-Report_Component"); + public static final String POLY_REPORT_WIDGET = com.fr.design.i18n.Toolkit.i18nText("Poly-Report_Component"); // 服务器预定义控件 - public static final String USER_DEFINED_WIDGETCONFIG = Inter.getLocText("Widget-User_Defined_Widget_Config"); + public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config"); // 服务器组合控件 - public static final String COMB_WIDGETCONFIG = Inter.getLocText("Widget-Comb_Widget_Config"); + public static final String COMB_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Comb_Widget_Config"); // 服务器自定义控件 - public static final String CUSTOM_WIDGETCONFIG = Inter.getLocText("Widget-Custom_Widget_Config"); + public static final String CUSTOM_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Custom_Widget_Config"); } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index 1ceb1f25f..be7045817 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -3,7 +3,7 @@ package com.fr.design.gui.core; import com.fr.base.BaseUtils; import com.fr.form.ui.*; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.io.Serializable; @@ -126,103 +126,73 @@ public abstract class WidgetOption implements Serializable { NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR}; } - public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Date", "Widget"}), + public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Date"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"), DateEditor.class); - public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("Form-View_Tree"), + public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class); - public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"), + public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"), TreeComboBoxEditor.class); public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-CheckBoxGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class); public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-RadioGroup", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"), RadioGroup.class); public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Number", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class); public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Label", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"), Label.class); public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"), Button.class); public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-Button", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Free_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), FreeButton.class); public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"File", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"), MultiFileEditor.class); public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-ComboBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"), ComboBox.class); public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-ComboCheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"), ComboCheckBox.class); public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-CheckBox", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"), CheckBox.class); public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-List", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), ListEditor.class); - public static final WidgetOption TABLETREE = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-TableTree", "Widget"}), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), - TableTree.class); - public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Text", "Widget"}) + public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Text") , BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"), TextEditor.class); public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-TextArea", "Widget"}), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"), TextArea.class); public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass( - Inter.getLocText(new String[]{"Form-Password", "Widget"}), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Password"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class); - public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), + public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), IframeEditor.class); -// public static final WidgetOption DATATABLE = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("Form-DataTable"), BaseUtils.readIcon("/com/fr/web/images/form/resources/table_16.png"), -// DataTable.class); - -// public static final WidgetOption CHARTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("Chart") -// + Inter.getLocText("Widget"), ChartEditor.class); - - -// public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("AbsoluteLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_absolute.png"), -// WAbsoluteLayout.class); -// -// public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), -// WBorderLayout.class); -// -// public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("CardLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/card_layout_16.png"), -// WCardLayout.class); -// -// public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), -// WHorizontalBoxLayout.class); -// -// public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter -// .getLocText("VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), -// WVerticalBoxLayout.class); - } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java index 65a63aeed..b7e989ad3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java @@ -1,7 +1,7 @@ package com.fr.design.gui.date; import com.fr.design.gui.itextfield.UINumberField; -import com.fr.general.Inter; + import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; @@ -30,7 +30,7 @@ public class CalendarNumberField extends UINumberField { setValue(getIntValue()); } }); - this.setFont(new Font(Inter.getLocText("Song_TypeFace"),0,12)); + this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12)); } public void setValue(int value) { diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 36172b9dc..00d31d3dd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUIPaintUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -45,8 +45,8 @@ import java.util.Calendar; import java.util.Date; public class UICalendarPanel extends JPanel { - private static final Font FONT_SONG = new Font(Inter.getLocText("Song_TypeFace"),0,12); - private static final Font FONT_BLACK = new Font(Inter.getLocText("Black_Font"),0,12); + private static final Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12); + private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Black_Font"),0,12); private static final int WEEKDAY_COUNT = 7; private static final int TOTAL_DAYS_COUNT = 42; @@ -161,9 +161,9 @@ public class UICalendarPanel extends JPanel { pWeeks.setPreferredSize(new Dimension(216, 22)); pWeeks.setBackground(new Color(0xFFFFFF)); pWeeks.setOpaque(true); - String[] strWeeks = new String[] {StringUtils.EMPTY, Inter.getLocText("Sun"), Inter.getLocText("Mon"), - Inter.getLocText("Tue"),Inter.getLocText("Wed"),Inter.getLocText("Thu"), - Inter.getLocText("Fri"),Inter.getLocText("Sat") + String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"), + com.fr.design.i18n.Toolkit.i18nText("Tue"),com.fr.design.i18n.Toolkit.i18nText("Wed"),com.fr.design.i18n.Toolkit.i18nText("Thu"), + com.fr.design.i18n.Toolkit.i18nText("Fri"),com.fr.design.i18n.Toolkit.i18nText("Sat") }; for (int i = 1; i <= WEEKDAY_COUNT; i++) { UILabel label = new UILabel(); @@ -202,7 +202,7 @@ public class UICalendarPanel extends JPanel { sPane.setPreferredSize(new Dimension(216, 30)); sPane.setBackground(Color.WHITE); sPane.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 6)); - UILabel timeLabel = new UILabel(Inter.getLocText("Time") + ":"); + UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Time") + ":"); timeLabel.setBorder(BorderFactory.createEmptyBorder(0,9,0,5)); timeLabel.setFont(FONT_SONG); sPane.add(timeLabel); @@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel { gap.setPreferredSize(new Dimension(26,1)); sPane.add(gap); - UIButton okButton = new UIButton(Inter.getLocText("OK")) { + UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) { public Dimension getPreferredSize() { return new Dimension(32,18); } diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java b/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java index d7dffd436..8d38c9e4e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java @@ -6,7 +6,7 @@ import java.util.Date; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + public class UIDayLabel extends UILabel { @@ -27,13 +27,13 @@ public class UIDayLabel extends UILabel { public UIDayLabel(Date date, boolean isSmallLabel) { setHorizontalAlignment(UILabel.CENTER); - setFont(new Font(Inter.getLocText("Song_TypeFace"), 0, 12)); + setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"), 0, 12)); this.date = date; setPreferredSize(new Dimension(30, 18)); if (isSmallLabel) { setText(dayFormat.format(date)); } else { - setText(Inter.getLocText("Today")+":" + dateFormat.format(new Date())); + setText(com.fr.design.i18n.Toolkit.i18nText("Today")+":" + dateFormat.format(new Date())); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/demo/ComboBoxDemo.java b/designer-base/src/main/java/com/fr/design/gui/demo/ComboBoxDemo.java deleted file mode 100644 index a29d78dd0..000000000 --- a/designer-base/src/main/java/com/fr/design/gui/demo/ComboBoxDemo.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.fr.design.gui.demo; - -import com.fr.base.FRContext; -import com.fr.design.dialog.DialogActionAdapter; -import com.fr.design.gui.icombobox.ComboCheckBox; -import com.fr.design.gui.icombobox.DictionaryComboBox; -import com.fr.design.gui.icombobox.ExtendedComboBox; -import com.fr.design.gui.icombobox.FRTreeComboBox; -import com.fr.design.gui.icombobox.FilterComboBox; -import com.fr.design.gui.icombobox.LazyComboBox; -import com.fr.design.gui.icombobox.filter.Filter; -import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.mainframe.DesignerContext; -import com.fr.design.parameter.ParameterInputPane; -import com.fr.general.Inter; -import com.fr.stable.ParameterProvider; -import com.fr.stable.StringUtils; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JTree; -import javax.swing.ListCellRenderer; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeCellRenderer; -import javax.swing.tree.TreePath; -import java.awt.BorderLayout; -import java.awt.Component; -import java.util.ArrayList; - -/** - * Created by IntelliJ IDEA. - * User: Richer - * Date: 11-6-30 - * Time: 下午8:21 - */ -public class ComboBoxDemo extends JPanel { - public ComboBoxDemo() { - setLayout(FRGUIPaneFactory.createBorderLayout()); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - - Component[][] coms = new Component[][]{ - {new UILabel(Inter.getLocText("Form-ComboCheckBox") + ":"), createComboCheckBox()}, - {new UILabel(Inter.getLocText(new String[]{"DS-Dictionary", "Form-ComboBox"}) + ":"), createDictComboBox()}, - {new UILabel(Inter.getLocText("long_data_can_not_show_fully") + ":"), createExtendedComboBox()}, - {new UILabel(Inter.getLocText(new String[]{"Filter", "Form-ComboBox"}) + ":"), createFilterComboBox()}, - {new UILabel(Inter.getLocText("Form-ComboBox") + ":"), createTreeComboBox()}, - {new UILabel(Inter.getLocText(new String[]{"Delay", "Load", "Form-ComboBox"}) + ":"), createLazyComboBox()} - }; - double[] rowSize = new double[coms.length]; - double[] columnSize = {p, f}; - for (int i = 0; i < rowSize.length; i++) { - rowSize[i] = p; - } - JPanel centerPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); - add(centerPane, BorderLayout.CENTER); - } - - private ComboCheckBox createComboCheckBox() { - ComboCheckBox ccb = new ComboCheckBox(new Object[]{"张三", "李四", "王五", "赵六"}); - ccb.setRenderer(new DefaultListCellRenderer() { - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value != null) { - if (value instanceof Object[]) { - Object[] objs = (Object[]) value; - String[] res = new String[objs.length]; - for (int i = 0, len = objs.length; i < len; i++) { - res[i] = objs[i].toString(); - } - setText(StringUtils.join(",", res)); - } - } - return this; - } - }); - return ccb; - } - - private DictionaryComboBox createDictComboBox() { - DictionaryComboBox dcb = new DictionaryComboBox( - new Integer[]{1, 2, 3, 4}, - new String[]{"一", "二", "三", "四"} - ); - return dcb; - } - - private ExtendedComboBox createExtendedComboBox() { - ExtendedComboBox ecb = new ExtendedComboBox(new String[]{ - "Hello world, alksdfjlaskdjflaskjdflaksdf", - "Hello world, alksdfjlaskdjflaskjdflaksdfasdfklajsdflkasjdflkasdf", - "Hello world, alksdfjlaskdjflaskjdflaksdfasdfklajsdflkasjdflkasdfaaaaaaaaaaaaaaaaaadfsdf", - "Hello world, 太长了，都看不全了jlaskdjflaskjdflaksdfasdfklajsdflkasjdflkasdfsdfgklsdjfgklsdfjgklsjdfgkljsdflkgjsdlfk"}); - return ecb; - } - - private FilterComboBox createFilterComboBox() { - ArrayList items = new ArrayList(); - items.add("abc"); - items.add("abcd"); - items.add("dfee"); - items.add("asdfg"); - items.add("cdefg"); - Filter filter = new Filter() { - @Override - public boolean accept(String prefix, Object object) { - return prefix == null || object != null && - object.toString().toLowerCase().startsWith(prefix.toLowerCase()); - } - }; - - FilterComboBox fcb = new FilterComboBox(filter, items); - return fcb; - } - - private FRTreeComboBox createTreeComboBox() { - - DefaultMutableTreeNode root = new DefaultMutableTreeNode("根节点"); - DefaultMutableTreeNode child1 = new DefaultMutableTreeNode("子节点1"); - root.add(child1); - DefaultMutableTreeNode child11 = new DefaultMutableTreeNode("子节点1-1"); - child1.add(child11); - DefaultMutableTreeNode child12 = new DefaultMutableTreeNode("子节点1-2"); - child1.add(child12); - DefaultMutableTreeNode child2 = new DefaultMutableTreeNode("子节点2"); - root.add(child2); - DefaultMutableTreeNode child21 = new DefaultMutableTreeNode("子节点2-1"); - child2.add(child21); - JTree tree = new JTree(root); - TreeCellRenderer treeCellRender = new DefaultTreeCellRenderer() { - public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { - super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); - if (value instanceof DefaultMutableTreeNode) { - DefaultMutableTreeNode node = (DefaultMutableTreeNode) value; - Object userObj = node.getUserObject(); - setText(userObj + "-我是渲染器额外加的"); - } - return this; - } - }; - FRTreeComboBox tcb = new FRTreeComboBox(tree, treeCellRender, true, false); - ListCellRenderer listCellRenderer = new DefaultListCellRenderer() { - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); - if (value instanceof TreePath) { - DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) ((TreePath) value).getLastPathComponent(); - setText(treeNode.getUserObject().toString()); - } - return this; - } - }; - tcb.setRenderer(listCellRenderer); - tcb.setOnlyLeafSelectable(false); - return tcb; - } - - private LazyComboBox createLazyComboBox() { - LazyComboBox lcb = new LazyComboBox() { - @Override - public Object[] load() { - // 睡5秒 - try { - Thread.sleep(5000); - - } catch (InterruptedException e) { - FRContext.getLogger().error(e.getMessage(), e); - } - return new Object[]{"11", "22", "33", "44", "55", "66"}; - } - }; - return lcb; - } -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/demo/LabelDemo.java b/designer-base/src/main/java/com/fr/design/gui/demo/LabelDemo.java deleted file mode 100644 index 4e9733214..000000000 --- a/designer-base/src/main/java/com/fr/design/gui/demo/LabelDemo.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.fr.design.gui.demo; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - -import com.fr.design.gui.ilable.ActionLabel; -import com.fr.design.gui.ilable.MultilineLabel; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; - -/** - * Created by IntelliJ IDEA. - * User: Richer - * Date: 11-7-1 - * Time: 上午8:54 - */ -public class LabelDemo extends JPanel { - public LabelDemo() { - setLayout(FRGUIPaneFactory.createBorderLayout()); - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - - Component[][] coms = new Component[][]{ - {new UILabel(Inter.getLocText(new String[]{"Hyperlink", "Label"})+":"), createActionLabel()}, - {new UILabel("多行字的标签:"), createMultilineLabel()} - }; - double[] rowSize = new double[coms.length]; - double[] columnSize = {p, f}; - for (int i = 0; i < rowSize.length; i++) { - rowSize[i] = p; - } - - - - JPanel centerPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); - add(centerPane, BorderLayout.CENTER); - } - - private ActionLabel createActionLabel() { - ActionLabel al = new ActionLabel("点我，我看的反应"); - al.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JOptionPane.showMessageDialog(LabelDemo.this, "我能对点击做出反应!"); - } - }); - return al; - } - - private MultilineLabel createMultilineLabel() { - MultilineLabel mll = new MultilineLabel("abc\n伊尔"); - return mll; - } -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/demo/SwingComponentsDemo.java b/designer-base/src/main/java/com/fr/design/gui/demo/SwingComponentsDemo.java deleted file mode 100644 index a3771ce23..000000000 --- a/designer-base/src/main/java/com/fr/design/gui/demo/SwingComponentsDemo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.fr.design.gui.demo; - -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.utils.DesignUtils; -import com.fr.design.utils.gui.GUICoreUtils; - -import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; -import javax.swing.WindowConstants; -import java.awt.BorderLayout; - -/** - * Created by IntelliJ IDEA. - * User: Richer - * Date: 11-6-27 - * Time: 下午4:54 - */ -public class SwingComponentsDemo extends JFrame { - private SwingComponentsDemo() { - this.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - init(); - JPanel contentPane = (JPanel) getContentPane(); - contentPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - JTabbedPane tab = new JTabbedPane(); - contentPane.add(tab, BorderLayout.CENTER); - tab.addTab("下拉框", new ComboBoxDemo()); - tab.addTab("多行提示", new MultiLineTooltipDemo()); - tab.addTab("列表", new ListDemo()); - tab.addTab("标签", new LabelDemo()); - tab.addTab("加载耗时较多的面板", new LoadingPaneDemo()); - } - - private void init() { - DesignUtils.initLookAndFeel(); - setTitle("设计器组件演示"); - } - - public static void main(String[] args) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - JFrame f = new SwingComponentsDemo(); - f.setSize(500, 500); - f.setVisible(true); - GUICoreUtils.centerWindow(f); - } - }); - } -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java index 5ca8ba6e8..6cdd9571d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java @@ -7,7 +7,7 @@ import com.fr.design.write.submit.DBManipulationPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.javascript.Commit2DBJavaScriptPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -211,7 +211,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous } private String createName(){ - String prefix = Inter.getLocText("FR-Designer-CommitTab_Submit"); + String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Submit"); int count = getTabCount(); while (true) { //从提交1开始 @@ -408,7 +408,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous selectedIndex = dbManipulationPaneList.size()-1; commit2DBJavaScriptPane.updateCardPane(); } else if (isOverCloseIcon(x)){ - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), Inter.getLocText("FR-Designer-CommitTab_SureToDelete")+ "?", Inter.getLocText("FR-Designer-CommitTab_Remove") + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_SureToDelete")+ "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Remove") , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (re == JOptionPane.OK_OPTION) { dbManipulationPaneList.remove(getTabIndex(x)); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index 7f98dc615..1acc86d2a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -24,7 +24,7 @@ import javax.swing.event.ListSelectionListener; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.JListUtils; @@ -57,11 +57,11 @@ public abstract class EditingStringListPane extends BasicBeanPane> }); - addButton = new UIButton(Inter.getLocText("Add")); - editButton = new UIButton(Inter.getLocText("Modify")); - removeButton = new UIButton(Inter.getLocText("Remove")); - moveUpButton = new UIButton(Inter.getLocText("Utils-Move_Up")); - moveDownButton = new UIButton(Inter.getLocText("Utils-Move_Down")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add")); + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); JPanel eastPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); eastPane.add(editButton); @@ -129,7 +129,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> setAddEnabled(false); } } else { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + Inter.getLocText("Already_exists_not_add_repeat")+"!"); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Already_exists_not_add_repeat")+"!"); } } }); @@ -151,7 +151,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> public void actionPerformed(ActionEvent e) { Object selected = jlist.getSelectedValue(); if (selected != null) { - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), Inter.getLocText("sure_to_delete") + selected.toString() + "?"); + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete") + selected.toString() + "?"); if (re == JOptionPane.OK_OPTION) { JListUtils.removeSelectedListItems(jlist); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java index 17a33419e..1fd5b8f4f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.UIListControlPane; import com.fr.design.module.DesignModuleFactory; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.js.JavaScript; import com.fr.js.NameJavaScript; @@ -82,12 +82,12 @@ public abstract class HyperlinkGroupPane extends UIListControlPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); } @Override protected String getAddItemText() { - return Inter.getLocText("FR-Designer_Add_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink"); } public void populate(NameJavaScriptGroup hyperlinkArray) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java index 957da465d..627d3ac24 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.image.ImageFileChooser; import com.fr.design.style.background.image.ImagePreviewPane; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -34,7 +34,7 @@ public class ImgChoosePane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel previewContainner = new JPanel(); - previewContainner.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Preview"))); + previewContainner.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"))); previewPane = new ImagePreviewPane(); previewContainner.add(previewPane); @@ -46,10 +46,8 @@ public class ImgChoosePane extends BasicPane { if (image == null) { imgSizeLabel.setText(""); } else { -// imgSizeLabel.setText(Inter.getLocText("Size") + ": " + image.getWidth(null) + "px" -// + image.getHeight(null) + Inter.getLocText("px")); - imgSizeLabel.setText(Inter.getLocText(new String[]{"Size", "px", "px"}, - new String[]{": " + image.getWidth(null), image.getHeight(null) + ""})); + imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", + image.getWidth(null) + "x" + image.getHeight(null))); } } }); @@ -75,7 +73,7 @@ public class ImgChoosePane extends BasicPane { } private void initButton() { - chooseButton = new UIButton(Inter.getLocText("Image-Select_Picture")); + chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); chooseButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -93,7 +91,7 @@ public class ImgChoosePane extends BasicPane { } }); - clearButton = new UIButton(Inter.getLocText("Clear")); + clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Clear")); clearButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { previewPane.setImage(null); @@ -117,6 +115,6 @@ public class ImgChoosePane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Image"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChooseWrapper.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChooseWrapper.java index 95073bf42..32a706fc5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChooseWrapper.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChooseWrapper.java @@ -7,7 +7,7 @@ import com.fr.design.style.background.image.ImageFileChooser; import com.fr.design.style.background.image.ImagePreviewer; import com.fr.design.utils.ImageUtils; import com.fr.general.ImageWithSuffix; -import com.fr.general.Inter; + import com.fr.stable.CoreGraphHelper; import com.fr.stable.StringUtils; @@ -148,7 +148,7 @@ public class ImgChooseWrapper { imageSizeLabel.setText(StringUtils.EMPTY); } else { imageSizeLabel.setText(selectImage.getWidth(null) + "x" - + selectImage.getHeight(null) + Inter.getLocText("px")); + + selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("px")); } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 9daad1bd8..6182e36ec 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -26,7 +26,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -51,7 +51,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe */ public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(Inter.getLocText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); treeTableDataComboBox.setPreferredSize(new Dimension(180, 20)); selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -74,13 +74,13 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { - {new UILabel(Inter.getLocText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), valuePane}, - {new UILabel(Inter.getLocText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), textPane}}; double p = TableLayout.PREFERRED; @@ -104,14 +104,14 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, Inter.getLocText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, Inter.getLocText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java index b83959d44..59bce3944 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java @@ -17,7 +17,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ToolBarDef; import com.fr.form.ui.TreeEditor; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; @@ -57,9 +57,9 @@ public class JTreeControlPane extends ControlPane { // LeftPane JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(Inter.getLocText("FR-Designer_Root")); + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root")); defaultTreeModel = new DefaultTreeModel(rootNode); - DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(Inter.getLocText("FR-Designer_Gradation") + 1, new TreeNodeAttr())); + DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new TreeNodeAttr())); tree = new JTree(defaultTreeModel); tree.setRootVisible(false); ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer); @@ -84,7 +84,7 @@ public class JTreeControlPane extends ControlPane { leftPane.add(toolBar, BorderLayout.NORTH); - isPerformanceFirst = new UICheckBox(Inter.getLocText("FR-Designer_Performance_First")); + isPerformanceFirst = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Performance_First")); northPane.add(new UILabel(" ")); northPane.add(isPerformanceFirst); this.add(northPane, BorderLayout.NORTH); @@ -134,7 +134,7 @@ public class JTreeControlPane extends ControlPane { for (int i = 0; i < count; i++) { DefaultMutableTreeNode node4add = new DefaultMutableTreeNode( - new NameObject(Inter.getLocText("FR-Designer_Gradation") + (i + 1), treeNodeAttr[i])); + new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), treeNodeAttr[i])); node4root.add(node4add); node4root = node4add; } @@ -193,7 +193,7 @@ public class JTreeControlPane extends ControlPane { public AddTreeNodeAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(Inter.getLocText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } @@ -224,15 +224,15 @@ public class JTreeControlPane extends ControlPane { private class RemoveTreeNodeAction extends UpdateAction { public RemoveTreeNodeAction() { - this.setName(Inter.getLocText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } public void actionPerformed(ActionEvent e) { // TODO remove tree node - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", - Inter.getLocText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ListenerUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ListenerUpdatePane.java index 3845799c1..28025844e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ListenerUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ListenerUpdatePane.java @@ -3,7 +3,7 @@ package com.fr.design.gui.frpane; import java.awt.BorderLayout; -import com.fr.general.Inter; + import com.fr.design.beans.BasicBeanPane; import com.fr.design.javascript.JavaScriptActionPane; import com.fr.design.layout.FRGUIPaneFactory; @@ -29,7 +29,7 @@ public abstract class ListenerUpdatePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Event"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java index db89371fd..015e1c85a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java @@ -7,7 +7,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.LayoutUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -46,9 +46,7 @@ public abstract class LoadingBasicPane extends BasicPane { card = new CardLayout(); setLayout(card); JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - String[] message = {"Loading","Please-Wait"}; - String[] operator = {",","..."}; - UILabel loadingPane = new UILabel(Inter.getLocText(message,operator) , SwingConstants.CENTER); + UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER); loadingDisPane.add(loadingPane, BorderLayout.CENTER); progressBar = new JProgressBar(); progressBar.setIndeterminate(true); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java index d92d60410..a37936053 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java @@ -8,7 +8,7 @@ import javax.swing.JPanel; import com.fr.base.FRContext; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.dialog.BasicDialog; -import com.fr.general.Inter; + /** * @author richer @@ -31,7 +31,7 @@ public class LoadingBasicPaneTest { @Override protected String title4PopupWindow() { - return Inter.getLocText("Test") ; + return com.fr.design.i18n.Toolkit.i18nText("Test") ; } }; BasicDialog dlg = lb.showWindow(null); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java index 3b3f8ccca..b57ed131e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.ListMap; @@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.addButton = new UIButton(Inter.getLocText("Add") + " " +Inter.getLocText("Property")); + this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property")); buttonPane.add(this.addButton, BorderLayout.WEST); this.add(buttonPane, BorderLayout.NORTH); @@ -124,16 +124,16 @@ public class ObjectProperiesPane extends BasicBeanPane { this.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); UIButton cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); - cancel.setToolTipText(Inter.getLocText("Remove")); + cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); this.add(cancel); - this.add(new UILabel(Inter.getLocText("Name")+":")); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name")+":")); this.nameField = new UITextField(6); this.add(this.nameField); - this.add(new UILabel(Inter.getLocText("Value")+ ":")); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")+ ":")); this.valueEditorPane = ValueEditorPaneFactory.createExtendedValueEditorPane(); this.add(this.valueEditorPane); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java index 25bef67e9..20f28fb08 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.TextEditor; import com.fr.form.ui.reg.NoneReg; import com.fr.form.ui.reg.RegExp; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -73,7 +73,7 @@ public class RegFieldPane extends RegPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); initRegErrorMsgField(); - UILabel tipLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")); + UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")); tipLabel.setPreferredSize(new Dimension(60, 20)); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); this.add(panel); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java index 7da0e683a..34f188311 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.reg.*; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -76,7 +76,7 @@ public class RegPane extends BasicPane { regComboBox.setRenderer(listCellRender); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); jPanel.add(contentPane, BorderLayout.NORTH); @@ -119,7 +119,7 @@ public class RegPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Input_Rule"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule"); } private int getRegTypeIndex(RegExp regex) { @@ -330,14 +330,14 @@ public class RegPane extends BasicPane { private static final String REG_PATTERN = "0123456789-*# "; private UIComboBox dataTypeComboBox; - private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, Inter.getLocText("FR-Designer_Custom")}; + private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType); public RegPhonePane() { this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); dataTypeComboBox = new UIComboBox(DefaultComboBoxModel); JTextField editFiled = (JTextField)(dataTypeComboBox.getEditor().getEditorComponent()); - UILabel dataTypeLable = new UILabel(Inter.getLocText("FR-Designer_Data_Type")); + UILabel dataTypeLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data_Type")); dataTypeLable.setPreferredSize(new Dimension(60, 20)); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{dataTypeLable, dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, 0); this.add(panel); @@ -401,8 +401,8 @@ public class RegPane extends BasicPane { this.setPreferredSize(new Dimension(210, 56)); minLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); - UILabel minLabel = new UILabel(Inter.getLocText("FR-Designer_Reg_Min_Length")); - UILabel maxLabel = new UILabel(Inter.getLocText("FR-Designer_Reg_Max_Length")); + UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Min_Length")); + UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Max_Length")); minLabel.setPreferredSize(new Dimension(60, 20)); maxLabel.setPreferredSize(new Dimension(60, 20)); double f = TableLayout.FILL; @@ -456,7 +456,7 @@ public class RegPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); regTextField = new UITextField(); - JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); + JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); this.add(panel); } @@ -490,21 +490,21 @@ public class RegPane extends BasicPane { int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value instanceof NoneReg){ - this.setText(Inter.getLocText("FR-Designer_None")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None")); } else if (value instanceof LengthReg){ - this.setText(Inter.getLocText("FR-Designer_Length")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Length")); } else if (value instanceof MailReg){ - this.setText(Inter.getLocText("FR-Designer_Email")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email")); } else if (value instanceof PhoneReg){ - this.setText(Inter.getLocText("FR-Designer_Phone")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Phone")); } else if (value instanceof MobileReg) { - this.setText(Inter.getLocText("FR-Designer_MobilePhone")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_MobilePhone")); } else if (value instanceof IDCardReg){ - this.setText(Inter.getLocText("FR-Designer_IDCard")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_IDCard")); } else if (value instanceof PostCardReg){ - this.setText(Inter.getLocText("FR-Designer_PostCode")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PostCode")); } else if (value instanceof CustomReg){ - this.setText(Inter.getLocText("FR-Designer_Custom")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); } return this; } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java index 5942570d7..e18d04b94 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ReportletParameterViewPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itableeditorpane.UITableEditAction; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; @@ -95,7 +95,7 @@ public class ReportletParameterViewPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Parameters"); } public void populate(ParameterProvider[] parameters) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java index 7ed1f84fa..4d2eb918d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java @@ -15,7 +15,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.dialog.BasicPane; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.general.Inter; + /** * 模板的参数添加面板 @@ -30,7 +30,7 @@ public class TemplateParameterPane extends BasicPane { } public void initComponents() { - this.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Parameter"))); + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Parameter"))); this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -39,8 +39,8 @@ public class TemplateParameterPane extends BasicPane { JPanel defaultPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); northPane.add(defaultPane, BorderLayout.CENTER); - UILabel nameLabel = new UILabel(Inter.getLocText("Name") + ":"); - UILabel valueLabel = new UILabel(Inter.getLocText("Value") + ":"); + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":"); + UILabel valueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value") + ":"); nameTextField = new UITextField(12); valuePane = ValueEditorPaneFactory.createBasicValueEditorPane(); @@ -55,7 +55,7 @@ public class TemplateParameterPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Parameter"); } public void populate(Parameter parameter) { @@ -82,7 +82,7 @@ public class TemplateParameterPane extends BasicPane { public void checkValid() throws Exception { Parameter parameter = this.update(); if (parameter.getName() == null || parameter.getName().trim().length() <= 0) { - throw new Exception(Inter.getLocText("ParameterD-Parameter_name_cannot_be_null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("ParameterD-Parameter_name_cannot_be_null") + "."); } this.valuePane.checkValid(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java index 31e5e67dc..58164e7f6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java @@ -16,7 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.TreeComboBoxEditor; import com.fr.form.ui.TreeEditor; import com.fr.form.ui.tree.LayerConfig; -import com.fr.general.Inter; + import com.fr.general.NameObject; import javax.swing.*; @@ -42,8 +42,8 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { */ private static final long serialVersionUID = 1762889323082827111L; - private String[] buildWay = new String[]{Inter.getLocText("FR-Designer_DataTable-Build"), - Inter.getLocText("FR-Designer_Auto-Build"), Inter.getLocText("FR-Designer_Layer-Build")}; + private String[] buildWay = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto-Build"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layer-Build")}; public TreeSettingPane(boolean isEditor) { this.initComponents(isEditor); @@ -53,7 +53,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - UILabel buildWayLabel = new UILabel(Inter.getLocText("FR-Designer_Build-Way") + " ："); + UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build-Way") + " ："); buildWayPanel.add(buildWayLabel); buildBox = new UIComboBox(buildWay); buildBox.addItemListener(new ItemListener() { @@ -99,7 +99,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Create_Tree"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Create_Tree"); } @Override @@ -108,7 +108,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { } NameableCreator treeNode = new NameObjectCreator( - Inter.getLocText("FR-Designer_Gradation"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation"), "/com/fr/design/images/data/source/jdbcTableData.png", TreeNodeAttr.class); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UIAdvancedTextPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UIAdvancedTextPane.java index 937457c0b..40039deb2 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UIAdvancedTextPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UIAdvancedTextPane.java @@ -18,7 +18,7 @@ import javax.swing.undo.UndoableEdit; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.KeySetUtils; -import com.fr.general.Inter; + import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -142,7 +142,7 @@ public class UIAdvancedTextPane extends UITextPane { private class CutAction extends UpdateAction { public CutAction() { - setName(Inter.getLocText("M_Edit-Cut")); + setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); setMnemonic('T'); setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png")); setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)); @@ -161,7 +161,7 @@ public class UIAdvancedTextPane extends UITextPane { private class CopyAction extends UpdateAction { public CopyAction() { - this.setName(Inter.getLocText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)); @@ -180,7 +180,7 @@ public class UIAdvancedTextPane extends UITextPane { private class PasteAction extends UpdateAction { public PasteAction() { - this.setName(Inter.getLocText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); this.setMnemonic('P'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index 8ce51a7d6..79ed96309 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java @@ -18,7 +18,7 @@ import com.fr.design.hyperlink.WebHyperlinkPane; import com.fr.design.javascript.EmailPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.js.AbstractJavaScript; import com.fr.js.EmailJavaScript; import com.fr.js.ReportletHyperlink; @@ -377,13 +377,13 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { JPanel content = (JPanel) jf.getContentPane(); content.setLayout(new BorderLayout()); List data = new ArrayList(); - UIMenuNameableCreator reportlet = new UIMenuNameableCreator(Inter.getLocText("FR-Hyperlink_Reportlet"), + UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(Inter.getLocText("FR-Designer_Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(Inter.getLocText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), new WebHyperlink(), WebHyperlinkPane.class); data.add(reportlet); data.add(email); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java index 739e2b9a7..e8ea9fdaf 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java @@ -29,7 +29,7 @@ import com.fr.design.gui.itable.UIDefaultTableCellEditor; import com.fr.design.gui.itable.UITable; import com.fr.design.gui.itable.UITableEditor; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; /** @@ -386,7 +386,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { */ public static void main(String... args) { JFrame jf = new JFrame("test"); - final String[] columnNames = {Inter.getLocText("Actual_Value"), Inter.getLocText("Display_Value")}; + final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); JPanel content = (JPanel) jf.getContentPane(); content.setLayout(new BorderLayout()); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java index 7ec8f6e02..eb63c0b64 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UINumberDragPane.java @@ -11,7 +11,7 @@ import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.style.NumberDragBar; -import com.fr.general.Inter; + public class UINumberDragPane extends BasicBeanPane implements GlobalNameObserver { private static final long serialVersionUID = -8681716725163358249L; @@ -36,7 +36,7 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam public UINumberDragPane(double minValue, double maxValue, double dierta) { dragBar = new NumberDragBar((int) minValue, (int) maxValue); spinner = new UISpinner(minValue, maxValue, dierta, minValue); - spinner.setGlobalName(Inter.getLocText("StyleAlignment-Text_Rotation")); + spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")); this.setLayout(new BorderLayout(4, 0)); this.add(spinner, BorderLayout.EAST); this.add(dragBar, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java index 619448c46..288396c29 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java @@ -1,7 +1,7 @@ package com.fr.design.gui.frpane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.plaf.TabbedPaneUI; @@ -113,7 +113,7 @@ public class UITabbedPane extends JTabbedPane{ * @param i tab索引 */ public void doRemoveTab(int i){ - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), Inter.getLocText("sure_to_delete")+ "?", Inter.getLocText("Remove") + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove") , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (re == JOptionPane.OK_OPTION) { super.removeTabAt(i); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java index 0ff6164b6..858e7f53c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java @@ -10,7 +10,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ToolBarDef; import com.fr.form.ui.tree.LayerConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.NameObject; import javax.swing.*; @@ -47,10 +47,10 @@ public class LayerDataControlPane extends ControlPane { configPane = new LayerDataConfigPane(); //创建树结构及树控件 JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(Inter.getLocText("FR-Designer_Root")); + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root")); defaultTreeModel = new DefaultTreeModel(rootNode); tree = new JTree(defaultTreeModel); - DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(Inter.getLocText("FR-Designer_Gradation") + 1, new LayerConfig(1))); + DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new LayerConfig(1))); tree.setRootVisible(false); ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer); tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); @@ -143,7 +143,7 @@ public class LayerDataControlPane extends ControlPane { public AddTreeNodeAction() { - this.setName(Inter.getLocText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } @@ -157,7 +157,7 @@ public class LayerDataControlPane extends ControlPane { do { nodeCount++; } while ((innerNode = innerNode.getNextNode()) != null); - NameObject nameable = new NameObject(Inter.getLocText("FR-Designer_Gradation") + nodeCount, new LayerConfig(nodeCount)); + NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + nodeCount, new LayerConfig(nodeCount)); node.getLastLeaf().add(new DefaultMutableTreeNode(nameable)); defaultTreeModel.reload(); @@ -170,15 +170,15 @@ public class LayerDataControlPane extends ControlPane { public RemoveTreeNodeAction() { - this.setName(Inter.getLocText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } public void actionPerformed(ActionEvent e) { // TODO remove tree node - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", - Inter.getLocText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; } @@ -208,7 +208,7 @@ public class LayerDataControlPane extends ControlPane { for (int i = 0; i < count; i++) { DefaultMutableTreeNode node4add = new DefaultMutableTreeNode( - new NameObject(Inter.getLocText("FR-Designer_Gradation") + (i + 1), layerConfigs[i].clone())); + new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), layerConfigs[i].clone())); node4root.add(node4add); node4root = node4add; } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java index 0411afd46..3975c2d43 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.present.dict.TableDataDictPane; import com.fr.form.ui.tree.LayerDependence; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -69,8 +69,8 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener { tableDataDictPane.tableDataNameComboBox.addItemListener(this); //初始化按钮对象 - addButton = new UIButton(Inter.getLocText("add")); - delButton = new UIButton(Inter.getLocText("Delete")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("add")); + delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete")); //初始化Table对象,并添加renderer和editor model = new LayerDepenceTableModel(); dependenceTable = new JTable(); @@ -392,9 +392,9 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener { String name; if (column == 0) { - name = Inter.getLocText("FR-Designer_layerIndex"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_layerIndex"); } else { - name = Inter.getLocText("FR-Designer_filedChosen"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_filedChosen"); } return name; } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java index 9d867168b..364e68d21 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java @@ -5,7 +5,7 @@ package com.fr.design.gui.icombobox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -50,17 +50,17 @@ public class AlignmentComboBox extends UIComboBox { public static String getAlignDescription(int alignment) { if (alignment == Constants.CENTER) {//0 - return Inter.getLocText("Center"); + return com.fr.design.i18n.Toolkit.i18nText("Center"); } else if (alignment == Constants.TOP) {//1 - return Inter.getLocText("StyleAlignment-Top"); + return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"); } else if (alignment == Constants.LEFT) {//2 - return Inter.getLocText("StyleAlignment-Left"); + return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"); } else if (alignment == Constants.BOTTOM) {//3 - return Inter.getLocText("StyleAlignment-Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"); } else if (alignment == Constants.RIGHT) { //4 - return Inter.getLocText("StyleAlignment-Right"); + return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"); } else if (alignment == Constants.DISTRIBUTED) { //added by Kevin Wang 6 - return Inter.getLocText("StyleAlignment-Distibuted"); + return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Distibuted"); } else { return StringUtils.EMPTY; } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index 2664e24cf..df5430ee3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java @@ -1,7 +1,7 @@ package com.fr.design.gui.icombobox; import com.fr.base.SeparationConstants; -import com.fr.general.Inter; + public class DictionaryConstants { // richer:正则表达式 @@ -17,16 +17,16 @@ public class DictionaryConstants { "^\\d{6}$" }; public final static String[] regexpsDisplays = new String[] { - Inter.getLocText("None"), - Inter.getLocText("Required"), - Inter.getLocText("Length"), - Inter.getLocText("Float"), - Inter.getLocText("Email"), - Inter.getLocText("Phone"), - Inter.getLocText("MobilePhone"), - Inter.getLocText("IDCard"), - Inter.getLocText("PostCode"), - Inter.getLocText("Custom")}; + com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Required"), + com.fr.design.i18n.Toolkit.i18nText("Length"), + com.fr.design.i18n.Toolkit.i18nText("Float"), + com.fr.design.i18n.Toolkit.i18nText("Email"), + com.fr.design.i18n.Toolkit.i18nText("Phone"), + com.fr.design.i18n.Toolkit.i18nText("MobilePhone"), + com.fr.design.i18n.Toolkit.i18nText("IDCard"), + com.fr.design.i18n.Toolkit.i18nText("PostCode"), + com.fr.design.i18n.Toolkit.i18nText("Custom")}; public final static int REG_NONE = 0; public final static int REG_REQUIRED = 1; @@ -45,9 +45,9 @@ public class DictionaryConstants { }; public static final String[] delimiterDisplays = new String[]{ - Inter.getLocText("Form-Comma"), - Inter.getLocText("Form-Semicolon"), - Inter.getLocText("Form-Colon") + com.fr.design.i18n.Toolkit.i18nText("Form-Comma"), + com.fr.design.i18n.Toolkit.i18nText("Form-Semicolon"), + com.fr.design.i18n.Toolkit.i18nText("Form-Colon") }; public static final String[] symbols = new String[]{ @@ -55,9 +55,9 @@ public class DictionaryConstants { }; public static final String[] symbolDisplays = new String[]{ - Inter.getLocText("None"), - Inter.getLocText("Form-Single_quote"), - Inter.getLocText("Form-Double_quotes") + com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"), + com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes") }; // richer:文件类型选择器 public static final String[] fileTypes = new String[]{ @@ -77,7 +77,7 @@ public class DictionaryConstants { }; public static final String[] fileTypeDisplays = new String[]{ - Inter.getLocText("Form-All_Files"), + com.fr.design.i18n.Toolkit.i18nText("Form-All_Files"), "txt", "pdf", "jpg,png,gif", diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java index 575ab630b..2e74a2bf1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java @@ -4,7 +4,7 @@ package com.fr.design.gui.icombobox; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import javax.swing.DefaultComboBoxModel; import javax.swing.SwingWorker; @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException; public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener { private static final int NUM = 80; - private static final String[] PENDING_CONTENT = new String[]{"", Inter.getLocText("Loading") + "..."}; + private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Loading") + "..."}; /** * 是否加载完成 diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java index b600390d7..4b04e63d4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java @@ -23,7 +23,7 @@ import com.fr.base.ScreenResolution; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; @@ -91,7 +91,7 @@ public class LineComboBox extends UIComboBox { FontMetrics fm = GraphHelper.getFontMetrics(rfont); if (style == Constants.LINE_NONE) { //draw "none" string - GraphHelper.drawString(g2d, Inter.getLocText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); + GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); } else { GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style); } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java index 55b09e775..e4c25470a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/SortOrderComboBox.java @@ -9,7 +9,7 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JList; import com.fr.data.util.SortOrder; -import com.fr.general.Inter; + /** * Sort order combo box. @@ -53,11 +53,11 @@ public class SortOrderComboBox extends UIComboBox { SortOrder sortOrder = (SortOrder) value; if (sortOrder.getOrder() == SortOrder.ASC) { - this.setText(Inter.getLocText("Sort-Ascending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending")); } else if (sortOrder.getOrder() == SortOrder.DESC) { - this.setText(Inter.getLocText("Sort-Descending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Descending")); } else if (sortOrder.getOrder() == SortOrder.ORIGINAL) { - this.setText(Inter.getLocText("Sort-Original")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Original")); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java index 4cd9ec11c..2492a6c36 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java @@ -5,7 +5,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; @@ -262,7 +262,7 @@ public class UIModeControlContainer extends JLayeredPane { public HidePane() { setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3)); setBackground(UIConstants.NORMAL_BACKGROUND); - add(new UILabel("" + Inter.getLocText(new String[]{"Parameter", "Panel"}) + "")); + add(new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Parameter Panel") + "")); UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_PRESSED_ICON, UIConstants.VIEW_PRESSED_ICON) { @Override public Dimension getPreferredSize() { diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java index 1d272c513..9ce0575d9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java @@ -3,7 +3,7 @@ package com.fr.design.gui.ilist; import com.fr.general.NameObject; import com.fr.base.Utils; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -172,7 +172,7 @@ public class JNameEdList extends UIList implements CellEditorListener { } public void setWarnigText(int index) { - setNameAt(Inter.getLocText("Please_Rename") + "!", index); + setNameAt(com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!", index); this.repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java index 01a951ea0..93505d204 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java @@ -13,7 +13,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.mainframe.dnd.SerializableTransferable; import com.fr.file.ConnectionConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -99,7 +99,7 @@ public class TableViewList extends UIList { count--; } if (!status) { - throw new Exception(Inter.getLocText("Datasource-Connection_failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); } TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter)); return null; diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java index 6ce185506..8150d6870 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java @@ -2,7 +2,7 @@ package com.fr.design.gui.ilist; import com.fr.base.Utils; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; @@ -172,7 +172,7 @@ public class UINameEdList extends UIList implements CellEditorListener { } public void setWarnigText(int index) { - setNameAt(Inter.getLocText("Please_Rename") + "!", index); + setNameAt(com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!", index); this.repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java index b33930790..4bcba9796 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java @@ -10,7 +10,7 @@ import com.fr.design.hyperlink.ReportletHyperlinkPane; import com.fr.design.hyperlink.WebHyperlinkPane; import com.fr.design.javascript.EmailPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.EmailJavaScript; import com.fr.js.ReportletHyperlink; import com.fr.js.WebHyperlink; @@ -211,13 +211,13 @@ public class UIMenuTable extends JTable { JPanel content = (JPanel)jf.getContentPane(); content.setLayout(new BorderLayout()); List data = new ArrayList(); - UIMenuNameableCreator reportlet = new UIMenuNameableCreator(Inter.getLocText("Reportlet"), + UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(Inter.getLocText("Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(Inter.getLocText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), new WebHyperlink(), WebHyperlinkPane.class ); data.add(reportlet); data.add(email); diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java index b2495f5d7..61633fa6a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java @@ -12,7 +12,7 @@ import com.fr.base.GraphHelper; import com.fr.design.constants.UIConstants; import com.fr.design.gui.itable.UITableUI; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; public class UIMenuTableUI extends UITableUI{ @@ -74,8 +74,8 @@ public class UIMenuTableUI extends UITableUI{ @Override public void mousePressed(MouseEvent e) { if (e.getX() >= table.getWidth() - 20) { - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", - Inter.getLocText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { uiTable.removeLine(table.rowAtPoint(e.getPoint())); uiTable.fireTargetChanged(); diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index f5a1c3c77..05bf613b6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -5,7 +5,7 @@ import com.fr.design.dialog.UIDialog; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import javax.swing.JDialog; import javax.swing.JLabel; @@ -48,7 +48,7 @@ public class ProgressDialog extends UIDialog { progressBar.setOpaque(false); progressBar.setBorder(null); panel.add(progressBar, BorderLayout.CENTER); - text = new UILabel(Inter.getLocText("Fine-Designer_Loading_Project"), JLabel.CENTER); + text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Loading_Project"), JLabel.CENTER); FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)); text.setFont(font); panel.add(text, BorderLayout.SOUTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java b/designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java index 36e9cc17d..72f6a135b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java @@ -18,7 +18,7 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + /** * @author richer @@ -255,9 +255,9 @@ public abstract class AbstractPropertyTable extends JTable { @Override public String getColumnName(int column) { if (column == 0) { - return Inter.getLocText("Form-Widget_Property"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property"); } else { - return Inter.getLocText("Form-Widget_Property_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Value"); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java index e4310aca2..531a58cd4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java @@ -20,7 +20,7 @@ import javax.swing.table.TableModel; import com.fr.base.BaseUtils; import com.fr.design.constants.UIConstants; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.design.utils.gui.GUIPaintUtils; @@ -132,8 +132,8 @@ public class UITableUI extends BasicTableUI { return; } if (!table.isEditing()) { - int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", - Inter.getLocText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { ((UITable) table).removeLine(table.rowAtPoint(e.getPoint())); ((UITable) table).fireTargetChanged(); diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java index d68ab32b6..a941980ea 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java @@ -5,7 +5,7 @@ import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -35,7 +35,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(int paraUseType) { - super(new String[] { Inter.getLocText("Parameter"), Inter.getLocText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); @@ -43,7 +43,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(int paraUseType, Component component) { - super(new String[] { Inter.getLocText("Parameter"), Inter.getLocText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); @@ -52,7 +52,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, Component component) { - super(new String[] { Inter.getLocText("Parameter"), Inter.getLocText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(valueEditorPane)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); @@ -239,7 +239,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterValueRenderer(ValueEditorPane valueEditorPane) { - disableLable = new UILabel(Inter.getLocText("Set-Parameter-Name")); + disableLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Set-Parameter-Name")); disableLable.setForeground(Color.pink); disableLable.setHorizontalAlignment(SwingConstants.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java index 1b5a2e9de..fcc976c53 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.TableModelListener; @@ -106,7 +106,7 @@ public class UITableEditorPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("TableData_Dynamic_Parameter_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("TableData_Dynamic_Parameter_Setting"); } public void populate(T[] objs) { diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index 31196c725..113342a02 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -16,7 +16,7 @@ import javax.swing.table.TableCellRenderer; import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + /** * 用来处理TableEditorPane的model @@ -183,7 +183,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class AddTableRowAction extends UITableEditAction { public AddTableRowAction() { - this.setName(Inter.getLocText("Insert")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Insert")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } @@ -200,7 +200,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class EditAction extends UITableEditAction { public EditAction() { - this.setName(Inter.getLocText("Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Edit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png")); } @@ -208,7 +208,7 @@ public abstract class UITableModelAdapter extends AbstractTabl public void actionPerformed(ActionEvent e) { final int selectedRow = table.getSelectedRow(); if (selectedRow > table.getRowCount() - 1 || selectedRow < 0) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("no-alternatives")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("no-alternatives")); return; } stopCellEditing(); @@ -221,12 +221,12 @@ public abstract class UITableModelAdapter extends AbstractTabl private Component component = null; public DeleteAction() { - this.setName(Inter.getLocText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } public DeleteAction(Component component){ - this.setName(Inter.getLocText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); this.component = component; } @@ -235,7 +235,7 @@ public abstract class UITableModelAdapter extends AbstractTabl public void actionPerformed(ActionEvent e) { int[] selectedRow = table.getSelectedRows(); if (ismultiSelected()) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),Inter.getLocText(new String[]{"The_current_list_is_empty", "Or-you", "Privilege-Selected_None_Of_Any_Items"})); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text")); return; } if (table.getCellEditor() != null) { @@ -253,7 +253,7 @@ public abstract class UITableModelAdapter extends AbstractTabl component = DesignerContext.getDesignerFrame(); } int val = JOptionPane.showConfirmDialog(component, - Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", Inter.getLocText("Remove"), + com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; @@ -282,7 +282,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveUpAction extends UITableEditAction { public MoveUpAction() { - this.setName(Inter.getLocText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); } @@ -306,7 +306,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveDownAction extends UITableEditAction { public MoveDownAction() { - this.setName(Inter.getLocText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); } diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java index c0d7967e8..d2f4451c8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java @@ -3,7 +3,7 @@ package com.fr.design.gui.itextfield; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.text.Document; @@ -27,7 +27,7 @@ public class UISearchTextField extends UITextField { private UILabel iconLabel = new UILabel(UIConstants.BLACK_SEARCH_ICON); private UILabel clearLabel = new UILabel(UIConstants.CLEAR_ICON); - private UILabel infoLabel = new UILabel(Inter.getLocText("Search")); + private UILabel infoLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Search")); private Dimension iconSize; private Dimension infoSize; @@ -62,8 +62,8 @@ public class UISearchTextField extends UITextField { private void initTextField() { iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - iconLabel.setToolTipText(Inter.getLocText("Search")); - clearLabel.setToolTipText(Inter.getLocText("Clear")); + iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Search")); + clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Clear")); clearLabel.setOpaque(false); iconSize = iconLabel.getPreferredSize(); infoSize = infoLabel.getPreferredSize(); diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java index 266dbf187..f7d42885b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/JFileTree.java @@ -21,7 +21,7 @@ import javax.swing.tree.TreePath; import com.fr.base.BaseUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.project.ProjectConstants; @@ -43,7 +43,7 @@ public class JFileTree extends AbstractFileTree { private void init(FileFilter filter) { this.fileFilter = filter; - DefaultTreeModel m_model = new DefaultTreeModel(new DefaultMutableTreeNode(Inter.getLocText("My_Computer"))); + DefaultTreeModel m_model = new DefaultTreeModel(new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("My_Computer"))); this.setModel(m_model); this.putClientProperty("JTree.lineStyle", "Angled"); diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java index 6259667e4..08afafcbf 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.filetree.IOFileNodeFilter; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -33,7 +33,7 @@ public class ReportletPane extends BasicPane { textPane.setLineWrap(true); textPane.setFont(FRContext.getDefaultValues().getFRFont().deriveFont(Font.BOLD, 12)); - textPane.setText(Inter.getLocText("Schedule-The_selected_file_must_be_end_with_filter")); + textPane.setText(com.fr.design.i18n.Toolkit.i18nText("Schedule-The_selected_file_must_be_end_with_filter")); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(centerPane, BorderLayout.CENTER); @@ -65,10 +65,10 @@ public class ReportletPane extends BasicPane { private void switchCardPane(boolean switch2Class) { if (switch2Class) { card.show(cardPane, "CLASS"); - switchButton.setText(Inter.getLocText("Utils-Switch_To_Template_Reportlet")); + switchButton.setText(com.fr.design.i18n.Toolkit.i18nText("Utils-Switch_To_Template_Reportlet")); } else { card.show(cardPane, "TEMPLATE"); - switchButton.setText(Inter.getLocText("Utils-Switch_To_Class_Reportlet")); + switchButton.setText(com.fr.design.i18n.Toolkit.i18nText("Utils-Switch_To_Class_Reportlet")); } } @@ -80,7 +80,7 @@ public class ReportletPane extends BasicPane { public void checkValid() throws Exception { String path = this.getSelectedReportletPath(); if (path == null) { - throw new Exception(Inter.getLocText("Function-The_selected_file_cannot_be_null")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Function-The_selected_file_cannot_be_null")); } } @@ -96,7 +96,7 @@ public class ReportletPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Reportlet"); + return com.fr.design.i18n.Toolkit.i18nText("Reportlet"); } /* diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java index d63db70cf..c55a69a79 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java @@ -11,7 +11,7 @@ import com.fr.data.impl.TreeAttr; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + public class TreeRootPane extends BasicPane { @@ -31,7 +31,7 @@ public class TreeRootPane extends BasicPane { JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - checkTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Mutiple_Selection_Or_Not")); + checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")); checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkTypePane.add(checkTypeCheckBox); @@ -39,7 +39,7 @@ public class TreeRootPane extends BasicPane { JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - loadTypeCheckBox = new UICheckBox(Inter.getLocText("Widget-Load_By_Async")); + loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")); loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); loadTypePane.add(loadTypeCheckBox); @@ -47,14 +47,14 @@ public class TreeRootPane extends BasicPane { JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - leafSelectPane.add(layerTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Select_Leaf_Only"))); + leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only"))); layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.add(leafSelectPane); JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(Inter.getLocText("Tree-Return_Full_Path"))); + returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path"))); returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.add(returnFullPathPane); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java index e1afb4e44..2f1f458fa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java @@ -21,7 +21,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.ExtraClassManager; import com.fr.report.fun.VerticalTextProcessor; import com.fr.report.fun.impl.DefaultVerticalTextProcessor; @@ -42,11 +42,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private static final int GAP = 23; private static final int VERGAP = 3; private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20); - private static final String[] TEXT = {Inter.getLocText("FR-Designer_StyleAlignment_Wrap_Text"), Inter.getLocText("FR-Designer_StyleAlignment_Single_Line"), - Inter.getLocText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), Inter.getLocText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")}; + private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")}; - private static final String[] LAYOUT = {Inter.getLocText("FR-Designer-StyleAlignment_Layout_Default"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Titled"), - Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Extend"), Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Adjust")}; + private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Titled"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Adjust")}; private JPanel hPaneContainer; private JPanel vPaneContainer; @@ -89,8 +89,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"), - Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Right"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")}); hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); @@ -99,7 +99,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}}; Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM}; vAlignmentPane = new UIButtonGroup(vAlignmentIconArray, vAlignment); - vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")}); + vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Tooltips_Bottom")}); initOtherComponent(); initAllNames(); @@ -141,7 +141,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private void initTextRotationCombox() { ArrayList selectOption = new ArrayList(); - selectOption.add(Inter.getLocText("FR-Designer_Custom-Angle")); + selectOption.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom-Angle")); VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class); selectOption.addAll(Arrays.asList(processor.getComboxOption())); @@ -149,25 +149,25 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private void initAllNames() { - hAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal")); - vAlignmentPane.setGlobalName(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical")); - imageLayoutComboBox.setGlobalName(Inter.getLocText("FR-Designer_Image_Layout")); - textComboBox.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Style")); - textRotationComboBox.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation")); - rotationPane.setGlobalName(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation")); - leftIndentSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Left_Indent")); - rightIndentSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Right_Indent")); - spaceBeforeSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Spacing_Before")); - spaceAfterSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Spacing_After")); - lineSpaceSpinner.setGlobalName(Inter.getLocText("FR-Designer_Style_Line_Spacing")); + hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal")); + vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical")); + imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout")); + textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style")); + textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation")); + rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation")); + leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Left_Indent")); + rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Right_Indent")); + spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_Before")); + spaceAfterSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_After")); + lineSpaceSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Line_Spacing")); } private JPanel createPane() { JPanel jp1 = new JPanel(new BorderLayout()); basicPane = new JPanel(); seniorPane = new JPanel(); - basicPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 290, 24, basicPane()); - seniorPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 290, 24, seniorPane()); + basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane()); + seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 290, 24, seniorPane()); jp1.add(basicPane, BorderLayout.NORTH); jp1.add(seniorPane, BorderLayout.CENTER); @@ -180,9 +180,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, new Component[]{null, null} }; double[] rowSize = {p, p, p, p, p, p}; @@ -197,11 +197,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel((Inter.getLocText("FR-Designer_Image_Layout")) + " ", SwingConstants.LEFT), imageLayoutComboBox}, + new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout")) + " ", SwingConstants.LEFT), imageLayoutComboBox}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_StyleAlignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox}, new Component[]{null, rotationBarCC}, new Component[]{null, null}, }; @@ -225,23 +225,23 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION); JPanel indentationPane = new JPanel(new BorderLayout()); - indentationPane.add(new UILabel((Inter.getLocText("FR-Designer-StyleAlignment_Style_Indentation")), SwingConstants.LEFT)); + indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Indentation")), SwingConstants.LEFT)); indentationPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); JPanel partSpacingPane = new JPanel(new BorderLayout()); - partSpacingPane.add(new UILabel((Inter.getLocText("FR-Designer-StyleAlignment_Style_PartSpacing")), SwingConstants.LEFT)); + partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_PartSpacing")), SwingConstants.LEFT)); partSpacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); JPanel spacingPane = new JPanel(new BorderLayout()); - spacingPane.add(new UILabel((Inter.getLocText("FR-Designer-StyleAlignment_Style_Spacing")), SwingConstants.LEFT)); + spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Spacing")), SwingConstants.LEFT)); spacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); Component[][] components = new Component[][]{ new Component[]{null, null, null}, new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)}, - new Component[]{null, new UILabel((Inter.getLocText("FR-Designer_Left")), SwingConstants.CENTER), new UILabel((Inter.getLocText("FR-Designer_Right")), SwingConstants.CENTER)}, + new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right")), SwingConstants.CENTER)}, new Component[]{null, null, null}, new Component[]{null, null, null}, new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)}, - new Component[]{null, new UILabel((Inter.getLocText("FR-Designer_Front")), SwingConstants.CENTER), new UILabel((Inter.getLocText("FR-Designer_Behind")), SwingConstants.CENTER)}, + new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Front")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Behind")), SwingConstants.CENTER)}, new Component[]{null, null, null}, new Component[]{null, null, null}, new Component[]{spacingPane, creatSpinnerPane(lineSpaceSpinner), null}, @@ -264,7 +264,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer-StyleAlignment_Style_Alignment"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Alignment"); } /** @@ -326,18 +326,18 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO return style; } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Horizontal"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal"))) { Integer h = this.hAlignmentPane.getSelectedItem(); style = style.deriveHorizontalAlignment(h == null ? -1 : h); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-StyleAlignment_Pane_Vertical"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical"))) { Integer vAlign = this.vAlignmentPane.getSelectedItem(); if (vAlign != null) { style = style.deriveVerticalAlignment(vAlign); } } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_StyleAlignment_Text_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style"))) { if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[0])) { style = style.deriveTextStyle(Style.TEXTSTYLE_WRAPTEXT); } else if (ComparatorUtils.equals(this.textComboBox.getSelectedItem(), TEXT[1])) { @@ -357,7 +357,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private Style updateImageLayout(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Image_Layout"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout"))) { if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[1])) { style = style.deriveImageLayout(Constants.IMAGE_TILED); } else if (ComparatorUtils.equals(this.imageLayoutComboBox.getSelectedItem(), LAYOUT[2])) { @@ -373,7 +373,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private Style updateTextRotation(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"))) { if (this.textRotationComboBox.getSelectedIndex() != 0) { style = style.deriveVerticalText(Style.VERTICALTEXT); style = style.deriveRotation(0); @@ -387,21 +387,21 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private Style updateOther(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Left_Indent"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Left_Indent"))) { style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.leftIndentSpinner.getValue()))); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Right_Indent"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Right_Indent"))) { style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.rightIndentSpinner.getValue()))); } //间距 - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Spacing_Before"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_Before"))) { style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Spacing_After"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_After"))) { style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Style_Line_Spacing"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Line_Spacing"))) { style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue())); } return style; diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java index 24f022663..a0b4b243e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.*; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -74,7 +74,7 @@ public class BackgroundPane extends AbstractBasicStylePane { double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill") + " ", SwingConstants.LEFT),typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill") + " ", SwingConstants.LEFT),typeComboBox}, new Component[]{null, centerPane} }; double[] rowSize = {p, p, p}; @@ -133,7 +133,7 @@ public class BackgroundPane extends AbstractBasicStylePane { * @return 名称 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Utils_Background"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Background"); } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java index 1a129aedf..f1aa26093 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java @@ -20,7 +20,7 @@ import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane; import com.fr.design.style.color.NewColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; @@ -78,14 +78,14 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Style") + " ", SwingConstants.LEFT), currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style") + " ", SwingConstants.LEFT), currentLineCombo}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)}, new Component[]{null, externalPane}, new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)}, new Component[]{null, insidePane}, new Component[]{null, null} }; @@ -93,11 +93,11 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM); - borderPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Border"), 280, 24, panel); + borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border"), 280, 24, panel); this.add(borderPanel, BorderLayout.NORTH); backgroundPane = new BackgroundPane(); - backgroundPanel = new UIExpandablePane(Inter.getLocText("FR-Designer_Background"), 280, 24, backgroundPane); + backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), 280, 24, backgroundPane); this.add(backgroundPanel, BorderLayout.CENTER); initAllNames(); outerToggleButton.addChangeListener(outerToggleButtonChangeListener); @@ -150,7 +150,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java index 261a51764..3029d31e5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java @@ -23,7 +23,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.DefaultValues; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -44,7 +44,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse private static final Dimension BUTTON_SIZE = new Dimension(20, 18); private static final Dimension UNDER_LINE_SIZE = new Dimension(87, 20); private static final Dimension HIDE_SIZE = new Dimension(0, 0); - private final String[] fontSizeStyles = {Inter.getLocText("FR-Designer_FRFont_plain"), Inter.getLocText("FR-Designer_FRFont_bold"), Inter.getLocText("FR-Designer_FRFont_italic"), Inter.getLocText("FR-Designer_FRFont_bolditalic")}; + private final String[] fontSizeStyles = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_plain"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bolditalic")}; private JPanel buttonPane; private JPanel isSuperOrSubPane; private UIComboBox fontNameComboBox; @@ -84,7 +84,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Sytle-FRFont"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont"); } /** @@ -134,34 +134,34 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse */ public FRFont update(FRFont frFont) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_Name"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"))) { frFont = frFont.applyName((String) fontNameComboBox.getSelectedItem()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) { frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-FRFont_Size"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size"))) { frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Foreground"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) { frFont = frFont.applyForeground(this.colorSelectPane.getColor()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Underline"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"))) { int line = underline.isSelected() ? this.underlineCombo.getSelectedLineStyle() : Constants.LINE_NONE; frFont = frFont.applyUnderline(line); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer-FRFont_Line_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style"))) { frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Strikethrough"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"))) { frFont = frFont.applyStrikethrough(isStrikethroughCheckBox.isSelected()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Shadow"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"))) { frFont = frFont.applyShadow(isShadowCheckBox.isSelected()); } @@ -179,7 +179,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse private FRFont updateSubSuperscript(FRFont frFont) { boolean isSuper = frFont.isSuperscript(); boolean isSub = frFont.isSubscript(); - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Superscript"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"))) { //如果上标没有选中,点击则选中上标，并且下标一定是不选中状态 //如果上标选中，点击则取消选中上标，字体回复正常 if (superPane.isSelected() && !isSuper) { @@ -190,7 +190,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse frFont = frFont.applySuperscript(false); } } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), Inter.getLocText("FR-Designer_FRFont_Subscript"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript"))) { if (subPane.isSelected() && !isSub) { frFont = frFont.applySubscript(true); frFont = frFont.applySuperscript(false); @@ -265,29 +265,29 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse } private void initAllNames() { - fontSizeStyleComboBox.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Style")); - fontNameComboBox.setGlobalName(Inter.getLocText("FR-Designer_Name")); - fontSizeComboBox.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Size")); - colorSelectPane.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Foreground")); - italic.setGlobalName(Inter.getLocText("FR-Designer_FRFont_italic")); - bold.setGlobalName(Inter.getLocText("FR-Designer_FRFont_bold")); - underline.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Underline")); - underlineCombo.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Line_Style")); - isStrikethroughCheckBox.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Strikethrough")); - isShadowCheckBox.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Shadow")); - superPane.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Superscript")); - subPane.setGlobalName(Inter.getLocText("FR-Designer_FRFont_Subscript")); + fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style")); + fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); + colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground")); + italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic")); + bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold")); + underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); + isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough")); + isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow")); + superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript")); + subPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript")); } private void setToolTips() { - colorSelectPane.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Foreground")); - italic.setToolTipText(Inter.getLocText("FR-Designer_FRFont_italic")); - bold.setToolTipText(Inter.getLocText("FR-Designer_FRFont_bold")); - underline.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Underline")); - isStrikethroughCheckBox.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Strikethrough")); - isShadowCheckBox.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Shadow")); - superPane.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Superscript")); - subPane.setToolTipText(Inter.getLocText("FR-Designer_FRFont_Subscript")); + colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground")); + italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic")); + bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold")); + underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline")); + isStrikethroughCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough")); + isShadowCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow")); + superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript")); + subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript")); } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java index 7b60bc99b..b6fd17778 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -108,7 +108,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs frFontPane = new FRFontPane(); - UILabel font = new UILabel(Inter.getLocText("FR-Designer_FRFont"), SwingConstants.LEFT); + UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont"), SwingConstants.LEFT); JPanel fontPane = new JPanel(new BorderLayout()); fontPane.add(font, BorderLayout.NORTH); @@ -136,7 +136,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{centerPane, null}, new Component[]{fontPane, frFontPane}, }; @@ -158,7 +158,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs private void iniSampleLable() { Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); Font tmpFont = null; - Border border = BorderFactory.createTitledBorder(innterborder, Inter.getLocText("FR-Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); + Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("FR-Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) { @Override @@ -197,7 +197,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Text"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"); } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/ErrorStrip.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/ErrorStrip.java index da74104ef..e10e8f8ce 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/ErrorStrip.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/ErrorStrip.java @@ -36,7 +36,7 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.parser.Parser; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.parser.ParserNotice; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.parser.TaskTagParser.TaskNotice; import com.fr.design.gui.syntax.ui.rtextarea.RTextArea; -import com.fr.general.Inter; + /** @@ -288,7 +288,7 @@ public class ErrorStrip extends JComponent { String text = null; int line = yToLine(e.getY()); if (line>-1) { - text = Inter.getLocText("Line"); + text = com.fr.design.i18n.Toolkit.i18nText("Line"); text = MessageFormat.format(text, Integer.valueOf(line+1)); } return text; @@ -674,7 +674,7 @@ public class ErrorStrip extends JComponent { try { String word = textArea.getText(range.getStartOffset(), getLength()); - text = Inter.getLocText("OccurrenceOf"); + text = com.fr.design.i18n.Toolkit.i18nText("OccurrenceOf"); text = MessageFormat.format(text, word); } catch (BadLocationException ble) { UIManager.getLookAndFeel().provideErrorFeedback(textArea); @@ -765,7 +765,7 @@ public class ErrorStrip extends JComponent { } else { // > 1 StringBuilder sb = new StringBuilder(""); - sb.append(Inter.getLocText("MultipleMarkers")); + sb.append(com.fr.design.i18n.Toolkit.i18nText("MultipleMarkers")); sb.append("
"); for (int i=0; i extends BasicB } }); JPanel targetFramePanel = new JPanel(); - targetFramePanel.add(new UILabel(Inter.getLocText("Hyperlink-Link_Opened_in"))); + targetFramePanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Link_Opened_in"))); targetFramePanel.add(targetFrameComboBox); targetFrameComboBox.setEditable(true); targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); final JPanel newWindowConfPane = new JPanel(); - newWindowConfPane.add(new UILabel(Inter.getLocText("FR-Designer_Height") + ": ")); + newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ": ")); heightTextFiled = new UINumberField(); heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); heightTextFiled.setPreferredSize(new Dimension(40, 20)); newWindowConfPane.add(heightTextFiled); - newWindowConfPane.add(new UILabel(" " + Inter.getLocText("FR-Designer_Width") + ": ")); + newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ": ")); widthTextFiled = new UINumberField(); widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE)); widthTextFiled.setPreferredSize(new Dimension(40, 20)); @@ -80,7 +80,7 @@ public abstract class AbstractHyperNorthPane extends BasicB } protected String[] getTargetFrames() { - return new String[]{Inter.getLocText("Hyperlink-New_Window"), Inter.getLocText("FR-Hyperlink_Dialog"), Inter.getLocText("Hyperlink-Self_Window")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Hyperlink-New_Window"), com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Dialog"), com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Self_Window")}; } protected abstract JPanel setHeaderPanel(); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java index 9b76e7438..1ebef3d85 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.ReportletHyperlink; import com.fr.stable.StringUtils; @@ -65,7 +65,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane { if (this.needRenamePane) { headerPane.setLayout(new BorderLayout(LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_SMALL)); itemNameTextField = new UITextField(); - headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Designer_Name") + ":"), BorderLayout.NORTH); + headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), BorderLayout.NORTH); headerPane.add(urlWithHelp, BorderLayout.CENTER); } else { headerPane.add(urlWithHelp, BorderLayout.NORTH); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java index 0e19d457d..adc49ec85 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.WebHyperlink; import com.fr.stable.ParameterProvider; @@ -42,16 +42,16 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Parameters"), null)); + parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null)); - useCJKCheckBox = new UICheckBox(Inter.getLocText("Hyperlink-Use_CJK_to_encode_parameter")); - extendParametersCheckBox = new UICheckBox(Inter.getLocText("Hyperlink-Extends_Report_Parameters")); + useCJKCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Use_CJK_to_encode_parameter")); + extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); this.add(GUICoreUtils.createFlowPane(new Component[]{useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); } @Override public String title4PopupWindow() { - return Inter.getLocText("Hyperlink-Web_link"); + return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java b/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java new file mode 100644 index 000000000..ad4dff6a4 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java @@ -0,0 +1,48 @@ +package com.fr.design.i18n; + +import com.fr.general.log.MessageFormatter; +import com.fr.locale.InterProviderFactory; + +/** + * 设计器国际化类，后面会不再依赖InterProviderFactory + */ +public class Toolkit { + + /** + * 设计器国际化方法 + * @param key 国际化键 + * @return 国际化值 + */ + public static String i18nText(String key) { + return InterProviderFactory.getProvider().getLocText(key); + } + + /** + * 带格式化内容的国际化方法 + * Toolkit.i18nText("Fine-Design_xxx", 1, 2)，假设Fine-Design_xxx的中文值为：我来计算{}+{}，输出结果为：我来计算1+2 + * @param key 格式化文本 + * @param args 格式化参数 + * @return 国际化值 + */ + public static String i18nText(String key, Object... args) { + String format = InterProviderFactory.getProvider().getLocText(key); + MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args); + return tuple.getMessage(); + } + + /** + * 太鸡儿多了，改不完，先加上慢慢改 + * @deprecated + */ + public static String i18nTextArray(String[] keys) { + return InterProviderFactory.getProvider().getLocText(keys); + } + + /** + * 太鸡儿多了，改不完，先加上慢慢改 + * @deprecated + */ + public static String i18nTextArray(String[] keys, String[] delimiter) { + return InterProviderFactory.getProvider().getLocText(keys, delimiter); + } +} diff --git a/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java index d49d311e7..c25430f07 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.CommitTabbedPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.js.Commit2DBJavaScript; import com.fr.write.DBManipulation; @@ -94,7 +94,7 @@ public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return Inter.getLocText(new String[]{"Custom", "RWA-Submit"}); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } } \ No newline at end of file +package com.fr.design.javascript; import com.fr.data.ClassSubmitJob; import com.fr.design.write.submit.CustomSubmitJobPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.js.CustomActionJavaScript; import java.awt.*; /** * Author : Shockway * Date: 13-8-12 * Time: 下午7:47 */ public class CustomActionPane extends FurtherBasicBeanPane { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Custom"); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java index edc699c8e..50702419c 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/EmailPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.js.EmailJavaScript; import com.fr.stable.StringUtils; @@ -39,9 +39,9 @@ public class EmailPane extends FurtherBasicBeanPane { tipsPane1 = new UILabel(); tipsPane1.setHorizontalAlignment(SwingConstants.RIGHT); tipsPane1.setForeground(Color.pink); - tipsPane2 = new UILabel(Inter.getLocText("FR-Designer_EmailPane-tips")); + tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-tips")); - UILabel mainTextLabel = new UILabel(Inter.getLocText("FR-Designer_EmailPane-mailContent") + ":"); + UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-mailContent") + ":"); mainTextLabel.setHorizontalAlignment(SwingConstants.RIGHT); mainTextLabel.setVerticalAlignment(SwingConstants.TOP); JScrollPane scrollPane = new JScrollPane(mainTextEditor = new JTextArea()); @@ -61,13 +61,13 @@ public class EmailPane extends FurtherBasicBeanPane { protected void initCenterPane(UILabel mainTextLabel, JScrollPane scrollPane, double fill, double preferred) { double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred, preferred }; double[] columnSize = { preferred, fill}; - showTplContent = new UICheckBox(Inter.getLocText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(Inter.getLocText("FR-Designer_EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(Inter.getLocText("FR-Designer_EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), showTplContent}, {new UILabel(), tipsPane2}},rowSize, columnSize, 8); @@ -81,7 +81,7 @@ public class EmailPane extends FurtherBasicBeanPane { } protected void checkEmailConfig(boolean valid) { - tipsPane1.setText(valid ? StringUtils.BLANK : Inter.getLocText("FR-Designer_EmailPane-warnings")); + tipsPane1.setText(valid ? StringUtils.BLANK : com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-warnings")); centerPane.setEnabled(valid); mainTextEditor.setEnabled(valid); mainTextEditor.setBackground(valid ? Color.WHITE : UIConstants.DEFAULT_BG_RULER); @@ -139,7 +139,7 @@ public class EmailPane extends FurtherBasicBeanPane { * @return 标题字串 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Email_sentEmail"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); } /** diff --git a/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java index 9e48ad4ad..18904224a 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/FormSubmitJavaScriptPane.java @@ -20,13 +20,13 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.scrollruler.ModLineBorder; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.js.FormSubmitJavaScript; import com.fr.stable.ParameterProvider; public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane { - public static final String ASYNCH = Inter.getLocText("JavaScrit-Asynch"); - public static final String SYNCH = Inter.getLocText("JavaScript-Synch"); + public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScrit-Asynch"); + public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("JavaScript-Synch"); private UITextField urlTextField; private UIComboBox asynComboBox; private ReportletParameterViewPane pViewPane; @@ -40,7 +40,7 @@ public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane { * @return 返回按钮对象 */ public UIButton createCallButton() { - UIButton callButton = new UIButton(Inter.getLocText("FR-Designer_Set_Callback_Function")); + UIButton callButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("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("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); } @Override @@ -152,7 +152,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); } @Override @@ -180,7 +180,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index 95545898d..2c56fb7fe 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -11,7 +11,7 @@ import com.fr.design.hyperlink.AbstractHyperLinkPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.scrollruler.ModLineBorder; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.JavaScriptImpl; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -51,7 +51,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { protected void initComponents() { parameterPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); - parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_Parameter"))); + parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"))); parameterPane.addTableEditorListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { List list = parameterPane.update(); @@ -62,7 +62,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } if (tempSet.contains(list.get(i).toString())) { list.remove(i); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Repeat", "Parameter_Name"}) + "!"); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!"); parameterChanger(list); return; } @@ -72,7 +72,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }); - OneListTableModel model = new OneListTableModel(Inter.getLocText("ReportServerP-Import_JavaScript"), this) { + OneListTableModel model = new OneListTableModel(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), this) { public UITableEditAction[] createAction() { return new UITableEditAction[]{getAddAction(), new DeleteAction(this.component), new MoveUpAction(), new MoveDownAction()}; @@ -84,10 +84,10 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }; importedJsPane = new UITableEditorPane(model); - importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("ReportServerP-Import_JavaScript"))); + importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"))); importedJsPane.setPreferredSize(new Dimension(265, 150)); jsPane = new JSContentPane(defaultArgs); - jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Designer_JavaScript"))); + jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"))); parameterPane.setPreferredSize(new Dimension(265, 150)); JPanel topPane = GUICoreUtils.createBorderLayoutPane( @@ -125,7 +125,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { * @return 标题. */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_JavaScript"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); } /** @@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { itemNameTextField = new UITextField(); JPanel topPane = GUICoreUtils.createBorderLayoutPane( - GUICoreUtils.createNamedPane(itemNameTextField, Inter.getLocText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH, + GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH, importedJsPane, BorderLayout.CENTER, parameterPane, BorderLayout.EAST ); diff --git a/designer-base/src/main/java/com/fr/design/javascript/ParameterJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ParameterJavaScriptPane.java index b5d6d77d9..e1147bd29 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ParameterJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ParameterJavaScriptPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.hyperlink.AbstractHyperLinkPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.ParameterJavaScript; import com.fr.stable.ParameterProvider; @@ -29,13 +29,13 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane { - private ComboCheckBox comboBox; - private ProcessParameterPane paraPane; - - public ProcessJSImplPane() { - this.initComponents(); - } - - protected void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - /*b:transition pane*/ - JPanel tranpane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0)); - tranpane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Please_Select", "Transition"}) + ":")); - comboBox = new ComboCheckBox(); - comboBox.setRenderer(new UIComboBoxRenderer() { - @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, - boolean cellHasFocus) { - if (value != null) { - if (value instanceof Object[]) { - Object[] obj = (Object[]) value; - String[] res = new String[obj.length]; - for (int i = 0, len = obj.length; i < len; i++) { - res[i] = (String)obj[i]; - } - setText(StringUtils.join(",", res)); - } - } else { - setText(""); - } - return this; - } - }); - tranpane.add(new UILabel(Inter.getLocText("Transition") + ":")); - tranpane.add(comboBox); - this.add(tranpane, BorderLayout.NORTH); - - /*b:parameters pane*/ - JPanel paraspane = new JPanel(new BorderLayout()); - paraspane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Set-Parameter-Name") + ":")); - paraPane = new ProcessParameterPane(); - paraspane.add(paraPane, BorderLayout.CENTER); - this.add(paraspane, BorderLayout.CENTER); - } - - protected abstract Editor[] getCorrespondEditors(); - - private String[] getTransitions() { - JTemplate template = DesignerContext.getDesignerFrame().getSelectedJTemplate(); - if (template == null) { - return new String[0]; - } - return ProcessTransitionAdapter.getTransitionNamesByBookWithShared(template.getEditingFILE().getEnvFullName()); - } - - private ParameterProvider[] getParameters() { - JTemplate template = DesignerContext.getDesignerFrame().getSelectedJTemplate(); - if (template == null) { - return new ParameterProvider[0]; - } - return ProcessTransitionAdapter.getParasWithShared(template.getEditingFILE().getEnvFullName()); - } - - /** - * 更新表单在流程里可以往前进的分支。 - */ - public void refreshTransitions() { - comboBox.setData(this.getTransitions()); - } - - /** - * 重置界面 - */ - public void reset() { - populateBean(null); - } - - @Override - public void populateBean(ProcessJSImpl ob) { - if (ob == null) { - ob = new ProcessJSImpl(); - } - //b:每次Pop是刷新transitions - this.refreshTransitions(); - comboBox.getModel().setSelectedItem(ob.getTransitionNames()); - paraPane.populate(ob.getParameters()); - } - - @Override - public ProcessJSImpl updateBean() { - ProcessJSImpl js = new ProcessJSImpl(); - if (comboBox.getSelectedItem() instanceof Object[]) { - Object[] os = (Object [])comboBox.getSelectedItem(); - String[] ss = new String[os.length]; - for (int i = 0, len = os.length; i < len; i++) { - ss[i] = (String)os[i]; - } - js.setTransitionNames(ss); - } - - List list = paraPane.update(); - js.setParameters(list.toArray(new ParameterProvider[list.size()])); - return js; - } - - @Override - /** - * 弹出的窗口的标题 - * @return 标题 - */ - public String title4PopupWindow() { - return Inter.getLocText("ProcessManager"); - } - - private class ProcessParameterPane extends ReportletParameterViewPane { - private UITableEditorPane editorPane; - - public ProcessParameterPane() { - this.initComponents(); - } - - private void initComponents() { - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - UITableModelAdapter model = new ProcessParameterTableModel() { - @Override - public UITableEditAction[] createAction() { - return new UITableEditAction[] { new AddParameterAction(), new DeleteAction()}; - } - - protected Editor[] getCorrespondEditors() { - return ProcessJSImplPane.this.getCorrespondEditors(); - } - }; - - editorPane = new UITableEditorPane(model); - this.add(editorPane, BorderLayout.CENTER); - } - - public void populate(ParameterProvider[] parameters) { - if (parameters == null) { - return; - } - editorPane.populate(parameters); - } - - public void populate(KV[] kv) { - if (kv == null) { - return; - } - Parameter[] parameters = new Parameter[kv.length]; - for (int i = 0; i < kv.length; i++) { - parameters[i] = new Parameter(kv[i].getKey(), kv[i].getValue()); - } - this.populate(parameters); - } - - public List update() { - return editorPane.update(); - } - - public KV[] updateKV() { - List list = this.update(); - int length = list.size(); - KV[] kv = new KV[length]; - for (int i = 0; i < length; i++) { - kv[i] = new KV(); - kv[i].setKey(list.get(i).getName()); - kv[i].setValue( list.get(i).getValue()); - } - return kv; - } - - protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"ProcessManager", "Parameter"}); - } - } - - @Override - /** - * 判断传进的对象是否是面板支持（能显示）的对象 - * @ob 需要展示的对象 - * @return 是否是支持的对象 - */ - public boolean accept(Object ob) { - return ob instanceof ProcessJSImpl; - } - - -} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java index b7ba350d7..570fcf5d9 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java @@ -12,7 +12,7 @@ import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.design.editor.editor.Editor; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ParameterProvider; import com.fr.stable.project.ProjectConstants; @@ -30,7 +30,7 @@ public class ProcessParameterTableModel extends UITableModelAdapter(); // 有序map // 单元格元素 - PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, Inter.getLocText("FR-Designer_Cell_Element"), + PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Element"), "cellelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); // 单元格属性 - PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, Inter.getLocText("FR-Designer_Cell_Attributes"), + PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Attributes"), "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); // 悬浮元素 - PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, Inter.getLocText("FR-Designer_Float_Element"), + PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Float_Element"), "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT}); // 控件设置 - PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, Inter.getLocText("FR-Designer-Widget_Settings"), + PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"), "widgetsettings", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.FORM, PropertyMode.POLY}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.FORM, PropertyMode.POLY_REPORT, PropertyMode.POLY_CHART}); // 条件属性 - PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, Inter.getLocText("FR-Designer_Condition_Attributes"), + PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes"), "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); // 超级链接 - PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, Inter.getLocText("FR-Designer_Hyperlink"), + PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"), "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); // 组件库 - PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, Inter.getLocText("FR-Designer_Widget_Library"), + PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Library"), "widgetlib", new PropertyMode[]{PropertyMode.FORM}, new PropertyMode[]{PropertyMode.FORM}); // 权限编辑 - PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, Inter.getLocText("FR-Designer_Permissions_Edition"), + PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Permissions_Edition"), "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED}, new PropertyMode[]{PropertyMode.AUTHORITY_EDITION}); // 已配置角色 - PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, Inter.getLocText("FR-Designer_Configured_Roles"), + PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Configured_Roles"), "configuredroles", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED}, new PropertyMode[]{PropertyMode.AUTHORITY_EDITION}); @@ -1028,7 +1028,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { initListener(); this.setVisible(true); - defaultPane = getDefaultPane(Inter.getLocText("FR-Designer_No_Settings_Available")); + defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); } public void showDefaultPane() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java b/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java index 8a0ad05a4..3ed4bba8a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JFormSliderPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -134,7 +134,7 @@ public class JFormSliderPane extends JPanel { slider.setPreferredSize(new Dimension(220, 20)); //去掉虚线框 slider.setFocusable(false); - slider.setToolTipText(Inter.getLocText("FR-Designer_Scale_Slider")); + slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider")); } private void initShowValSpinner() { @@ -156,7 +156,7 @@ public class JFormSliderPane extends JPanel { }; downButton.setOpaque(false); downButton.setBorderPainted(false); - downButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Down")); + downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down")); upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) { public Point getToolTipLocation(MouseEvent event) { return new Point(event.getX(), event.getY() - TOOLTIP_Y); @@ -164,7 +164,7 @@ public class JFormSliderPane extends JPanel { }; upButton.setOpaque(false); upButton.setBorderPainted(false); - upButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Up")); + upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up")); downButton.setActionCommand("less"); upButton.setActionCommand("more"); downButton.addActionListener(buttonActionListener); @@ -177,7 +177,7 @@ public class JFormSliderPane extends JPanel { showValButton.setBorderPainted(false); showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH)); showValButton.addActionListener(showValButtonActionListener); - showValButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Grade")); + showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade")); } private void initUIRadioButton() { @@ -186,9 +186,9 @@ public class JFormSliderPane extends JPanel { sevenFiveButton = new UIRadioButton("75%"); fiveTenButton = new UIRadioButton("50%"); twoFiveButton = new UIRadioButton("25%"); - selfAdaptButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_selfAdaptButton")); + selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton")); selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); - customButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_customButton")); + customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton")); customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); twoHundredButton.addItemListener(radioButtonItemListener); oneHundredButton.addItemListener(radioButtonItemListener); @@ -223,7 +223,7 @@ public class JFormSliderPane extends JPanel { double f = TableLayout.FILL; double[] columnSize = {p, f}; double[] rowSize = {p, p, p, p, p, p, p, p}; - UILabel upLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Scale_EnlargeOrReduce")); + UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce")); upLabel.setOpaque(false); JPanel septPane = new JPanel(new BorderLayout()); JSeparator sept = new JSeparator(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java b/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java index 19673fc34..239a02f7f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JSliderPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.ButtonGroup; @@ -140,7 +140,7 @@ public class JSliderPane extends JPanel { slider.setPreferredSize(new Dimension(220, 20)); //去掉虚线框 slider.setFocusable(false); - slider.setToolTipText(Inter.getLocText("FR-Designer_Scale_Slider")); + slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider")); } private void initShowValSpinner() { @@ -163,7 +163,7 @@ public class JSliderPane extends JPanel { }; downButton.setOpaque(false); downButton.setBorderPainted(false); - downButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Down")); + downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down")); upButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/data/source/normalUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png"), BaseUtils.readIcon("com/fr/design/images/data/source/hoverUp20.png")) { public Point getToolTipLocation(MouseEvent event) { return new Point(event.getX(), event.getY() - TOOLTIP_Y); @@ -171,7 +171,7 @@ public class JSliderPane extends JPanel { }; upButton.setOpaque(false); upButton.setBorderPainted(false); - upButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Up")); + upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up")); downButton.setActionCommand("less"); upButton.setActionCommand("more"); downButton.addActionListener(buttonActionListener); @@ -184,7 +184,7 @@ public class JSliderPane extends JPanel { showValButton.setBorderPainted(false); showValButton.setPreferredSize(new Dimension(SHOWVALBUTTON_WIDTH, SHOWVALBUTTON_HEIGHTH)); showValButton.addActionListener(showValButtonActionListener); - showValButton.setToolTipText(Inter.getLocText("FR-Designer_Scale_Grade")); + showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade")); } private void initUIRadioButton() { @@ -193,9 +193,9 @@ public class JSliderPane extends JPanel { sevenFiveButton = new UIRadioButton("75%"); fiveTenButton = new UIRadioButton("50%"); twoFiveButton = new UIRadioButton("25%"); - selfAdaptButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_selfAdaptButton")); + selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton")); selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); - customButton = new UIRadioButton(Inter.getLocText("FR-Designer_Scale_customButton")); + customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton")); customButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); twoHundredButton.addItemListener(radioButtonItemListener); oneHundredButton.addItemListener(radioButtonItemListener); @@ -230,7 +230,7 @@ public class JSliderPane extends JPanel { double f = TableLayout.FILL; double[] columnSize = {p, f}; double[] rowSize = {p, p, p, p, p, p, p, p, p}; - UILabel upLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Scale_EnlargeOrReduce")); + UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce")); upLabel.setOpaque(false); JPanel septPane = new JPanel(new BorderLayout()); JSeparator sept = new JSeparator(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index c683488e8..eb1e44c05 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -44,7 +44,7 @@ import com.fr.file.MemFILE; import com.fr.form.ui.NoneWidget; import com.fr.form.ui.Widget; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.report.cell.Elem; import com.fr.report.cell.cellattr.CellImage; @@ -514,8 +514,8 @@ public abstract class JTemplate> // if (FRContext.getCommonOperator() != null && !FRContext.getCommonOperator().testServerConnectionWithOutShowMessagePane()) { // //连接不成功，提示 // JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), -// Inter.getLocText(new String[]{"server_disconnected", "template_unsaved"}, new String[]{",", "!"}) -// , Inter.getLocText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE); +// com.fr.design.i18n.Toolkit.i18nText(new String[]{"server_disconnected", "template_unsaved"}, new String[]{",", "!"}) +// , com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE); // return false; // } // } catch (Exception e) { @@ -535,7 +535,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } collectInfo(); @@ -585,7 +585,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_No-Privilege") + "!", Inter.getLocText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No-Privilege") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } editingFILE = fileChooser.getSelectedFILE(); @@ -714,10 +714,10 @@ public abstract class JTemplate> */ @Override public MenuDef[] menus4Target() { - MenuDef tplMenu = new MenuDef(Inter.getLocText("FR-Designer_M-Template"), 'T'); + MenuDef tplMenu = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template"), 'T'); tplMenu.setAnchor(MenuHandler.TEMPLATE); if (!BaseUtils.isAuthorityEditing()) { - tplMenu.addShortCut(new NameSeparator(Inter.getLocText("FR-Designer_WorkBook"))); + tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WorkBook"))); tplMenu.addShortCut(new TableDataSourceAction(this)); tplMenu.addShortCut(shortcut4TemplateMenu()); } @@ -861,9 +861,9 @@ public abstract class JTemplate> public boolean isNewDesigner() { String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); if (isLowerThanHBB(xmlDesignerVersion)) { - String info = Inter.getLocText("FR-Designer_open-new-form-tip"); - String moreInfo = Inter.getLocText("FR-Designer_Server-version-tip-moreInfo"); - new InformationWarnPane(info, moreInfo, Inter.getLocText("FR-Designer_Tooltips")).show(); + String info = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_open-new-form-tip"); + String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo"); + new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show(); return true; } return false; @@ -877,11 +877,9 @@ public abstract class JTemplate> public boolean isOldDesigner() { String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); if (isHigherThanCurrent(xmlDesignerVersion)) { - String[] message = new String[]{"Server-version-info", "Above"}; - String[] sign = new String[]{StringUtils.parseVersion(xmlDesignerVersion)}; - String infor = Inter.getLocText(message, sign); - String moreInfo = Inter.getLocText("FR-Designer_Server-version-tip-moreInfo"); - new InformationWarnPane(infor, moreInfo, Inter.getLocText("FR-Designer_Tooltips")).show(); + String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion)); + String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo"); + new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show(); return true; } return false; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java b/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java index a25ed9c78..14c4d60a0 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/NoSupportAuthorityEdit.java @@ -4,7 +4,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel title = new UILabel(Inter.getLocText(new String[]{"DashBoard-Potence", "Edit"})) { + UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -40,7 +40,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { private JPanel createTextPane() { JPanel panel = new JPanel(new BorderLayout()); - UILabel uiLabel = new UILabel(Inter.getLocText("not_support_authority_edit")); + UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("not_support_authority_edit")); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); uiLabel.setVerticalAlignment(SwingConstants.CENTER); panel.add(uiLabel, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index 28af3e104..b569e054e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -15,7 +15,7 @@ import com.fr.design.utils.DesignUtils; import com.fr.env.EnvListPane; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.stable.EnvChangedListener; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; @@ -95,7 +95,7 @@ public class TemplatePane extends JPanel implements MouseListener { editButton.setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 10)); editButton.setMargin(null); editButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); - editButton.setToolTipText(Inter.getLocText("Env-Configure_Workspace")); + editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace")); this.add(new UILabel(" "), BorderLayout.WEST); this.add(editButton, BorderLayout.EAST); editButton.addActionListener(new ActionListener() { @@ -136,7 +136,7 @@ public class TemplatePane extends JPanel implements MouseListener { try { Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv); if (workspace == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"FR-Designer_M-SwitchWorkspace", "Failed"}), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } @@ -153,7 +153,7 @@ public class TemplatePane extends JPanel implements MouseListener { } setJLabel(selectedName); } catch (AuthException e) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java b/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java index eed559c9e..60421dcad 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/UndoStateEdit.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe; import com.fr.base.BaseUtils; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.undo.AbstractUndoableEdit; @@ -43,8 +43,8 @@ public class UndoStateEdit extends AbstractUndoableEdit { public void undo() throws CannotUndoException { super.undo(); if (cur.getAuthorityType() == BaseUndoState.AUTHORITY_STATE) { - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer-Undo_All_Authority_Operations") + "?", - Inter.getLocText("FR-Designer_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Undo_All_Authority_Operations") + "?", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Undo"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.NO_OPTION) { return; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java index e531d975f..93999b3ea 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java @@ -5,7 +5,7 @@ import com.fr.design.event.UIObserverListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.color.NewColorSelectPane; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -84,7 +84,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane { * @return 同上 */ public String title4PopupWindow() { - return Inter.getLocText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Color"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java index dc7fd9416..cfa9f0b75 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/GradientBackgroundQuickPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.background.gradient.GradientBar; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -39,7 +39,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { } private void constructPane(){ - String[] textArray = {Inter.getLocText("Utils-Left_to_Right"), Inter.getLocText("Utils-Top_to_Bottom")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")}; Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM}; directionPane = new UIButtonGroup(textArray, valueArray); directionPane.setSelectedIndex(0); @@ -52,7 +52,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { Component[][] components = new Component[][]{ new Component[]{gradientBar, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Gradient_Direction")), directionPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction")), directionPane} }; JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -116,7 +116,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java index 8076f4784..7f47fbae8 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.style.background.image.ImageFileChooser; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.JPanel; @@ -45,7 +45,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { public ImageBackgroundQuickPane(boolean hasImageLayout) { this.setLayout(new BorderLayout(0, 4)); - String[] nameArray = {Inter.getLocText("FR-Background_Image_Default"), Inter.getLocText("FR-Background_Image_Titled"), Inter.getLocText("FR-Background_Image_Extend"), Inter.getLocText("FR-Background_Image_Adjust")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Adjust")}; Byte[] valueArray = {Constants.IMAGE_CENTER, Constants.IMAGE_TILED, Constants.IMAGE_EXTEND, Constants.IMAGE_ADJUST}; imageLayoutPane = new UIButtonGroup(nameArray, valueArray); imageLayoutPane.setSelectedIndex(0); @@ -64,7 +64,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { this.add(contentPane, BorderLayout.CENTER); - UIButton selectPictureButton = new UIButton(Inter.getLocText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); selectPictureButton.addActionListener(selectPictureActionListener); if (hasImageLayout) { @@ -174,7 +174,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Background_Image"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImagePreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImagePreviewPane.java index a97699ff6..625f1b021 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImagePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImagePreviewPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.design.style.background.image.ImagePreviewer; import com.fr.general.ImageWithSuffix; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreGraphHelper; @@ -60,7 +60,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre public void paintComponent(Graphics g) { super.paintComponent(g); if (isLoading) { - g.drawString(Inter.getLocText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); return; } // draw image. diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java index ff4b0b590..2ec0aeb58 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.backgroundpane; import com.fr.design.event.UIObserverListener; import com.fr.general.Background; -import com.fr.general.Inter; + import java.awt.*; @@ -48,7 +48,7 @@ public class NullBackgroundQuickPane extends BackgroundQuickPane { * @return 名称 */ public String title4PopupWindow() { - return Inter.getLocText("Background-Null"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Null"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java index 4b51108bd..461a2e154 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorSelectBox; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -57,8 +57,8 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Foreground"), UILabel.LEFT), foregroundColorPane}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Foreground"), UILabel.LEFT), foregroundColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane}, }; double[] rowSize = {p, p, p}; double[] columnSize = {p, f}; @@ -213,7 +213,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Pattern"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java index fc0ae8f8a..8604fa516 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java @@ -8,7 +8,7 @@ import com.fr.design.event.UIObserverListener; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -150,15 +150,15 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane { TextureBackground.WOVEN_MAT_TEXTURE_PAINT, TextureBackground.WATER_DROPLETS_TEXTURE_PAINT, TextureBackground.PAPER_BAG_TEXTURE_PAINT, TextureBackground.FISH_FOSSIL_TEXTURE_PAINT, TextureBackground.SAND_TEXTURE_PAINT, TextureBackground.CORK_TEXTURE_PAINT, TextureBackground.WALNUT_TEXTURE_PAINT, TextureBackground.OAK_TEXTURE_PAINT, TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT}; - private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{Inter.getLocText("BackgroundTexture-Newsprint"), Inter.getLocText("BackgroundTexture-RecycledPaper"), - Inter.getLocText("BackgroundTexture-Parchment"), Inter.getLocText("BackgroundTexture-Stationery"), Inter.getLocText("BackgroundTexture-GreenMarble"), - Inter.getLocText("BackgroundTexture-WhiteMarble"), Inter.getLocText("BackgroundTexture-BrownMarble"), Inter.getLocText("BackgroundTexture-Granite"), - Inter.getLocText("BackgroundTexture-BlueTissuePaper"), Inter.getLocText("BackgroundTexture-PinkTissuePaper"), Inter.getLocText("BackgroundTexture-PurpleMesh"), - Inter.getLocText("BackgroundTexture-Bouquet"), Inter.getLocText("BackgroundTexture-Papyrus"), Inter.getLocText("BackgroundTexture-Canvas"), - Inter.getLocText("BackgroundTexture-Denim"), Inter.getLocText("BackgroundTexture-WovenMat"), Inter.getLocText("BackgroundTexture-WaterDroplets"), - Inter.getLocText("BackgroundTexture-PaperBag"), Inter.getLocText("BackgroundTexture-FishFossil"), Inter.getLocText("BackgroundTexture-Sand"), - Inter.getLocText("BackgroundTexture-Cork"), Inter.getLocText("BackgroundTexture-Walnut"), Inter.getLocText("BackgroundTexture-Oak"), - Inter.getLocText("BackgroundTexture-MediumWood")}; + private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")}; @Override public boolean accept(Background background) { @@ -167,7 +167,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index c724f3853..6e2865609 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -5,7 +5,7 @@ import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.log.Log4jConfig; import com.fr.log.FineLoggerFactory; import com.fr.third.apache.log4j.Level; @@ -60,7 +60,7 @@ public class DesignerLogHandler { public DesignerLogHandler() { logHandlerArea = new LogHandlerArea(); - caption = new LogHandlerBar(Inter.getLocText("FR-Designer_Log")); + caption = new LogHandlerBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Log")); caption.addClearListener(new ActionListener() { @@ -86,11 +86,11 @@ public class DesignerLogHandler { caption.clearMessage(); } }; - showInfo = new JCheckBoxMenuItem(Inter.getLocText(new String[]{"Display", "Normal", "Info"}), true); + showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true); showInfo.addItemListener(itemlistener); - showError = new JCheckBoxMenuItem(Inter.getLocText(new String[]{"Display", "Alert", "Info"}), true); + showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true); showError.addItemListener(itemlistener); - showServer = new JCheckBoxMenuItem(Inter.getLocText(new String[]{"Display", "Seriously", "Info"}), true); + showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true); showServer.addItemListener(itemlistener); caption.addSetListener(new ActionListener() { @@ -148,17 +148,17 @@ public class DesignerLogHandler { jTextArea.setBackground(Color.WHITE); popup = new JPopupMenu(); - selectAll = new UIMenuItem(Inter.getLocText("FR-Designer_Select_All")); + selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All")); selectAll.addActionListener(popupListener); selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png")); popup.add(selectAll); - copy = new UIMenuItem(Inter.getLocText("FR-Designer_Copy")); + copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Copy")); copy.addActionListener(popupListener); copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); popup.add(copy); - clear = new UIMenuItem(Inter.getLocText("FR-Designer_Clear_All")); + clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All")); clear.addActionListener(popupListener); clear.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/clear.png")); popup.add(clear); @@ -263,11 +263,11 @@ public class DesignerLogHandler { private String appendLocaleMark(String str, int style) { if (style == ERROR_INT) { - str = Inter.getLocText("FR-Designer_Alert") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert") + ":" + str + "\n"; } else if (style == WARN_INT) { - str = Inter.getLocText("FR-Designer_Seriously") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Seriously") + ":" + str + "\n"; } else { - str = Inter.getLocText("FR-Designer_Normal") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Normal") + ":" + str + "\n"; } return str; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java index 628c84fad..9eb7a6991 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBar.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.loghandler; import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; -import com.fr.general.Inter; + import com.fr.stable.script.Atom; import javax.swing.*; @@ -39,17 +39,17 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { clear.setMargin(null); clear.setOpaque(false); clear.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - clear.setToolTipText(Inter.getLocText("FR-Designer_Clear_All")); + clear.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All")); selectedall = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/selectedall.png")); selectedall.setMargin(null); selectedall.setOpaque(false); selectedall.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - selectedall.setToolTipText(Inter.getLocText("FR-Designer_Select_All")); + selectedall.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All")); set = new UIButton(BaseUtils.readIcon("com/fr/design/images/log/setting.png")); set.setMargin(null); set.setOpaque(false); set.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - set.setToolTipText(Inter.getLocText("FR-Designer_Set")); + set.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); this.add(clear); this.add(selectedall); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java index 72d33dc66..4c16af933 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java @@ -14,7 +14,7 @@ import java.awt.event.MouseListener; import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; -import com.fr.general.Inter; + public class LogHandlerBarUI extends ComponentUI implements MouseListener, FocusListener { private static final Color DEFAULT_FOREGROUND = new Color(0, 0, 0); @@ -100,9 +100,9 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus g.drawString(button.getText(), textLeadingGap, y); } - g.drawString(Inter.getLocText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y); - g.drawString(Inter.getLocText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); - g.drawString(Inter.getLocText("Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); } /** diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java index 8f6034f77..dd76e2a71 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogMessageBar.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.loghandler; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import javax.swing.JFrame; import javax.swing.JPanel; @@ -56,7 +56,7 @@ public class LogMessageBar extends JPanel { if (message == null) { return; } - messageLabel.setText(Inter.getLocText("Log") + " | " + message); + messageLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Log") + " | " + message); repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index cd684a616..fcf8b7ddc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -50,7 +50,7 @@ import com.fr.design.remote.action.RemoteDesignAuthorityManagerAction; import com.fr.design.utils.ThemeUtils; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginRuntime; import com.fr.plugin.manage.PluginFilter; @@ -320,7 +320,7 @@ public abstract class ToolBarMenuDock { } public MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { - MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_File"), 'F'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F'); ShortCut[] scs = new ShortCut[0]; if (!BaseUtils.isAuthorityEditing()) { @@ -394,7 +394,7 @@ public abstract class ToolBarMenuDock { } protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) { - MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Server"), 'S'); if (!BaseUtils.isAuthorityEditing()) { menuDef.addShortCut( @@ -482,7 +482,7 @@ public abstract class ToolBarMenuDock { } public MenuDef createHelpMenuDef() { - MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); for (ShortCut shortCut : otherHelpShortCuts) { menuDef.addShortCut(shortCut); @@ -492,7 +492,7 @@ public abstract class ToolBarMenuDock { } public MenuDef createCommunityMenuDef() { - MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); for (ShortCut shortCut : otherCommunityShortCuts) { menuDef.addShortCut(shortCut); @@ -534,7 +534,7 @@ public abstract class ToolBarMenuDock { return toolBar; } else { - return polyToolBar(Inter.getLocText("FR-Designer_Polyblock_Edit")); + return polyToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Polyblock_Edit")); } } @@ -549,7 +549,7 @@ public abstract class ToolBarMenuDock { }; UILabel uiLabel = new UILabel(text); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(Inter.getLocText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java index d69f4c282..e821f3452 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -56,14 +56,14 @@ public class BasicPropertyPane extends BasicPane { } } }; - widgetName.setGlobalName(Inter.getLocText("FR-Designer_Basic")); + widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p}; double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Name")), widgetName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Name")), widgetName}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java index 7a0e1bb06..7405eaf5f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.widget.accessibles; import com.fr.design.dialog.BasicPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.general.cardtag.BannerTemplateStyle; import com.fr.general.cardtag.BookMarkTemplateStyle; import com.fr.general.cardtag.CardTemplateStyle; @@ -54,7 +54,7 @@ public class TemplateStylePane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); westPane.setPreferredSize(new Dimension(100, 500)); centerPane.setPreferredSize(new Dimension(300, 500)); - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null)); centerPane.add(previewPane); styleList.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { @@ -79,7 +79,7 @@ public class TemplateStylePane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Tab_Style_Template"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template"); } public void populate(TemplateStyle templateStyle) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java index 193ce6932..790841dea 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java @@ -18,7 +18,7 @@ import com.fr.design.gui.icombobox.LazyComboBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.editor.editor.Editor; import com.fr.form.data.DataBinding; -import com.fr.general.Inter; + /** * DataBindingEditor @@ -58,7 +58,7 @@ public class DataBindingEditor extends Editor { public DataBindingEditor() { this.initCompontents(); - this.setName(Inter.getLocText("FR-Designer_Widget_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Field")); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java index 83caea5bc..fac44a5bc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java @@ -11,7 +11,7 @@ import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.editor.editor.Editor; import com.fr.form.data.DataTableConfig; -import com.fr.general.Inter; + import java.awt.*; import java.awt.event.ItemEvent; @@ -24,7 +24,7 @@ public class DataTableEditor extends Editor { public DataTableEditor() { this.initCompontents(); - this.setName(Inter.getLocText("FieldBinding")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding")); } private void initCompontents() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/FormattedEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/FormattedEditor.java index 628e1bf1c..0e506490d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/FormattedEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/FormattedEditor.java @@ -13,7 +13,7 @@ import javax.swing.JPanel; import com.fr.design.Exception.ValidationException; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + /** * @author richer @@ -70,7 +70,7 @@ public class FormattedEditor extends AbstractPropertyEditor { try { format.parseObject(textField.getText()); } catch (ParseException ex) { - throw new ValidationException(Inter.getLocText("Format-Error") + "!"); + throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Format-Error") + "!"); } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index 3e9d2c857..f7ba64bfc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -21,7 +21,7 @@ import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.editor.editor.TextEditor; import com.fr.form.ui.DataControl; import com.fr.form.ui.WidgetValue; -import com.fr.general.Inter; + public class WidgetValueEditor extends AbstractPropertyEditor { @@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(Inter.getLocText("Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: @@ -47,7 +47,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_BOOLEAN: return new BooleanEditor(false); case DataControl.TYPE_DATE: - return new DateEditor(true, Inter.getLocText("Date")); + return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date")); case DataControl.TYPE_TABLEDATA: return onlyServer ? new ServerDataTableEditor() : new DataTableEditor(); default: diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 78b3eace2..815495bd2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -3,7 +3,7 @@ */ package com.fr.design.mainframe.widget.wrappers; -import com.fr.general.Inter; + import com.fr.base.background.ColorBackground; import com.fr.base.background.GradientBackground; import com.fr.base.background.ImageFileBackground; @@ -25,17 +25,17 @@ public class BackgroundWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v instanceof ColorBackground) { - return Inter.getLocText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Color"); } else if (v instanceof TextureBackground) { - return Inter.getLocText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); } else if (v instanceof PatternBackground) { - return Inter.getLocText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); } else if (v instanceof ImageFileBackground) { - return Inter.getLocText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Image"); } else if (v instanceof GradientBackground) { - return Inter.getLocText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } else { - return Inter.getLocText("None"); + return com.fr.design.i18n.Toolkit.i18nText("None"); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java index 1127c2503..d0c38fe92 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/TreeModelWrapper.java @@ -6,7 +6,7 @@ import com.fr.data.impl.TreeNodeWrapper; import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.StringUtils; @@ -18,14 +18,14 @@ public class TreeModelWrapper implements Encoder, Decoder { return StringUtils.EMPTY; } if (v instanceof TreeNodeAttr[]) { - return TemplateUtils.render(Inter.getLocText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""}); + return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""}); } else if (v instanceof TreeNodeWrapper) { TreeNodeAttr[] treeNodeAttrs = ((TreeNodeWrapper) v).getTreeNodeAttrs(); - return TemplateUtils.render(Inter.getLocText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""}); + return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""}); } else if (v instanceof NameObject) { - return Inter.getLocText("FR-Designer_DataTable-Build"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build"); } else { - return Inter.getLocText("FR-Designer_Auto-Build"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto-Build"); } } diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index e95b51e95..0a7389537 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -6,7 +6,7 @@ package com.fr.design.menu; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.KeyEvent; @@ -33,7 +33,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Open_Report"); + return com.fr.design.i18n.Toolkit.i18nText("M-Open_Report"); } @Override @@ -51,7 +51,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Open_Recent"); + return com.fr.design.i18n.Toolkit.i18nText("M-Open_Recent"); } @Override @@ -68,7 +68,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Close"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); } @Override @@ -85,7 +85,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Save"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Save"); } @Override @@ -102,7 +102,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Save_As"); + return com.fr.design.i18n.Toolkit.i18nText("M-Save_As"); } @Override @@ -119,7 +119,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Edit-Undo"); + return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Undo"); } @Override @@ -136,7 +136,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Edit-Redo"); + return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Redo"); } @Override @@ -153,7 +153,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Export"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export"); } @Override @@ -170,7 +170,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-Excel"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Excel"); } @Override @@ -188,7 +188,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Engine_Export-Excel-Page"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-Page"); } @Override @@ -206,7 +206,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Engine_Export-Excel-Simple"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-Simple"); } @Override @@ -224,7 +224,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Engine_Export-Excel-PageToSheet"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-PageToSheet"); } @Override @@ -241,7 +241,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-PDF"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-PDF"); } @Override @@ -259,7 +259,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-Word"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Word"); } @Override @@ -277,7 +277,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-SVG"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-SVG"); } @Override @@ -295,7 +295,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-CSV"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-CSV"); } @Override @@ -313,7 +313,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-Export-Text"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Text"); } @Override @@ -331,7 +331,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_File-ExportT-Template(embedded_data)"); + return com.fr.design.i18n.Toolkit.i18nText("M_File-ExportT-Template(embedded_data)"); } @Override @@ -341,58 +341,6 @@ public class KeySetUtils { }; - - public static final MenuKeySet IMAGE_EXPORT = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'M'; - } - - @Override - public String getMenuName() { - return Inter.getLocText(new String[]{"Image","Format"}); - } - - @Override - public KeyStroke getKeyStroke() { - return KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER); - } - }; - - public static final MenuKeySet EXPORT_CHART = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'E'; - } - - @Override - public String getMenuName() { - return Inter.getLocText("FR-Designer_ExportAndOutput"); - } - - @Override - public KeyStroke getKeyStroke() { - return KeyStroke.getKeyStroke(KeyEvent.VK_E, DEFAULT_MODIFIER); - } - }; - - public static final MenuKeySet EXCEL_EXPORT_CHART = new MenuKeySet() { - @Override - public char getMnemonic() { - return 'E'; - } - - @Override - public String getMenuName() { - return "EXCEL" + Inter.getLocText("FR-Designer_ExportAndOutput"); - } - - @Override - public KeyStroke getKeyStroke() { - return KeyStroke.getKeyStroke(KeyEvent.VK_E, DEFAULT_MODIFIER); - } - }; - public static final MenuKeySet PREFERENCE = new MenuKeySet() { @Override public char getMnemonic() { @@ -401,7 +349,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Window-Preference"); + return com.fr.design.i18n.Toolkit.i18nText("M_Window-Preference"); } @Override @@ -418,7 +366,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_M-SwitchWorkspace"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-SwitchWorkspace"); } @Override @@ -435,7 +383,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_M-Exit"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Exit"); } @Override @@ -453,7 +401,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_M-Template"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template"); } @Override @@ -471,7 +419,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); } @Override @@ -488,7 +436,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Report-Web_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Report-Web_Attributes"); } @Override @@ -506,7 +454,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("ReportD-Excel_Export"); + return com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"); } @Override @@ -523,7 +471,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Parameter"); } @Override @@ -541,7 +489,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M-Page_Setup"); + return com.fr.design.i18n.Toolkit.i18nText("M-Page_Setup"); } @Override @@ -558,7 +506,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Header"); + return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Header"); } @Override @@ -575,7 +523,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Footer"); + return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Footer"); } @Override @@ -592,7 +540,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Fine-Designer_Report_Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Report_Background"); } @Override @@ -607,7 +555,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_WaterMark"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"); } @Override @@ -625,7 +573,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Report-Write_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Report-Write_Attributes"); } @Override @@ -642,7 +590,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Columns"); + return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Columns"); } @Override @@ -659,7 +607,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_ReportColumns-Columns"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ReportColumns-Columns"); } @Override @@ -677,7 +625,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_M-Repeat-Freeze"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Repeat-Freeze"); } @Override @@ -695,7 +643,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Engine_Frozen"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Frozen"); } @Override @@ -713,7 +661,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText(new String[]{"Report_Engine", "Attribute"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Attribute"); } @Override @@ -730,14 +678,7 @@ public class KeySetUtils { @Override public String getMenuName() { - - // mod by anchore 16/11/16 - if (ComparatorUtils.equals(Locale.JAPAN, GeneralContext.getLocale())) { - return Inter.getLocText(new String[]{"FR-Engine_RP_Authority_Edit", "Allow"}); - } else { - return Inter.getLocText(new String[]{"Allow", "FR-Engine_RP_Authority_Edit"}); - } - //return Inter.getLocText(new String[]{"Allow", "DashBoard-Potence", "Edit"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status"); } @Override @@ -754,7 +695,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); } @Override @@ -771,7 +712,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Expand"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Expand"); } @Override @@ -788,7 +729,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Widget-Settings"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Settings"); } @Override @@ -805,7 +746,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Format-Style"); + return com.fr.design.i18n.Toolkit.i18nText("M_Format-Style"); } @Override @@ -822,7 +763,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes"); } @Override @@ -839,7 +780,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Chart-Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"); } @Override @@ -856,7 +797,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Format-Data_Map"); + return com.fr.design.i18n.Toolkit.i18nText("M_Format-Data_Map"); } @Override @@ -873,7 +814,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); } @Override @@ -890,7 +831,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Insert-Barcode"); + return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"); } @Override @@ -907,7 +848,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Currency_Line"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Currency_Line"); } @Override @@ -925,7 +866,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("Present-No_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"); } @Override @@ -942,7 +883,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Insert-Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"); } @Override @@ -959,7 +900,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Edit-Merge_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Merge_Cell"); } @Override @@ -976,7 +917,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Edit-Unmerge_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Unmerge_Cell"); } @Override @@ -993,7 +934,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Other"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"); } @Override @@ -1010,7 +951,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Insert-Cell"); + return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Cell"); } @Override @@ -1027,7 +968,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Insert-Data_Column"); + return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Data_Column"); } @Override @@ -1053,7 +994,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Insert-Float"); + return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java index ac168e7f0..b243b10bc 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java @@ -8,7 +8,6 @@ import com.fr.design.gui.controlpane.NameableSelfCreator; import com.fr.design.gui.controlpane.UnrepeatedNameHelper; import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -36,10 +35,8 @@ public class ParameterArrayPane extends JListControlPane { allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { - String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"}; - String[] sign = new String[]{",", "!"}; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), Inter.getLocText(warning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name")); setWarnigText(editingIndex); return; } @@ -47,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane { && isNameRepeted(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) { nameableList.stopEditing(); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), - Inter.getLocText(new String[]{"parameter_name_exist", "Please_Rename"}, new String[]{",", "!"})); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name")); setWarnigText(editingIndex); } } @@ -57,7 +54,7 @@ public class ParameterArrayPane extends JListControlPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Engine_Schedule-Template_Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Schedule-Template_Parameter"); } /** @@ -67,7 +64,7 @@ public class ParameterArrayPane extends JListControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameableSelfCreator(Inter.getLocText("FR-Engine_Parameter_Name"), Parameter.class, ParameterPane.class) { + new NameableSelfCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter_Name"), Parameter.class, ParameterPane.class) { public Parameter createNameable(UnrepeatedNameHelper helper) { // 返回参数设置面板. return new Parameter(helper.createUnrepeatedName("p")); diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java index 72a3edbf8..5b080b618 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java @@ -19,7 +19,7 @@ import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.editor.editor.TextEditor; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; @@ -66,7 +66,7 @@ public class ParameterInputPane extends BasicPane { //Content Pane. JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); this.add(new JScrollPane(contentPane), BorderLayout.CENTER); - contentPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Parameters") + ":")); + contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Parameters") + ":")); FlowTableLayoutHelper flowTableLayoutHelper = new FlowTableLayoutHelper(); @@ -120,7 +120,7 @@ public class ParameterInputPane extends BasicPane { } else if (pv instanceof Float) { editors[0] = new FloatEditor(); } else if (pv instanceof Date) { - editors[0] = new DateEditor(true, Inter.getLocText("Date")); + editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date")); } else if (pv instanceof Boolean) { editors[0] = new BooleanEditor(); } else if (pv instanceof BaseFormula) { @@ -133,7 +133,7 @@ public class ParameterInputPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Parameters"); } /** @@ -168,7 +168,7 @@ public class ParameterInputPane extends BasicPane { Object editorStringValue = editor.update(); if (editorStringValue == null || StringUtils.isEmpty(Utils.objectToString(editorStringValue))) { valid = false; - error += parameterName + Inter.getLocText("NOT_NULL_Des") + "\n"; + error += parameterName + com.fr.design.i18n.Toolkit.i18nText("NOT_NULL_Des") + "\n"; } } if (!valid) { diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterManagerPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterManagerPane.java index a6c9e7f83..5a8407e8d 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterManagerPane.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -24,7 +24,7 @@ public class ParameterManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("M_Server-Global_Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"); } public void populate(Parameter[] parameters) { diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java index 32e275482..3109b3b31 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.editor.ValueEditorPane; import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.general.Inter; + public class ParameterPane extends BasicBeanPane { /* @@ -46,8 +46,8 @@ public class ParameterPane extends BasicBeanPane { // richer:要排列显示的控件 Component[][] components = {{null}, - { null, new UILabel(Inter.getLocText("Name") + ":"),textFieldPanel }, - { null, new UILabel(Inter.getLocText("Utils-Default_Value") + ":"),valueEditor } + { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":"),textFieldPanel }, + { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Default_Value") + ":"),valueEditor } }; double p =TableLayout.PREFERRED; double f =TableLayout.FILL; @@ -65,7 +65,7 @@ public class ParameterPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Parameter"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java b/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java index cde29cb34..ed7585675 100644 --- a/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java +++ b/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java @@ -6,7 +6,7 @@ import java.awt.event.ItemListener; import com.fr.base.present.DictPresent; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.present.dict.DictionaryPane; -import com.fr.general.Inter; + /** * @@ -24,7 +24,7 @@ public class DictPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java b/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java index 1aec902e9..a289a9000 100644 --- a/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java +++ b/designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java @@ -6,7 +6,7 @@ import com.fr.base.present.FormulaPresent; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + public class FormulaPresentPane extends FurtherBasicBeanPane { private TinyFormulaPane tinyFormulaPane; @@ -23,7 +23,7 @@ public class FormulaPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/NonePresentPane.java b/designer-base/src/main/java/com/fr/design/present/NonePresentPane.java index 4b89afc3d..09a2c7cc3 100644 --- a/designer-base/src/main/java/com/fr/design/present/NonePresentPane.java +++ b/designer-base/src/main/java/com/fr/design/present/NonePresentPane.java @@ -2,7 +2,7 @@ package com.fr.design.present; import com.fr.base.present.Present; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.general.Inter; + /** * @@ -18,7 +18,7 @@ public class NonePresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Present-No_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"); } public void reset() { diff --git a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java index 55174d578..33a49c311 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java @@ -11,12 +11,12 @@ import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; public class CustomDictPane extends FurtherBasicBeanPane { private static final long serialVersionUID = 1L; - private String[] columnNames = {Inter.getLocText("Actual_Value"), Inter.getLocText("Display_Value")}; // 字典列名key,value + private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; // 字典列名key,value private CustomDictCorrelationPane correlationPane; @@ -72,7 +72,7 @@ public class CustomDictPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Datasource-User_Defined"); + return com.fr.design.i18n.Toolkit.i18nText("Datasource-User_Defined"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java index 96af997b9..484b90060 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java @@ -23,7 +23,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -61,7 +61,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i private void initBasicComponet() { // keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Engine_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula")); formulaEditor.setEnabled(true); // valueDictPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); valueDictPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); @@ -77,8 +77,8 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Actual_Value"), UILabel.LEFT), keyColumnPane}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value"), UILabel.LEFT), valueDictPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value"), UILabel.LEFT), keyColumnPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueDictPane} }; JPanel dbDictPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, GAP_HUGER, LayoutConstants.VGAP_LARGE); this.setLayout(new BorderLayout(0, 4)); @@ -116,7 +116,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i * */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Datasource_From_Database"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource_From_Database"); } public void populateBean(DatabaseDictionary dbDict) { @@ -224,7 +224,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane i String columnNameValue = columnNames.length > 0 ? columnNames[0] : StringUtils.EMPTY; keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNameValue); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Engine_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula")); formulaEditor.setEnabled(true); formulaEditor.addChangeListener(new ChangeListener() { diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java index 6b73e2a56..341f0b907 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -34,7 +34,7 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr int[][] rowCount = {{1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Type_Set"), UILabel.LEFT), jcb}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type_Set"), UILabel.LEFT), jcb}, new Component[]{null, null} }; JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_HUGER, LayoutConstants.VGAP_MEDIUM); @@ -44,7 +44,7 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java index 1246d1845..49cf5765d 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java @@ -9,7 +9,7 @@ import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -46,7 +46,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane { double[] rowSize = {p, p, p}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - UILabel tag = new UILabel(Inter.getLocText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); + UILabel tag = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); tag.setForeground(new Color(143, 143, 146)); tag.setPreferredSize(new Dimension(225, 80)); JPanel t = new JPanel(new BorderLayout()); @@ -63,8 +63,8 @@ public class FormulaDictPane extends FurtherBasicBeanPane { Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Actual_Value"), UILabel.LEFT), keyFormulaContainer}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value"), UILabel.LEFT), valueFormulaContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value"), UILabel.LEFT), keyFormulaContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueFormulaContainer}, new Component[]{tag, null} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE); @@ -81,7 +81,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Formula"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java index 343de54d4..712399a40 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java @@ -30,7 +30,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -88,7 +88,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane }); // keyColumnPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); keyColumnPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); // valueDictPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); valueDictPane = new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); @@ -107,9 +107,9 @@ public class TableDataDictPane extends FurtherBasicBeanPane firstLine.add(new PreviewLabel(this), BorderLayout.EAST); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_DS_TableData") + " ", UILabel.LEFT), firstLine}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Actual_Value") + " ", UILabel.LEFT), keyColumnPane}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS_TableData") + " ", UILabel.LEFT), firstLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value") + " ", UILabel.LEFT), keyColumnPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM); @@ -149,7 +149,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane * @return 返回是窗口显示的标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Dic_Data_Query"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dic_Data_Query"); } private void tdChange(final ItemEvent e) { @@ -171,7 +171,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane columnIndexEditor1.addItemListener(itemListener); keyColumnPane.setEditors(new Editor[]{columnNameEditor1, columnIndexEditor1}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); formulaEditor.setEnabled(true); formulaEditor.addChangeListener(new ChangeListener() { @@ -252,14 +252,14 @@ public class TableDataDictPane extends FurtherBasicBeanPane TableDataSource dataSource = DesignTableDataManager.getEditingTableDataSource(); if (dataSource != null) { for (int i = BEGIN; i < END; i++) { - TableData td = dataSource.getTableData(Inter.getLocText("FR-Designer_Dictionary_Dynamic_SQL") + i); + TableData td = dataSource.getTableData(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i); if (td == null) { - name = Inter.getLocText("FR-Designer_Dictionary_Dynamic_SQL") + i; - dataSource.putTableData(Inter.getLocText("FR-Designer_Dictionary_Dynamic_SQL") + i, db); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i; + dataSource.putTableData(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i, db); break; } else { if (ComparatorUtils.equals(td, db)) { - name = Inter.getLocText("FR-Designer_Dictionary_Dynamic_SQL") + i; + name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i; break; } else { continue; diff --git a/designer-base/src/main/java/com/fr/design/preview/PagePreview.java b/designer-base/src/main/java/com/fr/design/preview/PagePreview.java index 01f5fbad9..824de4bb5 100644 --- a/designer-base/src/main/java/com/fr/design/preview/PagePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/PagePreview.java @@ -2,7 +2,7 @@ package com.fr.design.preview; import com.fr.base.io.IOFile; import com.fr.design.fun.impl.AbstractPreviewProvider; -import com.fr.general.Inter; + /** * @author richie @@ -12,7 +12,7 @@ import com.fr.general.Inter; public class PagePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return Inter.getLocText("M-Page_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java b/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java index aa2c2ac06..7cd781760 100644 --- a/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/ViewPreview.java @@ -2,7 +2,7 @@ package com.fr.design.preview; import com.fr.base.io.IOFile; import com.fr.design.fun.impl.AbstractPreviewProvider; -import com.fr.general.Inter; + import java.util.HashMap; import java.util.Map; @@ -15,7 +15,7 @@ import java.util.Map; public class ViewPreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return Inter.getLocText("M-Data_Analysis"); + return com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java b/designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java index 8dc18b57d..f68809cbe 100644 --- a/designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/WriteEnhancePreview.java @@ -2,7 +2,7 @@ package com.fr.design.preview; import com.fr.base.io.IOFile; import com.fr.design.fun.impl.AbstractPreviewProvider; -import com.fr.general.Inter; + import java.util.HashMap; import java.util.Map; @@ -13,7 +13,7 @@ import java.util.Map; public class WriteEnhancePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return Inter.getLocText("FR-Designer_Write_Enhance_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write_Enhance_Preview"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/preview/WritePreview.java b/designer-base/src/main/java/com/fr/design/preview/WritePreview.java index 24b272987..6c1d6192a 100644 --- a/designer-base/src/main/java/com/fr/design/preview/WritePreview.java +++ b/designer-base/src/main/java/com/fr/design/preview/WritePreview.java @@ -2,7 +2,7 @@ package com.fr.design.preview; import com.fr.base.io.IOFile; import com.fr.design.fun.impl.AbstractPreviewProvider; -import com.fr.general.Inter; + import java.util.HashMap; import java.util.Map; @@ -15,7 +15,7 @@ import java.util.Map; public class WritePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return Inter.getLocText("M-Write_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("M-Write_Preview"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java index c0834af22..05775c4de 100644 --- a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java @@ -7,7 +7,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.remote.ui.AuthorityManagerPane; import com.fr.workspace.server.authority.AuthorityOperator; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.report.DesignAuthority; import com.fr.workspace.WorkContext; @@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction { public RemoteDesignAuthorityManagerAction() { - this.setName(Inter.getLocText("Fine-Designer_Remote_Design_Authority_Manager")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager")); this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png")); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java index 7564ae35e..991aadbd5 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.remote.ui.tree.FileAuthorityTree; import com.fr.file.filetree.FileNode; import com.fr.file.filetree.IOFileNodeFilter; -import com.fr.general.Inter; + import com.fr.report.DesignAuthority; import com.fr.stable.CoreConstants; @@ -31,7 +31,7 @@ public class AuthorityEditorPane extends BasicBeanPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 6, 6), UITitledBorder.createBorderWithTitle( - Inter.getLocText("Fine-Designer_Remote_Design_Template_Authority_Config") + com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Template_Authority_Config") ) ) ); @@ -45,7 +45,7 @@ public class AuthorityEditorPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Fine-Designer_Remote_Design_Configure_Authority"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Configure_Authority"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index 40bd04022..db94bea69 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -19,7 +19,7 @@ import com.fr.design.remote.ui.list.AuthorityList; import com.fr.design.remote.ui.list.AuthorityListCellRenderer; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.report.DesignAuthority; import com.fr.stable.ArrayUtils; @@ -78,7 +78,7 @@ public class AuthorityListControlPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.authorityCreators = new RemoteDesignAuthorityCreator[]{ new RemoteDesignAuthorityCreator( - Inter.getLocText("Fine-Designer_Remote_Design_User"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_User"), BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"), DesignAuthority.class, AuthorityEditorPane.class) @@ -470,7 +470,7 @@ public class AuthorityListControlPane extends BasicPane { private class AddItemUpdateAction extends UpdateAction { AddItemUpdateAction() { - this.setName(Inter.getLocText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -511,7 +511,7 @@ public class AuthorityListControlPane extends BasicPane { */ private class RemoveItemAction extends UpdateAction { RemoveItemAction() { - this.setName(Inter.getLocText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java index f7063e114..8cc139cc3 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java @@ -1,7 +1,7 @@ package com.fr.design.remote.ui; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.report.DesignAuthority; import javax.swing.BorderFactory; @@ -23,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Fine-Designer_Remote_Design_Authority_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager"); } public void populate(DesignAuthority[] authorities) { diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java index 6d66e3d31..83b42499b 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java +++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.NewColorSelectPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JComponent; @@ -56,7 +56,7 @@ public class WatermarkPane extends BasicPane { // 预览 JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); contentPane.add(leftPane, BorderLayout.CENTER); - leftPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Preview"), null)); + leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); JPanel previewPaneWrapper = FRGUIPaneFactory.createBorderLayout_S_Pane(); leftPane.add(previewPaneWrapper, BorderLayout.CENTER); previewPaneWrapper.setBorder(BorderFactory.createEmptyBorder(2, 8, 4, 8)); @@ -103,21 +103,21 @@ public class WatermarkPane extends BasicPane { colorPane = new NewColorSelectPane(); JPanel colorLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - colorLabelPane.add(new UILabel(Inter.getLocText("FR-Designer_Text_Color")), BorderLayout.NORTH); + colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text_Color")), BorderLayout.NORTH); double p = TableLayout.PREFERRED; double[] rowSize = {p,p,p}; double[] columnSize = { p, MAX_WIDTH}; JPanel rightContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(Inter.getLocText("FR-Designer_Watermark_Text")), formulaPane}, - {new UILabel(Inter.getLocText("FR-Designer_Font_Size")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Watermark_Text")), formulaPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font_Size")), fontSizeTypePane}, {colorLabelPane, colorPane}, }, rowSize, columnSize, 10); rightContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); UIScrollPane configPane = new UIScrollPane(rightContentPane); - configPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Config"),null)); + configPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Config"),null)); return configPane; } @@ -168,6 +168,6 @@ public class WatermarkPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_WaterMark"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java index 8b406de1d..18ed104fe 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DockingView; import com.fr.design.menu.ToolBarDef; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -161,8 +161,8 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo */ private void checkChanges() { //如若有变化，则弹出下面的对话框 - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Role_changed_isRefresh") + "?", - Inter.getLocText("FR-Designer_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role_changed_isRefresh") + "?", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { roleTree.refreshTreeNode(); expandTree(roleTree, true); @@ -184,7 +184,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo private void initbuttonGroup() { Icon[] iconArray = new Icon[]{BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")}; - String[] textArray = new String[]{Inter.getLocText("FR-Designer_FS_Name")}; + String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Name")}; buttonGroup = new UIHeadGroup(iconArray, textArray) { public void tabChanged(int index) { roleTree.setEditable(false); @@ -277,7 +277,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // private class AddAction extends UpdateAction { // public AddAction() { -// this.setName(Inter.getLocText("Add")); +// this.setName(com.fr.design.i18n.Toolkit.i18nText("Add")); // this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); // } // @@ -288,7 +288,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // DefaultTreeModel treeModel = (DefaultTreeModel) roleTree.getModel(); // ExpandMutableTreeNode root = (ExpandMutableTreeNode) treeModel.getRoot(); // ExpandMutableTreeNode parentNode = (ExpandMutableTreeNode) root.getChildAt(0); -// String newName = Inter.getLocText("newNode") + (++newIndex); +// String newName = com.fr.design.i18n.Toolkit.i18nText("newNode") + (++newIndex); // parentNode.add(new ExpandMutableTreeNode(newName)); // op.addAction(newName); // roleTree.updateUI(); @@ -298,7 +298,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // AuthorityControlFilter pf = AuthorityRoleDAOManager.getAuthControlFilter(true); // // if (AuthorityRoleDAOManager.getAuthorityAllocation(pf, newName) != null) { -// newName = Inter.getLocText("newNode") + (++newIndex); +// newName = com.fr.design.i18n.Toolkit.i18nText("newNode") + (++newIndex); // roleTree.refreshTreeNode(); // expandTree(roleTree, true); // } @@ -316,7 +316,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // private class RemoveAction extends UpdateAction { // // public RemoveAction() { -// this.setName(Inter.getLocText("Remove")); +// this.setName(com.fr.design.i18n.Toolkit.i18nText("Remove")); // this.setSmallIcon(UIConstants.CLEAR_ICON); // } // @@ -330,8 +330,8 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // return; // } // -// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", -// Inter.getLocText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); +// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", +// com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); // if (returnVal == JOptionPane.OK_OPTION) { // op.removeAction(selectedNO.getName()); // @@ -360,7 +360,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo private class RefreshAction extends UpdateAction { public RefreshAction() { - this.setName(Inter.getLocText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); this.setSmallIcon(UIConstants.REFRESH_ICON); } @@ -402,7 +402,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // // public boolean isCellEditable(EventObject anEvent) { // NameObject no = ReportAndFSManagePane.this.roleTree.getSelectedNameObject(); -// return !(no.getName() == Inter.getLocText("Role")); +// return !(no.getName() == com.fr.design.i18n.Toolkit.i18nText("Role")); // } // // @Override @@ -438,7 +438,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // } // // if (currentText.isEmpty() || isContained) { -// JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("RoleName_Can_Not_Be_Null") + "！"); +// JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("RoleName_Can_Not_Be_Null") + "！"); // roleTree.refreshTreeNode(); // expandTree(roleTree, true); // delegate.setValue(oldName); diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleDataWrapper.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleDataWrapper.java index f5c3dda23..1cc7dd024 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleDataWrapper.java @@ -1 +1 @@ -package com.fr.design.roleAuthority; import com.fr.base.FRContext; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.loader.ChildrenNodesLoader; import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; import java.util.ArrayList; import java.util.Collections; import java.util.List; /** * 将权限细粒度的角色数据包装一下，区分报表平台管理角色和数据决策系统角色 *

* Author : daisy * Date: 13-8-30 * Time: 下午3:42 */ public class RoleDataWrapper implements ChildrenNodesLoader { private List rolelist = new ArrayList(); private String roleTypename = null; public RoleDataWrapper(String roleName) { roleTypename = roleName; } /** * 在此计算并获得与管理类型相对应的 */ private void calculateRoleList() { try { Collections.addAll(rolelist, FRContext.getOrganizationOperator().getRoleGroup()); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } //加载所有的角色列表 public ExpandMutableTreeNode[] load() { calculateRoleList(); return this.load(this.rolelist); } //从workbook中读取的角色列表 public ExpandMutableTreeNode[] load(List rolelist) { this.rolelist = rolelist; ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[rolelist.size()]; for (int i = 0; i < res.length; i++) { res[i] = new ExpandMutableTreeNode(rolelist.get(i)); } return res; } public String getRoleTypename(){ return roleTypename; } } \ No newline at end of file +package com.fr.design.roleAuthority; import com.fr.base.FRContext; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.loader.ChildrenNodesLoader; import com.fr.log.FineLoggerFactory; import java.util.ArrayList; import java.util.Collections; import java.util.List; /** * 将权限细粒度的角色数据包装一下，区分报表平台管理角色和数据决策系统角色 *

* Author : daisy * Date: 13-8-30 * Time: 下午3:42 */ public class RoleDataWrapper implements ChildrenNodesLoader { private List rolelist = new ArrayList(); private String roleTypename = null; public RoleDataWrapper(String roleName) { roleTypename = roleName; } /** * 在此计算并获得与管理类型相对应的 */ private void calculateRoleList() { try { Collections.addAll(rolelist, FRContext.getOrganizationOperator().getRoleGroup()); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } //加载所有的角色列表 public ExpandMutableTreeNode[] load() { calculateRoleList(); return this.load(this.rolelist); } //从workbook中读取的角色列表 public ExpandMutableTreeNode[] load(List rolelist) { this.rolelist = rolelist; ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[rolelist.size()]; for (int i = 0; i < res.length; i++) { res[i] = new ExpandMutableTreeNode(rolelist.get(i)); } return res; } public String getRoleTypename(){ return roleTypename; } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java index 8ca4f2d3a..54920e364 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java @@ -1 +1 @@ -package com.fr.design.roleAuthority; import com.fr.general.NameObject; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectOP; import com.fr.general.Inter; import java.util.*; /** * Author : daisy * Date: 13-8-30 * Time: 下午3:36 */ public class RoleSourceOP implements UserObjectOP { private static final int REPORT_PLATEFORM_MANAGE = 0; private static final int FS_MANAGE = 1; public static int manageMode = -1; public RoleSourceOP() { super(); } public List> init() { //用于存放角色 List> allRoles = new ArrayList>(); Map report_roles = new LinkedHashMap(); Map FS_roles = new LinkedHashMap(); addReportRoles(report_roles); addFSRoles(FS_roles); allRoles.add(report_roles); allRoles.add(FS_roles); return allRoles; } /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(Inter.getLocText("M_Server-Platform_Manager")); report_roles.put(Inter.getLocText("Role"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(Inter.getLocText("FS_Name")); FS_roles.put(Inter.getLocText("Role"), tdw); } public boolean interceptButtonEnabled() { return true; } /** * 移除名字是name的角色 * * @param name */ public void removeAction(String name) { //删除对应模式下的角色 switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //删除报表平台的角色 break; case FS_MANAGE: //删除数据决策系统的角色 break; } } public void addAction(String name) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //增加报表平台的角色 break; case FS_MANAGE: //增加数据决策系统的角色 break; } } public void rename(String oldName, String newName) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //修改报表平台的角色 break; case FS_MANAGE: //修改数据决策系统的角色 break; } } /** * 根据不同模式生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); list.add(initFSRolseNode(FS_roles)); addNodeToList(FS_roles, FSlist); switch (manageMode) { case REPORT_PLATEFORM_MANAGE: return reportlist.toArray(new ExpandMutableTreeNode[reportlist.size()]); case FS_MANAGE: return FSlist.toArray(new ExpandMutableTreeNode[FSlist.size()]); default: return list.toArray(new ExpandMutableTreeNode[list.size()]); } } protected void setDataMode(int i) { manageMode = i; } protected void addNodeToList(Map roleMap, List roleList) { ExpandMutableTreeNode[] roleNode = getNodeArrayFromMap(roleMap); for (int i = 0; i < roleNode.length; i++) { roleList.add(roleNode[i]); } } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("M_Server-Platform_Manager"), REPORT_PLATEFORM_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode initFSRolseNode(Map FS_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("FS_Name"), FS_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(FS_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(new NameObject(name, t)); roleList.add(newChildTreeNode); newChildTreeNode.add(new ExpandMutableTreeNode()); } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file +package com.fr.design.roleAuthority; import com.fr.general.NameObject; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectOP; import java.util.*; /** * Author : daisy * Date: 13-8-30 * Time: 下午3:36 */ public class RoleSourceOP implements UserObjectOP { private static final int REPORT_PLATEFORM_MANAGE = 0; private static final int FS_MANAGE = 1; public static int manageMode = -1; public RoleSourceOP() { super(); } public List> init() { //用于存放角色 List> allRoles = new ArrayList>(); Map report_roles = new LinkedHashMap(); Map FS_roles = new LinkedHashMap(); addReportRoles(report_roles); addFSRoles(FS_roles); allRoles.add(report_roles); allRoles.add(FS_roles); return allRoles; } /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("Role"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("FS_Name")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("Role"), tdw); } public boolean interceptButtonEnabled() { return true; } /** * 移除名字是name的角色 * * @param name */ public void removeAction(String name) { //删除对应模式下的角色 switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //删除报表平台的角色 break; case FS_MANAGE: //删除数据决策系统的角色 break; } } public void addAction(String name) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //增加报表平台的角色 break; case FS_MANAGE: //增加数据决策系统的角色 break; } } public void rename(String oldName, String newName) { switch (manageMode) { case REPORT_PLATEFORM_MANAGE: //修改报表平台的角色 break; case FS_MANAGE: //修改数据决策系统的角色 break; } } /** * 根据不同模式生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); list.add(initFSRolseNode(FS_roles)); addNodeToList(FS_roles, FSlist); switch (manageMode) { case REPORT_PLATEFORM_MANAGE: return reportlist.toArray(new ExpandMutableTreeNode[reportlist.size()]); case FS_MANAGE: return FSlist.toArray(new ExpandMutableTreeNode[FSlist.size()]); default: return list.toArray(new ExpandMutableTreeNode[list.size()]); } } protected void setDataMode(int i) { manageMode = i; } protected void addNodeToList(Map roleMap, List roleList) { ExpandMutableTreeNode[] roleNode = getNodeArrayFromMap(roleMap); for (int i = 0; i < roleNode.length; i++) { roleList.add(roleNode[i]); } } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"), REPORT_PLATEFORM_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode initFSRolseNode(Map FS_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FS_Name"), FS_MANAGE), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(FS_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); ExpandMutableTreeNode newChildTreeNode = new ExpandMutableTreeNode(new NameObject(name, t)); roleList.add(newChildTreeNode); newChildTreeNode.add(new ExpandMutableTreeNode()); } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java index 671d1dd81..0dc4aa245 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleTree.java @@ -13,7 +13,7 @@ import com.fr.design.mainframe.AuthorityPropertyPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.EastRegionContainerPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.SwingUtilities; import javax.swing.JTree; @@ -239,7 +239,7 @@ public class RoleTree extends UserObjectRefreshJTree { */ protected void doWithValueChanged(TreeSelectionEvent e) { if (e.getNewLeadSelectionPath() != null) { - if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(Inter.getLocText("FR-Designer_Role"))) { + if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) { roleName = e.getNewLeadSelectionPath().getLastPathComponent().toString(); setTabRoleName(roleName); refreshRoleTree(roleName); @@ -253,7 +253,7 @@ public class RoleTree extends UserObjectRefreshJTree { * @param treepath 所选的节点路径 */ protected void doWithValueChanged(TreePath treepath) { - if (treepath != null && !treepath.getLastPathComponent().toString().equals(Inter.getLocText("FR-Designer_Role"))) { + if (treepath != null && !treepath.getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) { roleName = treepath.getLastPathComponent().toString(); setTabRoleName(roleName); refreshRoleTree(roleName); diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesAlreadyEditedPane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesAlreadyEditedPane.java index eaa176c9b..30c3dd0ad 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesAlreadyEditedPane.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesAlreadyEditedPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DockingView; -import com.fr.general.Inter; + import com.fr.general.NameObject; import javax.swing.*; @@ -45,7 +45,7 @@ public class RolesAlreadyEditedPane extends JPanel { public RolesAlreadyEditedPane() { this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(Inter.getLocText("roles_already_authority_edited")) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("roles_already_authority_edited")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -92,7 +92,7 @@ public class RolesAlreadyEditedPane extends JPanel { } else if (userObj instanceof NameObject) { NameObject nameObject = (NameObject) userObj; this.setText(nameObject.getName()); - if (nameObject.getName() == Inter.getLocText("M_Server-Platform_Manager")) { + if (nameObject.getName() == com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")) { this.setIcon(BaseUtils.readIcon("/com/fr/web/images/platform/platform_16_16.png")); } else { this.setIcon(BaseUtils.readIcon("/com/fr/web/images/platform/demo.png")); diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java index d8c830a69..38814a7f3 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesEditedSourceOP.java @@ -1 +1 @@ -package com.fr.design.roleAuthority; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.mainframe.JTemplate; import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.privilege.PrivilegeEditedRoleProvider; /** * Author : daisy * Date: 13-9-25 * Time: 下午4:57 */ public class RolesEditedSourceOP extends RoleSourceOP { /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(Inter.getLocText("M_Server-Platform_Manager")); report_roles.put(Inter.getLocText("M_Server-Platform_Manager"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(Inter.getLocText("FS_Name")); FS_roles.put(Inter.getLocText("FS_Name"), tdw); } /** * 生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; // Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); // FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); // FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 // List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); // list.add(initFSRolseNode(FS_roles)); // addNodeToList(FS_roles, FSlist); return list.toArray(new ExpandMutableTreeNode[list.size()]); } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(Inter.getLocText("roles_already_authority_edited"), 0), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget(); ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet())); for (ExpandMutableTreeNode expandMutableTreeNode : expand) { roleList.add(expandMutableTreeNode); } } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file +package com.fr.design.roleAuthority; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.mainframe.JTemplate; import com.fr.general.NameObject; import com.fr.privilege.PrivilegeEditedRoleProvider; /** * Author : daisy * Date: 13-9-25 * Time: 下午4:57 */ public class RolesEditedSourceOP extends RoleSourceOP { /** * 获取报表平台的角色 */ protected void addReportRoles(Map report_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("FS_Name")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("FS_Name"), tdw); } /** * 生成子节点 * * @return */ @Override public ExpandMutableTreeNode[] load() { Map report_roles = null; // Map FS_roles = null; if (this != null) { report_roles = this.init().get(0); // FS_roles = this.init().get(1); } else { report_roles = Collections.emptyMap(); // FS_roles = Collections.emptyMap(); } List list = new ArrayList(); //所有的角色 List reportlist = new ArrayList(); //报表平台橘色 // List FSlist = new ArrayList(); //数据决策系统角色 list.add(initReportRolseNode(report_roles)); addNodeToList(report_roles, reportlist); // list.add(initFSRolseNode(FS_roles)); // addNodeToList(FS_roles, FSlist); return list.toArray(new ExpandMutableTreeNode[list.size()]); } protected ExpandMutableTreeNode initReportRolseNode(Map report_roles) { ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("roles_already_authority_edited"), 0), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(report_roles)); return templateNode; } protected ExpandMutableTreeNode[] getNodeArrayFromMap(Map map) { List roleList = new ArrayList(); Iterator> entryIt = map.entrySet().iterator(); while (entryIt.hasNext()) { Map.Entry entry = entryIt.next(); String name = entry.getKey(); RoleDataWrapper t = entry.getValue(); JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); PrivilegeEditedRoleProvider pe = (PrivilegeEditedRoleProvider) jt.getTarget(); ExpandMutableTreeNode[] expand = t.load(Arrays.asList(pe.getAllEditedRoleSet())); for (ExpandMutableTreeNode expandMutableTreeNode : expand) { roleList.add(expandMutableTreeNode); } } return roleList.toArray(new ExpandMutableTreeNode[roleList.size()]); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java index 7873da42b..ef96135a0 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import javax.swing.*; @@ -35,18 +35,18 @@ public class AlignmentPane extends BasicPane { private AlignmentComboBox verAlignmentComboBox; private UIComboBox textComboBox; private static final String[] TEXT = { - Inter.getLocText("StyleAlignment-Wrap_Text"), - Inter.getLocText("StyleAlignment-Single_Line"), - Inter.getLocText("StyleAlignment-Single_Line(Adjust_Font)"), - Inter.getLocText("StyleAlignment-Multi_Line(Adjust_Font)")}; + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Wrap_Text"), + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line"), + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Single_Line(Adjust_Font)"), + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Multi_Line(Adjust_Font)")}; private UIBasicSpinner rotationSpinner; private UICheckBox isVerticalTextCheckBox; private UIRadioButton leftToRightRB; private UIRadioButton rightToLeftRB; // private UIComboBox imageComboBox; private static final String[] IMAGE = { - Inter.getLocText("Default"), - Inter.getLocText("Image-Extend") + com.fr.design.i18n.Toolkit.i18nText("Default"), + com.fr.design.i18n.Toolkit.i18nText("Image-Extend") }; private UIBasicSpinner leftIndentSpinner; private UIBasicSpinner rightIndentSpinner; @@ -86,7 +86,7 @@ public class AlignmentPane extends BasicPane { //richer:文本控制和图片布局 JPanel textDirectionPanel = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); contentPane.add(textDirectionPanel); - textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("StyleAlignment-Text_Rotation"), null)); + textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation"), null)); JPanel isVerticalTextPanel = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); textDirectionPanel.add(isVerticalTextPanel); initVerticalPane(isVerticalTextPanel); @@ -94,14 +94,14 @@ public class AlignmentPane extends BasicPane { JPanel rotationPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); textDirectionPanel.add(rotationPane); - rotationPane.add(new UILabel(" " + Inter.getLocText("StyleAlignment-Text_Rotation")));//james:加了一个空格，这样对齐了好看些 + rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")));//james:加了一个空格，这样对齐了好看些 rotationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM_90, NUM_90, 1)); rotationSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(rotationSpinner, 3); rotationPane.add(rotationSpinner); - rotationPane.add(new UILabel(Inter.getLocText("StyleAlignment-Degrees"))); - rotationPane.add(new UILabel("(" + Inter.getLocText("StyleAlignment-between_-90_and_90") + ")")); + rotationPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Degrees"))); + rotationPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-between_-90_and_90") + ")")); contentPane.add(getIndentPane()); //james:行间距离 @@ -111,12 +111,12 @@ public class AlignmentPane extends BasicPane { } private void initVerticalPane(JPanel isVerticalTextPanel){ - isVerticalTextCheckBox = new UICheckBox(Inter.getLocText("StyleAlignment-Vertical_Text"), false); + isVerticalTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Vertical_Text"), false); isVerticalTextCheckBox.addActionListener(actionListener); isVerticalTextCheckBox.addActionListener(actionListener1); - this.leftToRightRB = new UIRadioButton(Inter.getLocText("StyleAlignment-Left_To_Right")); + this.leftToRightRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left_To_Right")); this.leftToRightRB.addActionListener(actionListener); - this.rightToLeftRB = new UIRadioButton(Inter.getLocText("StyleAlignment-Right_To_Left")); + this.rightToLeftRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right_To_Left")); this.rightToLeftRB.addActionListener(actionListener); ButtonGroup directionBG = new ButtonGroup(); @@ -131,44 +131,44 @@ public class AlignmentPane extends BasicPane { private void initSpacingPane (JPanel spacingPane) { spacingPane.setLayout(new GridLayout(1, 3)); - spacingPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Style-Spacing") + ":")); + spacingPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing") + ":")); spacingBeforeSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); spacingBeforeSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(spacingBeforeSpinner, 3); - spacingPane.add(this.createCenterFlowPane(Inter.getLocText("Style-Spacing_Before"), spacingBeforeSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_Before"), spacingBeforeSpinner)); spacingAfterSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); spacingAfterSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(spacingAfterSpinner, 3); - spacingPane.add(this.createCenterFlowPane(Inter.getLocText("Style-Spacing_After"), spacingAfterSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_After"), spacingAfterSpinner)); lineSpacingSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), null, new Integer(1))); lineSpacingSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(lineSpacingSpinner, 3); - spacingPane.add(this.createCenterFlowPane(Inter.getLocText("Style-Line_Spacing"), lineSpacingSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Style-Line_Spacing"), lineSpacingSpinner)); } private JPanel getIndentPane() { JPanel indentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); - indentPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Sytle-Indentation"), null)); + indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Sytle-Indentation"), null)); Comparable maximum = null; leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); leftIndentSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(leftIndentSpinner, 3); - indentPane.add(this.createCenterFlowPane(Inter.getLocText(new String[]{"Style-Left_Indent", "Unit_PT"}, new String[] {"(", ")"}), leftIndentSpinner)); + indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Left"), leftIndentSpinner)); rightIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); rightIndentSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(rightIndentSpinner, 3); - indentPane.add(this.createCenterFlowPane(Inter.getLocText(new String[] {"Style-Right_Indent", "Unit_PT"}, new String[] {"(", ")" }) , rightIndentSpinner)); + indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Right") , rightIndentSpinner)); return indentPane; } private JPanel getTextImagePane() { - JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("StyleAlignment-Text_Style")); + JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style")); //textStyle. JPanel textStylePane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); @@ -176,7 +176,7 @@ public class AlignmentPane extends BasicPane { textComboBox = new UIComboBox(TEXT); textComboBox.addActionListener(actionListener); - textStylePane.add(new UILabel(Inter.getLocText("StyleAlignment-Text_Style"))); + textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style"))); textStylePane.add(textComboBox); textImagePane.add(textStylePane);//将文本放后面更好看点 return textImagePane; @@ -184,12 +184,12 @@ public class AlignmentPane extends BasicPane { private JPanel getAlignment() { //algnment. - JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Alignment-Style")); + JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style")); JPanel horAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); // aligmentPane.add(horAlignmentPane); horAlignmentComboBox = new AlignmentComboBox(CoreConstants.HORIZONTAL_ALIGNMENT_ARRAY); horAlignmentComboBox.addActionListener(actionListener); - horAlignmentPane.add(new UILabel(Inter.getLocText("StyleAlignment-Horizontal"))); + horAlignmentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Horizontal"))); horAlignmentPane.add(horAlignmentComboBox); JPanel verAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); @@ -197,7 +197,7 @@ public class AlignmentPane extends BasicPane { aligmentPane.add(horAlignmentPane); verAlignmentComboBox = new AlignmentComboBox(CoreConstants.VERTICAL_ALIGNMENT_ARRAY); verAlignmentComboBox.addActionListener(actionListener); - verAlignmentPane.add(new UILabel(Inter.getLocText("StyleAlignment-Vertical"))); + verAlignmentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Vertical"))); verAlignmentPane.add(verAlignmentComboBox); return aligmentPane; } @@ -253,7 +253,7 @@ public class AlignmentPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Style"); } /** @@ -320,7 +320,7 @@ public class AlignmentPane extends BasicPane { int rotation = ((Integer) this.rotationSpinner.getValue()).intValue(); if (rotation > NUM_90 || rotation < -NUM_90) { - throw new Exception(Inter.getLocText("StyleAlignment-The_value_of_rotation_must_between_-90_and_90_degrees") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-The_value_of_rotation_must_between_-90_and_90_degrees") + "."); } } diff --git a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java index 7ab1a2221..143a937f6 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java @@ -20,7 +20,7 @@ import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; public class AlphaPane extends JPanel { @@ -50,7 +50,7 @@ public class AlphaPane extends JPanel { alphaPane.setBorder(BorderFactory.createEmptyBorder()); this.add(alphaPane, BorderLayout.CENTER); - alphaPane.add(new UILabel(Inter.getLocText("Plugin-Chart_Alpha") + ":")); + alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":")); alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE)); alphaSlider.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 23c8c71bc..3138de5e0 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -34,7 +34,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.VerticalFlowLayout; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; @@ -97,18 +97,18 @@ public class BorderPane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null)); JPanel borderAllControlPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); centerPane.add(borderAllControlPane, BorderLayout.NORTH); borderAllControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 0)); borderAllControlPane.add(new UILabel(" ")); // Button reseting borders - borderAllControlPane.add(createVerButtonPane(NO_BORDERS, Inter.getLocText("No"))); + borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No"))); // Button setting all borders to active with // current color and current style excepting inside borders - borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, Inter.getLocText("External"))); + borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); - borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, Inter.getLocText("Inside"))); + borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); // Control JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -148,16 +148,16 @@ public class BorderPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Line"), null)); + northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Line"), null)); JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); northPane.add(rightTopPane, BorderLayout.NORTH); JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - first.add(new UILabel(Inter.getLocText("Style") + ":")); + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Style") + ":")); first.add(this.currentLineCombo); rightTopPane.add(first, BorderLayout.NORTH); JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - second.add(new UILabel(Inter.getLocText("Color") + ":")); + second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color") + ":")); second.add(this.currentLineColorPane); rightTopPane.add(second, BorderLayout.CENTER); @@ -216,7 +216,7 @@ public class BorderPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Border"); + return com.fr.design.i18n.Toolkit.i18nText("Border"); } // p:populate Style diff --git a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java index 032619148..e67808e8b 100644 --- a/designer-base/src/main/java/com/fr/design/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FRFontPane.java @@ -35,7 +35,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; import com.fr.general.DefaultValues; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; @@ -122,7 +122,7 @@ public class FRFontPane extends BasicPane { // underline pane JPanel underlinePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); listVBottomPane.add(underlinePane); - underlinePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FRFont-Underline"), null)); + underlinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Underline"), null)); this.underlineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.underlineCombo.addActionListener(actionListener); @@ -132,7 +132,7 @@ public class FRFontPane extends BasicPane { JPanel foregroundPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); listVBottomPane.add(foregroundPane); - foregroundPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FRFont-Foreground"),null)); + foregroundPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Foreground"),null)); foregroundColorPane = new ColorSelectBox(140); foregroundColorPane.addSelectChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { @@ -155,21 +155,21 @@ public class FRFontPane extends BasicPane { JPanel effectsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); otherFontPane.add(effectsPane, BorderLayout.CENTER); // effectsPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - effectsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FRFont-Effects"),null)); + effectsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Effects"),null)); JPanel effectsPane2 = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); effectsPane.add(effectsPane2, BorderLayout.NORTH); - isStrikethroughCheckBox = new UICheckBox(Inter.getLocText("FRFont-Strikethrough") + " "); + isStrikethroughCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Strikethrough") + " "); isStrikethroughCheckBox.addChangeListener(changeListener); isStrikethroughCheckBox.setMnemonic('K'); - isShadowCheckBox = new UICheckBox(Inter.getLocText("FRFont-Shadow")); + isShadowCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Shadow")); isShadowCheckBox.addChangeListener(changeListener); isShadowCheckBox.setMnemonic('S'); - isSuperscriptCheckBox = new UICheckBox(Inter.getLocText("FRFont-Superscript")); + isSuperscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Superscript")); isSuperscriptCheckBox.addChangeListener(changeListener); isSuperscriptCheckBox.setMnemonic('E'); - isSubscriptCheckBox = new UICheckBox(Inter.getLocText("FRFont-Subscript")); + isSubscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Subscript")); isSubscriptCheckBox.addChangeListener(changeListener); isSubscriptCheckBox.setMnemonic('B'); @@ -186,7 +186,7 @@ public class FRFontPane extends BasicPane { // preview pane. preview = new FRFontPreviewArea(); - preview.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Preview"))); + preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"))); rightPane.add(preview, BorderLayout.CENTER); // Cannot select superscript and subscript in the same time. @@ -277,7 +277,7 @@ public class FRFontPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Sytle-FRFont"); + return com.fr.design.i18n.Toolkit.i18nText("Sytle-FRFont"); } /** diff --git a/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java b/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java index 9a1129749..bbec9e2fb 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontFamilyPane.java @@ -11,7 +11,7 @@ import com.fr.base.Utils; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; public class FontFamilyPane extends JPanel { @@ -37,7 +37,7 @@ public class FontFamilyPane extends JPanel { // familyPane.setLayout(FRGUIPaneFactory.createBorderLayout()); familyPane.add(FRFontPane.createTextFieldListPane("", familyField, familyList), BorderLayout.CENTER); - familyPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FRFont-Family"),null)); + familyPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Family"),null)); this.add(familyPane); } diff --git a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java index 2cb4b1910..53a7d65b2 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; public class FontSizeStylePane extends JPanel { @@ -32,13 +32,13 @@ public class FontSizeStylePane extends JPanel { this.add(fontVSizPane); // fontVSizPane.setLayout(new BoxLayout(fontVSizPane, BoxLayout.X_AXIS)); - fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"FRFont-Style", "FRFont-Size"}), null)); + fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null)); String[] styles = { - Inter.getLocText("FRFont-plain"), - Inter.getLocText("FRFont-bold"), - Inter.getLocText("FRFont-italic"), - Inter.getLocText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; styleField = new UITextField(); styleField.setEditable(false); diff --git a/designer-base/src/main/java/com/fr/design/style/FormatBox.java b/designer-base/src/main/java/com/fr/design/style/FormatBox.java index e36b9eac0..535807637 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatBox.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatBox.java @@ -23,7 +23,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.style.FormatPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + /** @@ -61,7 +61,7 @@ public class FormatBox extends BasicPane { typeBox.addItem(FormatField.getInstance().getName(FormatContents.TIME)); typeBox.addItem(FormatField.getInstance().getName(FormatContents.TEXT)); - pane.add(new UILabel(Inter.getLocText("Format") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Format") + ":")); formatBox = new UIComboBox(); // kunsnat: 大小: 这个有的格式的大小需要很宽! formatBox.setPreferredSize(new Dimension(150, 20)); @@ -69,7 +69,7 @@ public class FormatBox extends BasicPane { formatBox.setEnabled(false); pane.add(formatBox); - pane.add(new UILabel(Inter.getLocText("StyleFormat-Sample") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":")); pane.add(previewLabel = new UILabel("")); typeBox.addItemListener(typeListener); @@ -172,7 +172,7 @@ public class FormatBox extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Style"); } private void refreshLabelText() { diff --git a/designer-base/src/main/java/com/fr/design/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/style/FormatPane.java index 12bada871..9883f94de 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -82,7 +82,7 @@ public class FormatPane extends BasicPane { //sample pane JPanel samplePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(samplePane, BorderLayout.NORTH); - samplePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("StyleFormat-Sample"), null)); + samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), null)); samplePane.setLayout(FRGUIPaneFactory.createBorderLayout()); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()); samplePane.add(sampleLabel, BorderLayout.CENTER); @@ -92,7 +92,7 @@ public class FormatPane extends BasicPane { //left control pane JPanel leftControlPane =FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); this.add(leftControlPane, BorderLayout.WEST); - leftControlPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("StyleFormat-Category"), null)); + leftControlPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Category"), null)); initRadioButton(); ButtonGroup categoryButtonGroup = new ButtonGroup(); categoryButtonGroup.add(nullRadioButton); @@ -170,7 +170,7 @@ public class FormatPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Style"); } /** @@ -359,7 +359,7 @@ public class FormatPane extends BasicPane { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(text); String sample = simpleDateFormat.format(new Date()); if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) { - sample += " " + Inter.getLocText("DateFormat-Custom_Warning"); + sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning"); c = Color.red; } this.sampleLabel.setText(sample); diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java index 296ee746e..2ffe5ccad 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundButtonPane.java @@ -2,7 +2,7 @@ package com.fr.design.style.background; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + /** * Created by ibm on 2017/1/5. @@ -19,7 +19,7 @@ public class BackgroundButtonPane extends BackgroundPane { for (Class key : BackgroundFactory.buttonKindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getButtonWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java index 21128fa77..a0e0702e4 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java @@ -9,7 +9,7 @@ import com.fr.design.style.background.impl.ColorBackgroundPane; import com.fr.design.style.background.impl.ImageBackgroundPane; import com.fr.design.style.background.impl.NullBackgroundPane; import com.fr.general.Background; -import com.fr.general.Inter; + import java.util.LinkedHashMap; import java.util.Map; @@ -29,11 +29,11 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { private static void registerCardSwitchBtnBackground(Map, BackgroundUIWrapper> map) { map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); } @@ -47,7 +47,7 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { for (Class key : cardSwitchButton.keySet()) { BackgroundUIWrapper wrapper = cardSwitchButton.get(key); wrapper.setIndex(index++); - tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java index 2348f99ac..d6302e95e 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java @@ -18,7 +18,7 @@ import com.fr.design.style.background.impl.PatternBackgroundPane; import com.fr.design.style.background.impl.TextureBackgroundPane; import com.fr.general.Background; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.plugin.context.PluginContext; import com.fr.plugin.manage.PluginFilter; import com.fr.plugin.observer.PluginEvent; @@ -92,32 +92,32 @@ public class BackgroundFactory { private static void registerUniversal(Map, BackgroundUIWrapper> map) { map.put(null, BackgroundUIWrapper.create() - .setType(NullBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); map.put(TextureBackground.class, BackgroundUIWrapper.create() - .setType(TextureBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Texture"))); + .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Texture"))); map.put(PatternBackground.class, BackgroundUIWrapper.create() - .setType(PatternBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Pattern"))); + .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Pattern"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); } private static void registerImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); } private static void registerBrowserImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane4Browser.class).setTitle(Inter.getLocText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); } private static void registerButtonBackground(Map, BackgroundUIWrapper> map){ map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageButtonBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Image"))); + .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java index 1caf13e1d..15a37c4ae 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java @@ -18,7 +18,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; import com.fr.general.Background; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + public class BackgroundPane extends BasicPane { @@ -59,7 +59,7 @@ public class BackgroundPane extends BasicPane { for (Class key : BackgroundFactory.kindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } } @@ -85,7 +85,7 @@ public class BackgroundPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Background"); + return com.fr.design.i18n.Toolkit.i18nText("Background"); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java index a1f06f065..d6cae505b 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane4Browser.java @@ -2,7 +2,7 @@ package com.fr.design.style.background; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + /** * Created by richie on 16/5/18. @@ -18,7 +18,7 @@ public class BackgroundPane4Browser extends BackgroundPane { for (Class key : BackgroundFactory.browserKindsOfKey()) { BackgroundUIWrapper wrapper = BackgroundFactory.getBrowserWrapper(key); wrapper.setIndex(index++); - tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java index 6b32b2cfe..f859032ed 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java @@ -13,7 +13,7 @@ import javax.swing.event.ChangeListener; import javax.swing.event.EventListenerList; import com.fr.general.Background; -import com.fr.general.Inter; + /** * Preview background. @@ -38,7 +38,7 @@ public class BackgroundPreviewLabel extends UILabel { this.getSize().getWidth(), this.getSize().getHeight())); this.setText(""); } else { - this.setText(Inter.getLocText("Background-Background_is_NULL") + "..."); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "..."); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java index 6856bb65f..3add0af1e 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundSelectPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; import com.fr.general.Background; -import com.fr.general.Inter; + /** * @author kunsnat E-mail:kunsnat@gmail.com @@ -42,7 +42,7 @@ public abstract class BackgroundSelectPane extends BasicPane { this.add(backgroundPane, BorderLayout.CENTER); - UIButton button = new UIButton(Inter.getLocText("Choose_None")); + UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Choose_None")); this.add(button, BorderLayout.SOUTH); button.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java index 6cc71a074..3ad62ebef 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java @@ -7,7 +7,7 @@ import com.fr.design.style.background.gradient.GradientBackgroundPane; import com.fr.design.style.background.impl.ColorBackgroundPane; import com.fr.design.style.background.impl.NullBackgroundPane; import com.fr.general.Background; -import com.fr.general.Inter; + import java.util.LinkedHashMap; import java.util.Map; @@ -27,11 +27,11 @@ public class BackgroundTabPane extends BackgroundPane { private static void registerTabpaneBackground(Map, BackgroundUIWrapper> map) { map.put(null, BackgroundUIWrapper.create() - .setType(NullBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(Inter.getLocText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); } @@ -44,7 +44,7 @@ public class BackgroundTabPane extends BackgroundPane { for (Class key : tabpane.keySet()) { BackgroundUIWrapper wrapper = tabpane.get(key); wrapper.setIndex(index++); - tabbedPane.addTab(Inter.getLocText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText(wrapper.getTitle()), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java index 7176e0913..e6c45fa63 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java @@ -11,7 +11,7 @@ import com.fr.design.style.background.gradient.GradientBackgroundSelectPane; import com.fr.design.style.background.image.ImageSelectPane; import com.fr.design.style.color.ColorUIComboBoxPane; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.JPanel; import java.awt.BorderLayout; @@ -28,10 +28,10 @@ import java.awt.event.ItemListener; public class BackgroundUIComboBoxPane extends BasicPane { private static final long serialVersionUID = -3751191424737067321L; - protected static final String none = Inter.getLocText("DataFunction-None"); - protected static final String color = Inter.getLocText("Colors"); - protected static final String image = Inter.getLocText("Image"); - protected static final String gradient = Inter.getLocText("Gradient-Color"); + protected static final String none = com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"); + protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors"); + protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Image"); + protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); protected CardLayout cardLayout; protected JPanel layoutPane; @@ -61,7 +61,7 @@ public class BackgroundUIComboBoxPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); labelPane.add(northPane, BorderLayout.NORTH); - northPane.add(new UILabel(Inter.getLocText(new String[]{"Background_Settings"}) + ":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting") + ":")); northPane.add(selectBox); cardLayout = new CardLayout(); @@ -161,6 +161,6 @@ public class BackgroundUIComboBoxPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Background", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java index ee0cd3385..fb8501e19 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java @@ -17,7 +17,7 @@ import javax.swing.event.ChangeListener; import com.fr.base.background.GradientBackground; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.design.style.background.BackgroundDetailPane; /** @@ -34,7 +34,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane { public GradientBackgroundPane() { // bug 5452 简化GradientPane - JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText(new String[]{"Gradient-Color", "Set"})); + JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color")); jpanel.setPreferredSize(new Dimension(450, 320)); jpanel.setLayout(new BorderLayout()); @@ -43,7 +43,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane { JPanel blankJp = new JPanel(); gradientBar = new GradientBar(4, 254); blankJp.add(gradientBar); - UILabel jl = new UILabel(Inter.getLocText("FR-Designer_Drag_To_Select_Gradient")); + UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Drag_To_Select_Gradient")); jl.setHorizontalAlignment(SwingConstants.CENTER); gradientPanel.add(jl, BorderLayout.NORTH); gradientPanel.add(blankJp, BorderLayout.SOUTH); @@ -53,14 +53,14 @@ public class GradientBackgroundPane extends BackgroundDetailPane { JPanel innercenterPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); centerPane.add(new UILabel(" ")); centerPane.add(innercenterPane); - innercenterPane.add(new UILabel(Inter.getLocText("FR-Designer_Gradient_Direction") + ":")); + innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction") + ":")); - left2right = new UIRadioButton(Inter.getLocText("FR-Designer_PageSetup_Horizontal")); + left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Horizontal")); innercenterPane.add(left2right); left2right.setSelected(true); left2right.addActionListener(reviewListener); - top2bottom = new UIRadioButton(Inter.getLocText("FR-Designer_PageSetup_Vertical")); + top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Vertical")); innercenterPane.add(top2bottom); top2bottom.addActionListener(reviewListener); diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java index 928732b4c..0a84a8b64 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundSelectPane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.design.style.AlphaPane; import com.fr.design.style.background.BackgroundPane4BoxChange; @@ -24,8 +24,8 @@ import com.fr.design.style.background.BackgroundPane4BoxChange; public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -2762854865690293473L; - private static final String LEFT_2_RIGHT = Inter.getLocText("PageSetup-Landscape"); - private static final String TOP_2_BOTTOM = Inter.getLocText("PageSetup-Portrait"); + private static final String LEFT_2_RIGHT = com.fr.design.i18n.Toolkit.i18nText("PageSetup-Landscape"); + private static final String TOP_2_BOTTOM = com.fr.design.i18n.Toolkit.i18nText("PageSetup-Portrait"); private static final String[] COLOR_DIRECTIONS = { LEFT_2_RIGHT, TOP_2_BOTTOM @@ -58,12 +58,12 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { JPanel secondFloorPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); mainPane.add(secondFloorPane); - secondFloorPane.add(new UILabel(Inter.getLocText(new String[]{"Gradient", "Filed"}) + ":")); + secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Area") + ":")); changeBox = new GradientChangeBoxPane(); secondFloorPane.add(changeBox); - secondFloorPane.add(repeatShow = new UICheckBox(Inter.getLocText(new String[]{"Repeat", "Show"}))); + secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Repeat_Show"))); } public void populate(Background background) { @@ -112,7 +112,7 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Choose", "Gradient-Color"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java index caed1c86f..8272eb5b9 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java @@ -17,9 +17,10 @@ import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; /** @@ -29,8 +30,8 @@ import com.fr.stable.Constants; */ public class GradientChangeBoxPane extends BasicPane { private static final long serialVersionUID = -6747468244414651602L; - private static String current = Inter.getLocText(new String[]{"Current", "Choose", "Filed"}); - private static String custom = Inter.getLocText(new String[]{"Custom", "Filed"}); + private static final String CURRENT = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Current_Area"); + private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Custom_Area"); private JPanel cardPane; private CardLayout cardLayout; @@ -56,27 +57,27 @@ public class GradientChangeBoxPane extends BasicPane { arrowButton.setRoundBorder(true, Constants.LEFT); this.add(arrowButton, BorderLayout.EAST); - currentField = new UITextField(current); + currentField = new UITextField(CURRENT); currentField.setEditable(false); - cardPane.add(currentField, "current"); + cardPane.add(currentField, "CURRENT"); fromToPixPane = new GradientFromToPixPane(); - cardPane.add(fromToPixPane, "custom"); + cardPane.add(fromToPixPane, "CUSTOM"); popupMenu = new JPopupMenu(); - UIMenuItem currentItem = new UIMenuItem(current); + UIMenuItem currentItem = new UIMenuItem(CURRENT); currentItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - cardLayout.show(cardPane, "current"); + cardLayout.show(cardPane, "CURRENT"); } }); - customItem = new UIMenuItem(custom); + customItem = new UIMenuItem(CUSTOM); customItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - cardLayout.show(cardPane, "custom"); + cardLayout.show(cardPane, "CUSTOM"); } }); @@ -105,9 +106,9 @@ public class GradientChangeBoxPane extends BasicPane { public void populate(GradientBackground bg) { if(bg.isUseCell()) { - cardLayout.show(cardPane, "current"); + cardLayout.show(cardPane, "CURRENT"); } else { - cardLayout.show(cardPane, "custom"); + cardLayout.show(cardPane, "CUSTOM"); fromToPixPane.populate(bg); } } @@ -123,7 +124,7 @@ public class GradientChangeBoxPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Choose", "Gradient-Color"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java index ef976992b..f96548233 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + /** * @author kunsnat E-mail:kunsnat@gmail.com @@ -38,11 +38,11 @@ public class GradientFromToPixPane extends BasicPane { startField.setHorizontalAlignment(UITextField.LEFT); startField.setColumns(3); - secondFloorPane.add(new UILabel(" " + Inter.getLocText("To") + " ")); + secondFloorPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("To") + " ")); endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1)); secondFloorPane.add(endPixSpinner); - secondFloorPane.add(new UILabel("(" + Inter.getLocText("Indent-Pixel") + ")")); + secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Indent-Pixel") + ")")); JFormattedTextField endField = ((JSpinner.DefaultEditor)endPixSpinner.getEditor()).getTextField(); endField.setHorizontalAlignment(UITextField.LEFT); @@ -61,7 +61,7 @@ public class GradientFromToPixPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Choose", "Gradient-Color"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java index 25042a749..8f3a920a9 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientSelectBox.java @@ -9,7 +9,7 @@ import javax.swing.event.ChangeListener; import com.fr.base.background.GradientBackground; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.design.style.CustomSelectBox; import com.fr.design.style.background.BackgroundJComponent; @@ -63,7 +63,7 @@ public class GradientSelectBox extends BasicPane { } protected String title4PopupWindow() { - return Inter.getLocText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } public void populate(GradientBackground background) { diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ExpandFileChooser.java b/designer-base/src/main/java/com/fr/design/style/background/image/ExpandFileChooser.java index b9690b243..452099908 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ExpandFileChooser.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ExpandFileChooser.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.JDialog; @@ -55,7 +55,7 @@ public class ExpandFileChooser extends JFileChooser { bottomControlPanel.setPreferredSize(new Dimension(DEFAULT_WIDTH, 40)); approve = new UIButton(approveText); - cancel = new UIButton(Inter.getLocText("FR-Designer_Button-Cancel")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Cancel")); if (StringUtils.isNotEmpty(checkBoxText)) { checkBox = new UICheckBox(checkBoxText); checkBox.setSelected(DesignerEnvManager.getEnvManager().isImageCompress()); diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java index 10fb9a061..80d909822 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageFileChooser.java @@ -6,7 +6,7 @@ package com.fr.design.style.background.image; import com.fr.base.BaseUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.style.ChooseFileView; -import com.fr.general.Inter; + import javax.swing.filechooser.FileFilter; import java.awt.Component; @@ -23,10 +23,10 @@ import java.util.Hashtable; public class ImageFileChooser extends ExpandFileChooser { public ImageFileChooser() { - super(Inter.getLocText("FR-Designer_Image_Compress"),Inter.getLocText("FR-Designer_Open")); + super(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open")); ExampleFileFilter bothFilter = new ExampleFileFilter( new String[]{"jpg", "gif", "png", "bmp"}, - Inter.getLocText("Image-Image_Files")); + com.fr.design.i18n.Toolkit.i18nText("Image-Image_Files")); bothFilter.setExtensionListInDescription(true); this.addChoosableFileFilter(bothFilter); this.setAcceptAllFileFilterUsed(false); diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java index 296686f24..715fd1843 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImagePreviewPane.java @@ -8,7 +8,7 @@ import com.fr.base.GraphHelper; import com.fr.base.Style; import com.fr.design.gui.iscrollbar.UIScrollBar; import com.fr.general.ImageWithSuffix; -import com.fr.general.Inter; + import com.fr.stable.CoreGraphHelper; import javax.swing.JComponent; @@ -108,7 +108,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre public void paintComponent(Graphics g) { super.paintComponent(g); if (isLoading) { - g.drawString(Inter.getLocText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); return; } if (this.getImage() != null) { //draw image. diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java index 77c4c9bb8..e63b6e2f1 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.AlphaPane; import com.fr.design.style.background.BackgroundPane4BoxChange; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.JFileChooser; @@ -32,8 +32,8 @@ import java.io.File; */ public class ImageSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -3938766570998917557L; - private static String layoutCenter = Inter.getLocText("Default"); - private static String layoutTitled = Inter.getLocText("Image-Titled"); + private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default"); + private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Image-Titled"); private String suffix = PictureCollection.DEFAULT_SUFFIX; @@ -66,7 +66,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { pane.add(testPane1); // 选择图片按钮 - UIButton selectPictureButton = new UIButton(Inter.getLocText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); selectFilePane.add(selectPictureButton); selectPictureButton.setPreferredSize(new Dimension(110, 20)); @@ -77,7 +77,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { selectPictureButton.addActionListener(selectPictureActionListener); //布局 - selectFilePane.add(new UILabel(Inter.getLocText("Form-Layout") + ":")); + selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout") + ":")); layoutComboBox = new UIComboBox(layoutTypes); selectFilePane.add(layoutComboBox); @@ -115,7 +115,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { imageSizeLabel.setText(""); } else { imageSizeLabel.setText(selectImage.getWidth(null) + "x" - + selectImage.getHeight(null) + Inter.getLocText("px")); + + selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("px")); } } @@ -159,6 +159,6 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return Inter.getLocText("Image-Select_Picture"); + return com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java index fdbb2d4ac..a122e42ca 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java @@ -12,7 +12,7 @@ import com.fr.design.style.background.BackgroundDetailPane; import com.fr.design.style.background.image.ImageFileChooser; import com.fr.design.style.background.image.ImagePreviewPane; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.BorderFactory; @@ -50,7 +50,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(previewContainerPane, BorderLayout.CENTER); - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Preview")); + JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); previewOwnerPane.setLayout(new BorderLayout()); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); @@ -70,7 +70,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(8, 2, 4, 0)); UIButton selectPictureButton = new UIButton( - Inter.getLocText("FR-Designer_Background_Image_Select")); + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); selectFilePane.add(selectPictureButton, BorderLayout.NORTH); selectPictureButton.setMnemonic('S'); selectPictureButton.addActionListener(selectPictureActionListener); @@ -78,10 +78,10 @@ public class ImageBackgroundPane extends BackgroundDetailPane { selectFilePane.add(layoutPane, BorderLayout.CENTER); //布局 - defaultRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Default")); - tiledRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Titled")); - extendRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Extend")); - adjustRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-StyleAlignment_Layout_Image_Adjust")); + defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Default")); + tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Titled")); + extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Extend")); + adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Layout_Image_Adjust")); defaultRadioButton.addActionListener(layoutActionListener); tiledRadioButton.addActionListener(layoutActionListener); @@ -220,7 +220,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { if (image == null) { imageSizeLabel.setText(""); } else { - imageSizeLabel.setText(Inter.getLocText(new String[]{"Size", "px"}, new String[]{": " + image.getWidth(null) + "x" + image.getHeight(null)})); + imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null))); } } }; diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java index fe0cadaa5..b5973b1ed 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java @@ -5,7 +5,7 @@ import com.fr.base.background.ImageBackground; import com.fr.base.background.ImageFileBackground; import com.fr.design.gui.ibutton.UIButton; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.BorderFactory; @@ -49,9 +49,9 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane { } private void initButton() { - chooseButton = new UIButton(Inter.getLocText("FR-Designer_Background_Image_Select")); + chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); chooseButton.addActionListener(selectPictureActionListener); - clearButton = new UIButton(Inter.getLocText("FR-Designer_Background_Clear")); + clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Clear")); clearButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java index ea108019a..1c9466f25 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java @@ -5,7 +5,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.background.BackgroundDetailPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeListener; @@ -19,7 +19,7 @@ public class NullBackgroundPane extends BackgroundDetailPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel centerLabel = new UILabel( - Inter.getLocText("Background-Background_is_NULL") + "..."); + com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "..."); this.add(centerLabel); centerLabel.setHorizontalAlignment(SwingConstants.CENTER); centerLabel.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java index a1481e6d6..19c4bee81 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.style.color.ColorSelectBox; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -45,7 +45,7 @@ public class PatternBackgroundPane extends BPane { } protected String titleOfTypePane() { - return Inter.getLocText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); } protected LayoutManager layoutOfTypePane(int nColumn) { return FRGUIPaneFactory.createNColumnGridLayout(nColumn); @@ -63,7 +63,7 @@ public class PatternBackgroundPane extends BPane { protected void setChildrenOfContentPane(JPanel contentPane) { // colors - JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Colors")); + JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Colors")); contentPane.add(colorPane); foregroundColorPane = new ColorSelectBox(80); @@ -72,12 +72,12 @@ public class PatternBackgroundPane extends BPane { backgroundColorPane.setSelectObject(Color.black); colorPane.add(Box.createHorizontalStrut(2)); - colorPane.add(this.createLabelColorPane(Inter.getLocText("Foreground") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":", foregroundColorPane)); colorPane.add(Box.createHorizontalStrut(8)); - colorPane.add(this.createLabelColorPane(Inter.getLocText("Background") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Background") + ":", backgroundColorPane)); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java index 9800675c1..40b1c5de4 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java @@ -5,7 +5,7 @@ import com.fr.base.background.TextureBackground; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -47,30 +47,30 @@ public class TextureBackgroundPane extends BPane { TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT}; private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{ - Inter.getLocText("BackgroundTexture-Newsprint"), - Inter.getLocText("BackgroundTexture-RecycledPaper"), - Inter.getLocText("BackgroundTexture-Parchment"), - Inter.getLocText("BackgroundTexture-Stationery"), - Inter.getLocText("BackgroundTexture-GreenMarble"), - Inter.getLocText("BackgroundTexture-WhiteMarble"), - Inter.getLocText("BackgroundTexture-BrownMarble"), - Inter.getLocText("BackgroundTexture-Granite"), - Inter.getLocText("BackgroundTexture-BlueTissuePaper"), - Inter.getLocText("BackgroundTexture-PinkTissuePaper"), - Inter.getLocText("BackgroundTexture-PurpleMesh"), - Inter.getLocText("BackgroundTexture-Bouquet"), - Inter.getLocText("BackgroundTexture-Papyrus"), - Inter.getLocText("BackgroundTexture-Canvas"), - Inter.getLocText("BackgroundTexture-Denim"), - Inter.getLocText("BackgroundTexture-WovenMat"), - Inter.getLocText("BackgroundTexture-WaterDroplets"), - Inter.getLocText("BackgroundTexture-PaperBag"), - Inter.getLocText("BackgroundTexture-FishFossil"), - Inter.getLocText("BackgroundTexture-Sand"), - Inter.getLocText("BackgroundTexture-Cork"), - Inter.getLocText("BackgroundTexture-Walnut"), - Inter.getLocText("BackgroundTexture-Oak"), - Inter.getLocText("BackgroundTexture-MediumWood") + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"), + com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood") }; private TexturePaint texturePaint; @@ -89,7 +89,7 @@ public class TextureBackgroundPane extends BPane { } protected String titleOfTypePane() { - return Inter.getLocText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); } protected void setChildrenOfTypePane(JPanel typePane2) { ButtonGroup patternButtonGroup = new ButtonGroup(); diff --git a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java index f57f1f39a..e0b39e2a9 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java @@ -1,6 +1,6 @@ package com.fr.design.style.background.pattern; -import com.fr.general.Inter; + import com.fr.design.style.background.BackgroundDetailPane; import com.fr.design.style.background.impl.PatternBackgroundPaneNoFore; import com.fr.design.style.background.BackgroundSelectPane; @@ -28,7 +28,7 @@ public class PatternSelectPane extends BackgroundSelectPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java index 0df149d67..503f7d364 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java @@ -8,7 +8,7 @@ import javax.swing.JPanel; import com.fr.base.background.PatternBackground; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.design.style.background.BackgroundPane4BoxChange; import com.fr.design.style.color.ColorSelectBox; @@ -31,9 +31,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange { this.add(pane, BorderLayout.NORTH); pane.add(patternBox = new PatternSelectBox(80)); - pane.add(new UILabel(Inter.getLocText("Foreground") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":")); pane.add(foreColor = new ColorSelectBox(80)); - pane.add(new UILabel(Inter.getLocText("Background") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background") + ":")); pane.add(backColor = new ColorSelectBox(80)); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java index 08b441d13..9081b2c11 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java @@ -1,6 +1,6 @@ package com.fr.design.style.background.texture; -import com.fr.general.Inter; + import com.fr.design.style.background.BackgroundDetailPane; import com.fr.design.style.background.impl.TextureBackgroundPane; import com.fr.design.style.background.BackgroundSelectPane; @@ -27,6 +27,6 @@ public class TextureSelectPane extends BackgroundSelectPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java b/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java index d59e9ce51..1298e4b69 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorChooserPreview.java @@ -3,7 +3,7 @@ package com.fr.design.style.color; import javax.swing.*; import java.awt.*; -import com.fr.general.Inter; + import sun.swing.SwingUtilities2; /** @@ -196,7 +196,7 @@ public class ColorChooserPreview extends JPanel { private String getSampleText() { if (this.sampleText == null) { - this.sampleText = Inter.getLocText("FR-Designer_SampleText"); + this.sampleText = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SampleText"); } return this.sampleText; } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java index 0ac085b8b..63ea7d459 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDetailPane.java @@ -2,7 +2,7 @@ package com.fr.design.style.color; import com.fr.design.dialog.BasicPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.colorchooser.AbstractColorChooserPanel; @@ -56,7 +56,7 @@ public class ColorSelectDetailPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Select_Color"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Color"); } protected void initComponents() { @@ -78,7 +78,7 @@ public class ColorSelectDetailPane extends BasicPane { this.add(selectedPanel, BorderLayout.NORTH); // 最近使用面板 - recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Used")); + recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Used")); RecentUseColorPane recent = new RecentUseColorPane(selectedPanel); recentUsePanel.add(recent); @@ -87,7 +87,7 @@ public class ColorSelectDetailPane extends BasicPane { selectedPanel.setPreviewPanel(new JPanel()); // 预览 - previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(Inter.getLocText("FR-Designer_Preview")); + previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); final ColorChooserPreview colorChooserPreview = new ColorChooserPreview(); ColorSelectionModel model = selectedPanel.getSelectionModel(); model.addChangeListener(new ChangeListener() { diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index 87148bdf4..56f6acc77 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -15,7 +15,7 @@ import com.fr.base.chart.BaseChartCollection; import com.fr.design.gui.chart.MiddleChartDialog; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + /** * 颜色选择器更多颜色对话框 @@ -92,8 +92,8 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.add(buttonPane, BorderLayout.SOUTH); - ok = new UIButton(Inter.getLocText("FR-Designer_Button_OK")); - cancel = new UIButton(Inter.getLocText("FR-Designer_Button_Cancel")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_OK")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_Cancel")); buttonPane.add(ok); buttonPane.add(cancel); diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java index 610eb89d1..d0e7eac2a 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -53,7 +53,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); if (isSupportTransparent) { - UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency")); + UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); this.add(transpanrentButton, BorderLayout.NORTH); transpanrentButton.addActionListener(new ActionListener() { @@ -80,7 +80,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable centerPane.add(Box.createVerticalStrut(1)); - UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java index 4b8163f1f..6aca12ffc 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java @@ -7,7 +7,7 @@ import javax.swing.JPanel; import com.fr.base.background.ColorBackground; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.design.style.AlphaPane; import com.fr.design.style.background.BackgroundPane4BoxChange; @@ -53,7 +53,7 @@ public class ColorUIComboBoxPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return Inter.getLocText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Color"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java b/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java index 15f11de11..581fdeeaa 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java +++ b/designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java @@ -29,7 +29,7 @@ import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + /** * 颜色选择器自定义面板 @@ -492,7 +492,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec * @return The name displayed in the JColorChooser tab. */ public String getDisplayName() { - return Inter.getLocText("FR-Designer_Custom"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom"); } /** diff --git a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java index e00751f00..88e241341 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java @@ -22,7 +22,7 @@ import com.fr.base.GraphHelper; import com.fr.design.border.UITitledBorder; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + /** * The detail color select pane. @@ -36,7 +36,7 @@ public class DetailColorSelectPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Color")); + JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Color")); JPanel defaultPane =FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); this.add(titledefaultPane, BorderLayout.WEST); titledefaultPane.add(defaultPane); @@ -72,7 +72,7 @@ public class DetailColorSelectPane extends BasicPane { this.getFont().getStyle(), this.getFont().getSize() + 4)); colorPreviewLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 2, 2)); colorPreviewPane.add(colorPreviewLabel, BorderLayout.CENTER); - UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(Inter.getLocText("Preview")); + UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Preview")); colorPreviewPane.setBorder(explainBorder); this.addChangeListener(colorPreviewLabelChangeListener); diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index ab33c9caf..88d4f76f0 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -7,7 +7,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -57,7 +57,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); if (isSupportTransparent) { - UIButton transpanrentButton = new UIButton(Inter.getLocText("FR-Designer_ChartF-Transparency")); + UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); this.add(transpanrentButton, BorderLayout.NORTH); transpanrentButton.addActionListener(new ActionListener() { @@ -94,7 +94,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { centerPane.add(Box.createVerticalStrut(1)); // mod by anchore 16/11/16 - UIButton customButton = new UIButton(Inter.getLocText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java b/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java index 9d5cca4f8..e8500ad58 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java +++ b/designer-base/src/main/java/com/fr/design/style/color/SwatchChooserPanel.java @@ -17,7 +17,7 @@ import javax.swing.JColorChooser; import javax.swing.JPanel; import javax.swing.colorchooser.AbstractColorChooserPanel; -import com.fr.general.Inter; + public class SwatchChooserPanel extends AbstractColorChooserPanel{ /** The main panel that holds the set of choosable colors. */ @@ -577,7 +577,7 @@ public class SwatchChooserPanel extends AbstractColorChooserPanel{ */ public String getDisplayName() { - return Inter.getLocText("FR-Designer_Swatch"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Swatch"); } /** diff --git a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index 4758e358d..5e63ac72d 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java @@ -13,7 +13,7 @@ import javax.swing.JPanel; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + public abstract class TransparentPane extends BasicPane { @@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane { // richer:能否拖动 if (isSupportTransparent) { - UIButton transparentButton = new UIButton(Inter.getLocText("ChartF-Transparency")); + UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Transparency")); transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); transparentButton.addActionListener(new TransparentActionListener()); @@ -41,7 +41,7 @@ public abstract class TransparentPane extends BasicPane { initCenterPaneChildren(centerPane); - UIButton customButton = new CustomButton(Inter.getLocText("Custom") + UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Custom") + "..."); this.add(customButton, BorderLayout.SOUTH); customButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 4396cfc9e..84335dd91 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -17,7 +17,7 @@ import com.fr.file.FileFILE; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.general.http.HttpClient; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; @@ -236,7 +236,7 @@ public class DesignUtils { //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整. Locale designerLocale = FRContext.getLocale(); - String file = Inter.getLocText("FR-Designer_File"); + String file = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"); char displayChar = file.charAt(0); if (!guiFRFont.canDisplay(displayChar)) { //如果不能用默认的语言显示字体, 比如想在英文系统里用中文设计器 @@ -246,7 +246,7 @@ public class DesignUtils { //比如想在中文或英文系统里用韩文设计器 guiFRFont = getNamedFont("Dialog"); if (!guiFRFont.canDisplay(displayChar)) { - FRContext.getLogger().error(Inter.getLocText("FR-Base_SimSun_Not_Found")); + FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("FR-Base_SimSun_Not_Found")); } } } @@ -461,7 +461,7 @@ public class DesignUtils { } else if (ComparatorUtils.equals(message, RemoteDeziConstants.INVALID_USER)) { throw new EnvException(RemoteDeziConstants.INVALID_USER); } else if (ComparatorUtils.equals(message, RemoteDeziConstants.FILE_LOCKED)) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_file-is-locked")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_file-is-locked")); return null; } else if (message.startsWith(RemoteDeziConstants.RUNTIME_ERROR_PREFIX)) { } diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java index 69c1e63e9..e3cb5597b 100644 --- a/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java @@ -23,7 +23,7 @@ import com.fr.design.style.color.ColorFactory; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.style.color.ColorSelectable; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.OperatingSystem; import com.fr.stable.StringUtils; @@ -684,7 +684,7 @@ public abstract class GUICoreUtils{ return false; } - int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, Inter.getLocText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", Inter.getLocText("Remove"), + int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { int minSelectedIndex = nodeList.getMinSelectionIndex(); diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index f64454e0d..d7c6013b2 100644 --- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java +++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java @@ -20,7 +20,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreGraphHelper; import com.fr.stable.ListMap; @@ -69,7 +69,7 @@ public class CustomIconPane extends BasicPane { private void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Icon"))); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon"))); JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); centerPane.add(noNamePane, BorderLayout.CENTER); @@ -86,7 +86,7 @@ public class CustomIconPane extends BasicPane { noNamePane.add(jsPane); DescriptionTextArea des = new DescriptionTextArea(2); - des.setText(Inter.getLocText("FR-Designer_Custom_Icon_Message1")); + des.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message1")); centerPane.add(des, BorderLayout.SOUTH); this.add(centerPane, BorderLayout.CENTER); @@ -127,7 +127,7 @@ public class CustomIconPane extends BasicPane { } private void initAddButton(JPanel buttonPane) { - UIButton addButton = new UIButton(Inter.getLocText("FR-Designer_Add")); + UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); addButton.setPreferredSize(new Dimension(80, 25)); addButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -144,7 +144,7 @@ public class CustomIconPane extends BasicPane { }else { // add failed - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Custom_Icon_Message2"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); } } }).setVisible(true); @@ -155,7 +155,7 @@ public class CustomIconPane extends BasicPane { } private void initRemoveButton(JPanel buttonPane) { - removeButton = new UIButton(Inter.getLocText("FR-Designer_Remove")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); removeButton.setPreferredSize(new Dimension(80, 25)); removeButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -174,8 +174,8 @@ public class CustomIconPane extends BasicPane { } else { // remove failed JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("FR-Designer_Custom_Icon_Message2"), - Inter.getLocText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); } } @@ -184,7 +184,7 @@ public class CustomIconPane extends BasicPane { } private void initEditButton(JPanel buttonPane) { - editButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); editButton.setPreferredSize(new Dimension(80, 25)); editButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -222,7 +222,7 @@ public class CustomIconPane extends BasicPane { // 失败了再弄回去 iconManager.addIcon(oldIcon, true); // edit failed - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Custom_Icon_Message2"), Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); } } }).setVisible(true); @@ -246,7 +246,7 @@ public class CustomIconPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Custom_Icon_SelectIcon"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon"); } /** @@ -388,9 +388,9 @@ public class CustomIconPane extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p, p}; - UIButton browseButton = new UIButton(Inter.getLocText("FR-Designer_Custom_Icon_SelectIcon")); + UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon")); browseButton.setPreferredSize(new Dimension(80, 25)); - browseButton.setToolTipText(Inter.getLocText("FR-Designer_Click_this_button")); + browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Click_this_button")); nameTextField = new UITextField(20); browseButton.addActionListener(new ActionListener() { @@ -410,8 +410,8 @@ public class CustomIconPane extends BasicPane { } if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("FR-Designer_Custom_Icon_Message3"), - Inter.getLocText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message3"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.WARNING_MESSAGE); } } @@ -423,7 +423,7 @@ public class CustomIconPane extends BasicPane { showImageLabel.setPreferredSize(new Dimension(20,20)); imagePane.add(showImageLabel); imagePane.add(browseButton); - Component[][] components = {{new UILabel(Inter.getLocText("FR-Designer_Name") + ":"), nameTextField}, {new UILabel(Inter.getLocText("FR-Designer_Icon") + ":"), imagePane}}; + Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon") + ":"), imagePane}}; JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(centerPane, BorderLayout.CENTER); @@ -454,7 +454,7 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB); @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Add", "Icon"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Add_Icon"); } // 用户自定义的只有name 和 imgae两属性， path不要去管 diff --git a/designer-base/src/main/java/com/fr/design/widget/EventCreator.java b/designer-base/src/main/java/com/fr/design/widget/EventCreator.java index 87275d843..0ca2ed0b5 100644 --- a/designer-base/src/main/java/com/fr/design/widget/EventCreator.java +++ b/designer-base/src/main/java/com/fr/design/widget/EventCreator.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilist.ListModelElement; import com.fr.form.event.Listener; import com.fr.form.ui.FileEditor; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; @@ -40,7 +40,7 @@ public class EventCreator extends NameableSelfCreator { */ public static final String switchLang(String eventName) { try { - return Inter.getLocText("FR-Engine_Event_" + eventName); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Event_" + eventName); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); return eventName; diff --git a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java index 6bcc649a4..069caec0b 100644 --- a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.web.CustomIconPane; import com.fr.form.ui.WidgetInfoConfig; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -29,7 +29,7 @@ public class IconDefinePane extends BasicPane { labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0)); showIconImageLable = new UILabel(); showIconImageLable.setPreferredSize(new Dimension(20, 20)); - editIconButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); + editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); labelPane.add(showIconImageLable); iconPane.add(labelPane, BorderLayout.WEST); @@ -53,7 +53,7 @@ public class IconDefinePane extends BasicPane { } }); - removeIconButton = new UIButton(Inter.getLocText("FR-Designer_Delete")); + removeIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); iconButtonPane.add(removeIconButton); removeIconButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { diff --git a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java index 2d0fe314b..9133fd8fe 100644 --- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -25,8 +25,8 @@ public class WidgetBoundsPaneFactory { double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), createRightPane(width, height)}, - new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), createRightPane(width, height)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"), SwingConstants.CENTER))}, }; double[] rowSize = {p, p}; double[] columnSize = {p, f}; @@ -34,7 +34,7 @@ public class WidgetBoundsPaneFactory { final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); boundsPane.add(panel); - return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); } public static JPanel createRightPane(Component com1, Component com2){ double f = TableLayout.FILL; @@ -53,12 +53,12 @@ public class WidgetBoundsPaneFactory { double p = TableLayout.PREFERRED; Component[][] northComponents = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Position")), createRightPane(x, y)}, - new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Position")), createRightPane(x, y)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))}, }; Component[][] centerComponents = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), createRightPane(width, height)}, - new Component[]{null, createRightPane(new UILabel(Inter.getLocText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(Inter.getLocText("FR-Designer-Tree_Height"), SwingConstants.CENTER))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), createRightPane(width, height)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"), SwingConstants.CENTER))}, }; double[] rowSize = {p, p}; double[] columnSize = {p, f}; @@ -70,7 +70,7 @@ public class WidgetBoundsPaneFactory { centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); boundsPane.add(northPanel, BorderLayout.NORTH); boundsPane.add(centerPanel, BorderLayout.CENTER); - return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane); } @@ -79,7 +79,7 @@ public class WidgetBoundsPaneFactory { double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Size")), width}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), width}, }; double[] rowSize = {p}; double[] columnSize = {p, f}; @@ -87,6 +87,6 @@ public class WidgetBoundsPaneFactory { final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); boundsPane.add(panel); - return new UIExpandablePane(Inter.getLocText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); } } diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java index ee7f65f50..88fe545cf 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java @@ -3,7 +3,7 @@ package com.fr.design.widget.btn; import com.fr.form.ui.Button; import com.fr.form.ui.FreeButton; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import com.fr.stable.bridge.BridgeMark; import com.fr.stable.bridge.StableFactory; @@ -28,12 +28,12 @@ public class ButtonConstants { }; public static final String[] TYPES4BUTTON = { - Inter.getLocText("Common"), - Inter.getLocText("Custom"), - Inter.getLocText("Utils-Insert_Row"), - Inter.getLocText("Utils-Delete_Row"), - Inter.getLocText(new String[]{"Parameter", "Custom_Button_Type_Submit"}), - Inter.getLocText("Widget-TreeNode") + com.fr.design.i18n.Toolkit.i18nText("Common"), + com.fr.design.i18n.Toolkit.i18nText("Custom"), + com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"), + com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode") }; public static final Class[] CLASSES4BUTTON = { diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonDetailPane.java index 2a30eae1d..63d678577 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonDetailPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.icombobox.DictionaryComboBox; import com.fr.design.dialog.BasicPane; import com.fr.design.widget.btn.ButtonConstants; import com.fr.form.ui.Button; -import com.fr.general.Inter; + import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -25,7 +25,7 @@ public abstract class ButtonDetailPane extends BasicPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Button"); + return com.fr.design.i18n.Toolkit.i18nText("Button"); } public void populate(T button) { diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index 8db193684..db3e0ce0d 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor; import com.fr.form.ui.Button; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; /** @@ -43,10 +43,10 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt iconPane = new AccessibleIconEditor(); labelPane.add(iconPane); Component[][] n_components = { - {new UILabel(Inter.getLocText("FR-Designer_Button-Type")), createButtonTypeComboBox()}, - {new UILabel(Inter.getLocText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()}, - {new UILabel(Inter.getLocText("FR-Designer_Button-Icon")), iconPane}, - {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Type")), createButtonTypeComboBox()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Icon")), iconPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()}, }; hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ",")); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); @@ -56,7 +56,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt if(comp != null ) { advancePane.add(comp,BorderLayout.CENTER); } - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, advancePane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane); this.add(uiExpandablePane); } diff --git a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java index 77c42cead..54b7bf67b 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleImgBackgroundEditor; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -34,7 +34,7 @@ public abstract class BackgroundCompPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel headLabel = createUILable(); initBackgroundEditor(); - String [] titles = new String[]{Inter.getLocText("FR-Designer_DEFAULT"), Inter.getLocText("FR-Designer_Custom")}; + String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; double f = TableLayout.FILL; final double p = TableLayout.PREFERRED; @@ -42,8 +42,8 @@ public abstract class BackgroundCompPane extends BasicPane { double[] columnSize = {p, f}; int[][] rowCount = {{1, 1},{1, 1},{1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Initial")), initialBackgroundEditor}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background-Over")), overBackgroundEditor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")), initialBackgroundEditor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")), overBackgroundEditor}, new Component[]{getClickLabel(), clickBackgroundEditor}, }; panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); @@ -64,11 +64,11 @@ public abstract class BackgroundCompPane extends BasicPane { } protected UILabel getClickLabel(){ - return new UILabel(Inter.getLocText("FR-Designer_Background-Click")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")); } protected UILabel createUILable(){ - return new UILabel(Inter.getLocText("FR-Designer_Background")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")); } public void update(T e){ diff --git a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java index eed4b7fbf..623ff3564 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java @@ -16,7 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.CheckBoxGroup; import com.fr.form.ui.ComboCheckBox; -import com.fr.general.Inter; + public class CheckBoxDictPane extends JPanel { @@ -35,13 +35,13 @@ public class CheckBoxDictPane extends JPanel { endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays); endComboBox.setEditable(true); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Form-Delimiter")), delimiterComboBox}, - new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-Start_Symbol")),startComboBox}, - new Component[]{new UILabel(Inter.getLocText("ComboCheckBox-End_Symbol")),endComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")), delimiterComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")),startComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")),endComboBox} }; returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); - returnTypeComboBox = new UIButtonGroup(new String[]{Inter.getLocText("Widget-Array"), Inter.getLocText("String")}); + returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Widget-Array"), com.fr.design.i18n.Toolkit.i18nText("String")}); returnTypeComboBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -49,7 +49,7 @@ public class CheckBoxDictPane extends JPanel { } }); JPanel headPane = TableLayoutHelper.createGapTableLayoutPane( - new Component[][]{new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); + new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Date_Selector_Return_Type")), returnTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); jPanel.add(headPane, BorderLayout.NORTH); jPanel.add(returnStringPane, BorderLayout.CENTER); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index e96e885b9..0e922bfc6 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -8,7 +8,7 @@ import com.fr.design.editor.editor.FormulaEditor; import com.fr.design.editor.editor.NoneEditor; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -21,9 +21,9 @@ import java.awt.*; public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; - private static final String NONE_EDITOR_NAME = Inter.getLocText("None"); - private static final String DATE_EDITOR_NAME = Inter.getLocText("Date"); - private static final String FORMULA_EDITOR_NAME = Inter.getLocText("Parameter-Formula"); + private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None"); + private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); + private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"); public DateValuePane() { @@ -45,7 +45,7 @@ public class DateValuePane extends JPanel { @Override public void stateChanged(ChangeEvent e) { int index = widgetValueHead.getSelectedIndex(); - if (ComparatorUtils.equals(tabTitles[index], Inter.getLocText("None"))) { + if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) { customPane.setVisible(false); } else { customPane.setVisible(true); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index 89814e24a..550270dea 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.NumberEditor; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -55,19 +55,19 @@ public class NumberEditorValidatePane extends JPanel { private void initComponent() { initListeners(); - this.allowDecimalsCheckBox = new UICheckBox(Inter.getLocText("Allow_Decimals")); + this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Decimals")); allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener); this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16); - this.allowNegativeCheckBox = new UICheckBox(Inter.getLocText("Allow_Negative")); + this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Negative")); this.allowNegativeCheckBox.addActionListener(allowNegativeListener); allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.setMaxValueCheckBox = new UICheckBox(Inter.getLocText("Need_Max_Value"), false); + this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Max_Value"), false); setMaxValueCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.maxValueSpinner = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1D, 0D); this.setMaxValueCheckBox.addActionListener(setMaxListener); this.maxValueSpinner.addChangeListener(maxValueChangeListener); - this.setMinValueCheckBox = new UICheckBox(Inter.getLocText("Need_Min_Value"), false); + this.setMinValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Min_Value"), false); this.minValueSpinner = new UISpinner(-Double.MAX_VALUE, Double.MAX_VALUE, 1D, 0D); minValueSpinner.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.setMinValueCheckBox.addActionListener(setMinListener); @@ -77,7 +77,7 @@ public class NumberEditorValidatePane extends JPanel { JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0)); errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER); - UILabel numberLabel = new UILabel(Inter.getLocText(new String[]{"FR-Designer_Double", "Numbers"})); + UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")); limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0)); double f = TableLayout.FILL; @@ -100,7 +100,7 @@ public class NumberEditorValidatePane extends JPanel { private void initErrorMsgPane() { errorMsgTextField = new UITextField(); errorMsgTextFieldPane = TableLayoutHelper.createGapTableLayoutPane( - new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); + new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1); } diff --git a/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java b/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java index 392b4b500..7d1b5a43c 100644 --- a/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/mobile/WidgetMobilePane.java @@ -3,7 +3,7 @@ package com.fr.design.widget.mobile; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -23,7 +23,7 @@ public class WidgetMobilePane extends JPanel { protected void init() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - UILabel label = new UILabel(Inter.getLocText("FR-Designer_No_Settings_Available")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); label.setHorizontalAlignment(SwingConstants.CENTER); this.add(label); } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index c29c75148..1c228d853 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; @@ -37,12 +37,12 @@ public abstract class CustomJobPane extends BasicBeanPane { classNameTextField = new UITextField(getLengthOfTextField()); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(Inter.getLocText("FR-Designer_Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); browserButton.setPreferredSize(new Dimension( GraphHelper.getLocTextWidth("FR-Designer_Select") + 20, classNameTextField.getPreferredSize().height)); - UIButton editButton = new UIButton(Inter.getLocText("FR-Designer_Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); editButton.setPreferredSize(new Dimension( GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20, classNameTextField.getPreferredSize().height)); @@ -85,18 +85,18 @@ public abstract class CustomJobPane extends BasicBeanPane { } }); - reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_ClassName"), null)); + reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ClassName"), null)); this.add(reportletNamePane, BorderLayout.NORTH); objectProperiesPane = new ObjectProperiesPane(); - objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Property"), null)); + objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Property"), null)); this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); - area.setText(Inter.getLocText(new String[]{"Come_True", "Interface"}) + ":com.fr.data.AbstractSubmitTask"); + area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); dsPane.add(area); - dsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Custom_Job_Description"), null)); + dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null)); this.add(dsPane, BorderLayout.SOUTH); checkAddButtonEnable(); } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 56c3f5488..d46ae06b8 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -34,7 +34,6 @@ import com.fr.design.scrollruler.ModLineBorder; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.DateUtils; -import com.fr.general.Inter; import com.fr.general.data.Condition; import com.fr.stable.ColumnRow; import com.fr.stable.ColumnRowGroup; @@ -107,10 +106,10 @@ public class DBManipulationPane extends BasicBeanPane { private String subMitName; private static final String[] DML_CONFIG_TYPES = new String[] { - Inter.getLocText(new String[]{"Smart", "Submit"}), - Inter.getLocText(new String[]{"Delete", "Submit"}), - Inter.getLocText(new String[]{"Insert", "Submit"}), - Inter.getLocText(new String[]{"Update", "Submit"})}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Delete_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Update_Submit")}; /** * 无单元格。没有智能添加单元格等按钮 @@ -129,13 +128,13 @@ public class DBManipulationPane extends BasicBeanPane { dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES); - JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(Inter.getLocText(new String[]{"Choose", "Type"}) + ":"), dmlConfigComboBox }, + JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox }, FlowLayout.LEFT, 10); - typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText(new String[]{"Submit", "Type"}))); + typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Type"))); northPane.add(typePane, BorderLayout.NORTH); chooseTable = new ChoosePaneSupportFormula(); - chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Base_Table"))); + chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Table"))); chooseTable.setTableNameComboBoxPopSize(160, 320); northPane.add(chooseTable, BorderLayout.CENTER); @@ -143,7 +142,7 @@ public class DBManipulationPane extends BasicBeanPane { // peter:编辑的TablePane JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(editTablePane, BorderLayout.CENTER); - editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("FR-Base_Value"))); + editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"))); keyColumnValuesTable = new KeyColumnNameValueTable(); editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); @@ -182,13 +181,13 @@ public class DBManipulationPane extends BasicBeanPane { checkBoxUpdatePane.setPreferredSize(new Dimension(120,20)); controlBtnPane.add(checkBoxUpdatePane); - UpdateCheckBox = new UICheckBox(Inter.getLocText("RWA-NotChange_Unmodified")); + UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified")); UIButton helpButton = new UIButton(HEIP_ICON); - helpButton.setToolTipText(Inter.getLocText("FR-Base_Help")); + helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help")); helpButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - FormatExplanationPane formatExplanation = new FormatExplanationPane(Inter.getLocText("FR-Base_Help"),Inter.getLocText("FR-Designer_RWA-Help"), 12f); + FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this), new DialogActionAdapter(){}); dlg.setVisible(true); @@ -239,7 +238,7 @@ public class DBManipulationPane extends BasicBeanPane { } private UIButton addEventButton() { - UIButton addSubmitEventButton = new UIButton(Inter.getLocText("FR-Designer_Set_Submit_Event")); + UIButton addSubmitEventButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Event")); addSubmitEventButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -276,7 +275,7 @@ public class DBManipulationPane extends BasicBeanPane { JScrollPane jp = new JScrollPane(conditionsTree); addComponent(conditionPane,jp); - UIButton addSubmitConditionButton = new UIButton(Inter.getLocText("FR-Designer_Set_Submit_Condition")); + UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Condition")); addSubmitConditionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -310,7 +309,7 @@ public class DBManipulationPane extends BasicBeanPane { protected void setBorderAndLayout(JPanel jPanel){ jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setBorder(BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("Fine-Designer_Submit_Condition"))); + new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Submit_Condition"))); } protected void addComponent(JPanel mainPane,JScrollPane addPane){ @@ -411,7 +410,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class SmartAddFieldsAction extends UpdateAction { public SmartAddFieldsAction() { - this.setName(Inter.getLocText("RWA-Smart_Add_Fields")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Smart_Add_Fields")); } public void actionPerformed(ActionEvent evt) { @@ -419,12 +418,12 @@ public class DBManipulationPane extends BasicBeanPane { BasicPane bPane = new BasicPane() { @Override protected String title4PopupWindow() { - return Inter.getLocText("RWA-Smart_Add_Fields"); + return com.fr.design.i18n.Toolkit.i18nText("RWA-Smart_Add_Fields"); } }; bPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, Inter.getLocText("FR-Designer_Chart_Field_Name")) { + final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Field_Name")) { public String value2Text(Object value) { if (value instanceof ColumnName) { return ((ColumnName)value).name; @@ -476,9 +475,9 @@ public class DBManipulationPane extends BasicBeanPane { } for (int j = 0; j < keyColumnNameValueList.size(); j++) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { - Object[] options = { Inter.getLocText("FR-Designer_Covered_All"), Inter.getLocText("FR-Base_Yes"), Inter.getLocText("FR-Base_No"), Inter.getLocText("FR-Designer_Cover_None") }; - returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, keyColumnNameValueList.get(j).cn.name - + Inter.getLocText( new String[] {"Has_Existed", "Want_To_Cover_It"}, new String[] {",", "？"}), + Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; + returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); // Richie:全部覆盖 if (returnValue == 0) { @@ -552,7 +551,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class AddFieldAction extends UpdateAction { public AddFieldAction() { - this.setName(Inter.getLocText("RWA-Add_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Add_Field")); } public void actionPerformed(ActionEvent e) { @@ -569,7 +568,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class RemoveFieldAction extends UpdateAction { public RemoveFieldAction() { - this.setName(Inter.getLocText("RWA-Remove_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Remove_Field")); } public void actionPerformed(ActionEvent evt) { @@ -581,7 +580,7 @@ public class DBManipulationPane extends BasicBeanPane { } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this), - Inter.getLocText("FR-Base_sure_remove_item") + "?", Inter.getLocText("FR-Base_Remove"), JOptionPane.OK_CANCEL_OPTION, + com.fr.design.i18n.Toolkit.i18nText("FR-Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Base_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel(); @@ -816,7 +815,7 @@ public class DBManipulationPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); } public void populateBean(Object object) { @@ -945,9 +944,9 @@ public class DBManipulationPane extends BasicBeanPane { } protected abstract static class KeyColumnTableModel extends AbstractTableModel { - public static final String RAW_KEY = Inter.getLocText("FR-Base_RWA-Key"); - public static final String COLUMN = Inter.getLocText("FR-Base_Column"); - public static final String VALUE = Inter.getLocText("FR-Base_Value"); + public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("FR-Base_RWA-Key"); + public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Column"); + public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"); public static final String[] COLUMN_NAMES = new String[]{RAW_KEY, COLUMN, VALUE}; diff --git a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java index f7de46eeb..5eadb5f66 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java @@ -1,13 +1,12 @@ package com.fr.design.write.submit; -import com.fr.general.NameObject; import com.fr.data.ClassSubmitJob; import com.fr.data.SubmitJob; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; -import com.fr.general.Inter; +import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.write.DMLConfigJob; import com.fr.write.NameSubmitJob; @@ -29,12 +28,12 @@ public class SubmitJobListPane extends ObjectJControlPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[] { new NameObjectCreator( - Inter.getLocText(new String[]{"Submit", "Event"}), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Event"), "/com/fr/web/images/reportlet.png", DMLConfigJob.class, DMLJobPane.class), new NameObjectCreator( - Inter.getLocText(new String[]{"Custom", "Event"}), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Custom_Event"), "/com/fr/web/images/reportlet.png", ClassSubmitJob.class, CustomSubmitJobPane.class) @@ -58,6 +57,6 @@ public class SubmitJobListPane extends ObjectJControlPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Set_Submit_Event"); + return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index 3cd8b3c8c..6b536b82b 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -8,7 +8,6 @@ import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; @@ -33,18 +32,14 @@ public class EnvListPane extends JListControlPane { String[] allListNames = nameableList.getAllNames(); allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; if (StringUtils.isEmpty(tempName)) { - String[] warning = new String[]{"NOT_NULL_Des", "Please_Rename"}; - String[] sign = new String[]{",", "!"}; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), Inter.getLocText(warning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Empty_Name_Warn_Text")); setWarnigText(editingIndex); return; } if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) { - String[] waning = new String[]{"already_exists", "Utils-Report_Runtime_Env", "Please_Rename"}; - String[] sign = new String[]{"", tempName + ",", "!"}; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), Inter.getLocText(waning, sign)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Duplicate_Name_Warn_Text", tempName)); setWarnigText(editingIndex); } } @@ -58,16 +53,16 @@ public class EnvListPane extends JListControlPane { */ @Override public NameableCreator[] createNameableCreators() { - NameableCreator local = new NameObjectCreator(Inter.getLocText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", + NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); - NameableCreator remote = new NameObjectCreator(Inter.getLocText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", - RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); + NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", + RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class); return new NameableCreator[]{local, remote}; } @Override protected String title4PopupWindow() { - return Inter.getLocText("Env-Configure_Workspace"); + return com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace"); } /** diff --git a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java index 641214503..84a47acd6 100644 --- a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itree.filetree.JFileTree; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.file.filter.OnlyShowDirectoryFileFilter; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.JPanel; @@ -33,7 +33,7 @@ public class LocalEnvPane extends BasicBeanPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(northPane, BorderLayout.NORTH); - northPane.add(new UILabel(Inter.getLocText("Location") + ":"), BorderLayout.WEST); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); // 删除选择文件按钮 添加JFileTree @@ -60,13 +60,13 @@ public class LocalEnvPane extends BasicBeanPane { UITextArea description = new UITextArea(); centerPane.add(description, BorderLayout.SOUTH); - description.setText(Inter.getLocText("Env-Des1")); + description.setText(com.fr.design.i18n.Toolkit.i18nText("Env-Des1")); description.setEditable(false); } @Override protected String title4PopupWindow() { - return Inter.getLocText("Location"); + return com.fr.design.i18n.Toolkit.i18nText("Location"); } @Override diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index c47c67444..dc39232b1 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.scrollruler.ModLineBorder; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.third.guava.base.Strings; import com.fr.workspace.WorkContext; @@ -64,14 +64,14 @@ public class RemoteEnvPane extends BasicBeanPane { private JDialog dialog; private UILabel message = new UILabel(); - private UIButton okButton = new UIButton(Inter.getLocText("OK")); - private UIButton cancelButton = new UIButton(Inter.getLocText("Cancel")); + private UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + private UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); private UILabel uiLabel = new UILabel(); /** * 是否启用 https 勾选框 */ - private UICheckBox httpsCheckbox = new UICheckBox(Inter.getLocText("FR-Designer_RemoteEnv_Enable_Https")); + private UICheckBox httpsCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Enable_Https")); /** * 主机位置输入框 */ @@ -123,11 +123,11 @@ public class RemoteEnvPane extends BasicBeanPane { /** * https 密钥标签 */ - private UILabel certSecretKeyLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Https_Secret_Key")); + private UILabel certSecretKeyLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Secret_Key")); /** * https证书路径标签 */ - private UILabel certPathLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Https_Cert_Path")); + private UILabel certPathLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Cert_Path")); /** * https 证书路径输入框 */ @@ -202,7 +202,7 @@ public class RemoteEnvPane extends BasicBeanPane { contentPanel.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Inter.getLocText("FR-Designer_RemoteEnv_Config"))) + UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Config"))) ); @@ -213,7 +213,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - Inter.getLocText("FR-Designer_RemoteEnv_Server") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Server") ) ) ); @@ -232,7 +232,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - Inter.getLocText("FR-Designer_RemoteEnv_Platform_Account") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Platform_Account") ) )); @@ -243,9 +243,9 @@ public class RemoteEnvPane extends BasicBeanPane { JPanel testPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); testPanel.setBorder(BorderFactory.createEmptyBorder()); testPanel.setPreferredSize(new Dimension(437, 20)); - UIButton testConnectionButton = new UIButton(Inter.getLocText("FR-Designer_RemoteEnv_Test_Connection")); + UIButton testConnectionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Test_Connection")); - testConnectionButton.setToolTipText(Inter.getLocText("Datasource-Test_Connection")); + testConnectionButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); testConnectionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ev) { @@ -318,19 +318,19 @@ public class RemoteEnvPane extends BasicBeanPane { // 主机名 - UILabel hostNameLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Host_IP")); + UILabel hostNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Host_IP")); hostNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 端口 - UILabel portLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Port")); + UILabel portLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Port")); portLabel.setHorizontalAlignment(SwingConstants.RIGHT); // web应用 - UILabel webAppNameLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Web_Name")); + UILabel webAppNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Web_Name")); webAppNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // servlet - UILabel servletNameLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Servlet_Name")); + UILabel servletNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Servlet_Name")); servletNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 主机位置 - UILabel remoteEnvURLLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_URL")); + UILabel remoteEnvURLLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_URL")); remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.RIGHT); enableSubDocListener(); @@ -354,7 +354,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane urlTipsPane = new JTextPane(); urlTipsPane.setEditable(false); - urlTipsPane.setText(Inter.getLocText("FR-Designer_RemoteEnv_Server_Config_Tips")); + urlTipsPane.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Server_Config_Tips")); urlTipsPane.setBackground(urlPanel.getBackground()); urlTipsPane.setForeground(TIPS_FONT_COLOR); @@ -368,7 +368,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane httpsTipsPane = new JTextPane(); httpsTipsPane.setEditable(false); - httpsTipsPane.setText(Inter.getLocText("FR-Designer_RemoteEnv_Https_Tips")); + httpsTipsPane.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Tips")); httpsTipsPane.setBackground(configPanel.getBackground()); httpsTipsPane.setForeground(TIPS_FONT_COLOR); @@ -426,10 +426,10 @@ public class RemoteEnvPane extends BasicBeanPane { private void packAccountPanel(JPanel accountPanel) { // 用户名 - UILabel userNameLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Account_Username")); + UILabel userNameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Username")); userNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 密码 - UILabel passwordLabel = new UILabel(Inter.getLocText("FR-Designer_RemoteEnv_Account_Password")); + UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Password")); passwordLabel.setHorizontalAlignment(SwingConstants.RIGHT); //输入密码的时候检测下大写锁定 @@ -437,7 +437,7 @@ public class RemoteEnvPane extends BasicBeanPane { @Override public void mouseEntered(MouseEvent e) { if (Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) { - passwordInput.setToolTipText(Inter.getLocText("CapsLock")); + passwordInput.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("CapsLock")); } else { passwordInput.setToolTipText(null); } @@ -497,7 +497,7 @@ public class RemoteEnvPane extends BasicBeanPane { try { return WorkContext.getConnector().testConnection(connection); } catch (AuthException e) { - message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); + message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); return null; } @@ -508,14 +508,14 @@ public class RemoteEnvPane extends BasicBeanPane { okButton.setEnabled(true); try { if (get()) { - message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Successful")); + message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); } else { - message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } } catch (InterruptedException | ExecutionException e) { - message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } } @@ -545,11 +545,11 @@ public class RemoteEnvPane extends BasicBeanPane { } private void initMessageDialog() { - message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Try") + "..."); + message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); - dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Inter.getLocText("Datasource-Test_Connection"), true); + dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"), true); dialog.setSize(new Dimension(268, 118)); okButton.setEnabled(false); diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane2.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane2.java index 5f6928ec2..dc0ee27bf 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane2.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane2.java @@ -12,7 +12,7 @@ //import com.fr.design.layout.TableLayout; //import com.fr.design.layout.TableLayoutHelper; //import com.fr.design.utils.gui.GUICoreUtils; -//import com.fr.general.Inter; +// //import com.fr.workspace.WorkContext; //import com.fr.workspace.connect.WorkspaceConnection; // @@ -50,21 +50,21 @@ // contentPanel.setBorder( // BorderFactory.createCompoundBorder( // new EmptyBorder(6, 0, 0, 0), -// UITitledBorder.createBorderWithTitle(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Config"))) +// UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Config"))) // ); // // double p = TableLayout.PREFERRED; // double f = TableLayout.FILL; // double[] rowSize = new double[]{p, p, p, p}; // double[] columnSize = new double[]{p, f}; -// UIButton testConnectionButton = new UIButton(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Try")); +// UIButton testConnectionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try")); // urlTextField = new UITextField(); // urlTextField.setPlaceholder("http://192.168.100.200/webroot/decision"); // JPanel valuePane = TableLayoutHelper.createTableLayoutPane( // new Component[][]{ -// {new UILabel(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Host") + ":", SwingConstants.RIGHT), urlTextField}, -// {new UILabel(Inter.getLocText("Fine-Designer_Basic_Remote_Env_User") + ":", SwingConstants.RIGHT), usernameTextField = new UITextField()}, -// {new UILabel(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Password") + ":", SwingConstants.RIGHT), passwordTextField = new UIPassWordField()}, +// {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Host") + ":", SwingConstants.RIGHT), urlTextField}, +// {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_User") + ":", SwingConstants.RIGHT), usernameTextField = new UITextField()}, +// {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Password") + ":", SwingConstants.RIGHT), passwordTextField = new UIPassWordField()}, // {null, GUICoreUtils.createFlowPane(testConnectionButton, FlowLayout.LEFT)} // }, // rowSize, columnSize @@ -78,8 +78,8 @@ // contentPanel.add(valuePane, BorderLayout.CENTER); // // message = new UILabel(); -// okButton = new UIButton(Inter.getLocText("OK")); -// cancelButton = new UIButton(Inter.getLocText("Cancel")); +// okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); +// cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); // } // // private void tryConnectRemoteEnv() { @@ -98,9 +98,9 @@ // okButton.setEnabled(true); // try { // get(); -// message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Successful")); +// message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); // } catch (Exception e) { -// message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Connect_Failed")); +// message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); // } // } // }; @@ -129,11 +129,11 @@ // } // // private void initMessageDialog() { -// message.setText(Inter.getLocText("Fine-Designer_Basic_Remote_Env_Try") + "..."); +// message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); // message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); // okButton.setEnabled(false); // -// dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane2.this), Inter.getLocText("Datasource-Test_Connection"), true); +// dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane2.this), com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"), true); // // dialog.setSize(new Dimension(268, 118)); // okButton.setEnabled(false); diff --git a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java index 8185cb632..047f4e5f7 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + public class RemoteSignInPane extends BasicPane { private UITextField userTextField; @@ -22,9 +22,9 @@ public class RemoteSignInPane extends BasicPane { public void initComponent(){ this.setLayout(FRGUIPaneFactory.create2ColumnGridLayout()); - userLabel = new UILabel(Inter.getLocText("Username")+":"); + userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username")+":"); userTextField = new UITextField(); - passLabel = new UILabel(Inter.getLocText("Password")+":"); + passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password")+":"); passwordField = new UIPassWordField(); this.add(userLabel); this.add(userTextField); diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index 34217c460..f69ed1177 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -25,7 +25,7 @@ import com.fr.file.filter.ChooseFileFilter; import com.fr.file.filter.FILEFilter; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.OperatingSystem; @@ -243,11 +243,11 @@ public class FILEChooserPane extends BasicPane { // 用createTableLayoutPane布局下fileNamePane Component[][] coms = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("Utils-File_name") + ":"), BorderLayout.WEST), - fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(Inter.getLocText("Utils-Design-File_Open")) + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_name") + ":"), BorderLayout.WEST), + fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open")) }, - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("Utils-File_type") + ":"), BorderLayout.WEST), - postfixComboBox = new UIComboBox(), cancelButton = new UIButton(Inter.getLocText("Utils-Design-Action_Cancel")) + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":"), BorderLayout.WEST), + postfixComboBox = new UIComboBox(), cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Design-Action_Cancel")) }}; JPanel fileNamePane = TableLayoutHelper.createGapTableLayoutPane(coms, new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, @@ -255,7 +255,7 @@ public class FILEChooserPane extends BasicPane { centerRightPane.add(fileNamePane, BorderLayout.SOUTH); Component[][] outComponents = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("FR-App-File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, new Component[]{centerLeftPanel, centerRightPane}}; JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL}, new double[]{TableLayout.PREFERRED, TableLayout.FILL}); @@ -334,7 +334,7 @@ public class FILEChooserPane extends BasicPane { } protected String getEnvProjectName() { - return Inter.getLocText("Utils-Report-Env_Directory"); + return com.fr.design.i18n.Toolkit.i18nText("Utils-Report-Env_Directory"); } /** @@ -541,48 +541,44 @@ public class FILEChooserPane extends BasicPane { protected void fileType() { String appName = ProductConstants.APP_NAME; JTemplate editing = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); - if (FileExtension.CRT.matchExtension(suffix)) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CRT, appName + Inter.getLocText(new String[]{"Utils-The-Chart", "FR-App-All_File"}))); - return; - } if (editing == null || !editing.isChartBook()) { String[] fileSuffix_local = LocalFileNodes.FILE_TYPE; EnumSet fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT); if (type == JFileChooser.OPEN_DIALOG) { if (WorkContext.getCurrent().isLocal()) { //本地连接 - this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"}))); + this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); } else { - this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"}))); + this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); } } // ben:filefilter设置初值为cpt过滤 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"}))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + Inter.getLocText(new String[]{"FR-App-Report_Template", "FR-App-All_File"}))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); // richer:form文件 daniel 改成三个字 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + Inter.getLocText(new String[]{"FR-App-Template_Form", "FR-App-All_File"}))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + Inter.getLocText(new String[]{"FR-App-Template_Form", "FR-App-All_File"}))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); } else { if (type == JFileChooser.OPEN_DIALOG) { - this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), Inter.getLocText("Import-Excel_Source"))); + this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); } } // 添加 xls 文件类型过滤 kt if (WorkContext.getCurrent().isLocal()) { //本地连接 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLS, Inter.getLocText("Import-Excel_Source"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, Inter.getLocText("Import-Excel2007_Source"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Import-Excel2007_Source"))); } if (FileExtension.PNG.matchExtension(suffix)) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, Inter.getLocText("FR-App-Export_png"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("FR-App-Export_png"))); } if (type == JFileChooser.SAVE_DIALOG) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, Inter.getLocText("FR-Import-Export_PDF"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.SVG, Inter.getLocText("FR-Import-Export_SVG"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CSV, Inter.getLocText("FR-Import-Export_CSV"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.DOC, Inter.getLocText("FR-Import-Export_Word"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.TXT, Inter.getLocText("FR-Import-Export_Text"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_PDF"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_SVG"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_CSV"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_Word"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_Text"))); } } @@ -595,7 +591,7 @@ public class FILEChooserPane extends BasicPane { } if (WorkContext.getCurrent().isLocal()) { //本地连接 if (!showWebReport) { - defaultComboBoxModel.addElement(Inter.getLocText("FR-Utils-App_AllFiles") + "(*.*)"); + defaultComboBoxModel.addElement(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-App_AllFiles") + "(*.*)"); } } // 默认选取的文件类型(.cpt)类型 @@ -651,7 +647,7 @@ public class FILEChooserPane extends BasicPane { saveDictionary(); dialogExit(); } else { - JOptionPane.showMessageDialog(this, Inter.getLocText("FR-App-Template_Report_Not_Exist")); + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Report_Not_Exist")); return; } } @@ -692,11 +688,11 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, Inter.getLocText("FR-App-Privilege_No") + "!", Inter.getLocText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); return; } if (selectedFile.exists()) { - int selVal = JOptionPane.showConfirmDialog(dialog, Inter.getLocText("FR-Utils-Would_you_like_to_cover_the_current_file") + " ?", + int selVal = JOptionPane.showConfirmDialog(dialog, com.fr.design.i18n.Toolkit.i18nText("FR-Utils-Would_you_like_to_cover_the_current_file") + " ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE); if (selVal == JOptionPane.YES_OPTION) { returnValue = JOPTIONPANE_OK_OPTION; @@ -745,7 +741,7 @@ public class FILEChooserPane extends BasicPane { * dialog的名字 */ private String dialogName() { - return type == JFileChooser.OPEN_DIALOG ? Inter.getLocText("Utils-Design-File_Open") : Inter.getLocText("FR-App-Template_Save"); + return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Save"); } /* @@ -1035,7 +1031,7 @@ public class FILEChooserPane extends BasicPane { // String okButtonText; // if (file != null && file.isDirectory() // && this.fileNameTextField.getText().length() == 0) { - // okButtonText = Inter.getLocText("Open");// + "(O)"; + // okButtonText = com.fr.design.i18n.Toolkit.i18nText("Open");// + "(O)"; // } else { // okButtonText = dialogName(); // } @@ -1410,11 +1406,11 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, Inter.getLocText("FR-App-Privilege_No") + "!", Inter.getLocText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); return; } - String res = JOptionPane.showInputDialog(Inter.getLocText("FR-Utils-Please_Input_a_New_Name")); + String res = JOptionPane.showInputDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-Please_Input_a_New_Name")); if (res != null) { currentDirectory.createFolder(res); @@ -1448,7 +1444,7 @@ public class FILEChooserPane extends BasicPane { folderButton.setEnabled(false); folderButton.setMargin(new Insets(0, 0, 0, 0)); folderButton.setUI(new BasicButtonUI()); - folderButton.setToolTipText(Inter.getLocText("FR-Utils-New_Folder")); + folderButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-New_Folder")); folderButton.addActionListener(createFolderActionListener); return folderButton; } diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index 55aa49158..666bb4e61 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -7,7 +7,7 @@ import com.fr.design.gui.itree.filetree.FileNodeComparator; import com.fr.design.gui.itree.filetree.FileTreeIcon; import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.workspace.resource.WorkResourceOutputStream; import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; @@ -100,7 +100,7 @@ public class FileNodeFILE implements FILE { } if (ComparatorUtils.equals(node.getEnvPath(), ProjectConstants.REPORTLETS_NAME)) { - return Inter.getLocText("Utils-Report_Runtime_Env"); + return com.fr.design.i18n.Toolkit.i18nText("Utils-Report_Runtime_Env"); } else { return node.getName(); } diff --git a/designer-base/src/main/java/com/fr/start/ServerStarter.java b/designer-base/src/main/java/com/fr/start/ServerStarter.java index 171b1c31d..12f4b48eb 100644 --- a/designer-base/src/main/java/com/fr/start/ServerStarter.java +++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java @@ -13,7 +13,7 @@ import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.mainframe.DesignerContext; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -98,7 +98,7 @@ public class ServerStarter { // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开. Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri); } catch (IOException ee) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); FineLoggerFactory.getLogger().error(e.getMessage(), e); } } else { diff --git a/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java b/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java index 51cdfc3b1..6f88b0b2a 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java +++ b/designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.DesignUtils; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -70,7 +70,7 @@ public class ServerManageFrame extends JFrame { UIButton startButton = new UIButton(); startPane.add(startButton); startButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/start.png")); - startPane.add(new UILabel(Inter.getLocText("Server-Start"))); + startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Start"))); startButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -87,7 +87,7 @@ public class ServerManageFrame extends JFrame { UIButton stopButton = new UIButton(); stopPane.add(stopButton); stopButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/stop.png")); - stopPane.add(new UILabel(Inter.getLocText("Server-Stop"))); + stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Server-Stop"))); stopButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { @@ -104,7 +104,7 @@ public class ServerManageFrame extends JFrame { contentPane.add(infoPane, BorderLayout.SOUTH); infoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 0)); - infoPane.add(new UILabel(Inter.getLocText("Log") + ":"), BorderLayout.WEST); + infoPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Log") + ":"), BorderLayout.WEST); UITextField logPathTextField = new UITextField(); infoPane.add(logPathTextField, BorderLayout.CENTER); logPathTextField.setEditable(false); @@ -112,7 +112,7 @@ public class ServerManageFrame extends JFrame { UIButton openButton = new UIButton(); infoPane.add(openButton, BorderLayout.EAST); openButton.setIcon(BaseUtils.readIcon("/com/fr/design/images/server/view.png")); - openButton.setToolTipText(Inter.getLocText("Open")); + openButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Open")); // openButton.addActionListener(new ActionListener() { // public void actionPerformed(ActionEvent evt) { // @@ -126,7 +126,7 @@ public class ServerManageFrame extends JFrame { // }); this.setSize(420, 160); - this.setTitle(Inter.getLocText("Server-Embedded_Server")); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server")); GUICoreUtils.centerWindow(this); } diff --git a/designer-base/src/main/java/com/fr/start/server/ServerTray.java b/designer-base/src/main/java/com/fr/start/server/ServerTray.java index 5663b27a9..af8c322bc 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerTray.java +++ b/designer-base/src/main/java/com/fr/start/server/ServerTray.java @@ -5,7 +5,7 @@ import com.fr.base.FRContext; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.ListenerAdaptor; -import com.fr.general.Inter; + import java.awt.*; import java.awt.event.ActionEvent; @@ -38,7 +38,7 @@ public class ServerTray { listen(); //p:首先构建右键菜单 PopupMenu popup = new PopupMenu(); - MenuItem manangeMenu = new MenuItem(Inter.getLocText("Server-Open_Service_Manager")); + MenuItem manangeMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Server-Open_Service_Manager")); manangeMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -50,9 +50,9 @@ public class ServerTray { serverManageFrame.toFront();//p:到第一个. } }); - startMenu = new MenuItem(Inter.getLocText("FR-Server_Embedded_Server_Start")); - stopMenu = new MenuItem(Inter.getLocText("FR-Server_Embedded_Server_Stop")); - MenuItem exitMenu = new MenuItem(Inter.getLocText("Exit")); + startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Server_Embedded_Server_Start")); + stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Server_Embedded_Server_Stop")); + MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Exit")); //创建打开监听器 ActionListener startListener = new ActionListener() { @@ -96,7 +96,7 @@ public class ServerTray { popup.add(exitMenu); //p:开始创建托盘. - trayIcon = new TrayIcon(trayStartedImage, Inter.getLocText("Server-Embedded_Server"), popup); + trayIcon = new TrayIcon(trayStartedImage, com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server"), popup); trayIcon.setImageAutoSize(true); trayIcon.addMouseListener(new MouseAdapter() { diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java index ae451b5ab..ee6c5a8a7 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -39,7 +39,7 @@ import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.form.ui.ChartEditor; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.plugin.chart.area.VanChartAreaPlot; import com.fr.plugin.chart.bubble.VanChartBubblePlot; @@ -131,7 +131,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr } String iconPath = ChartTypeInterfaceManager.getInstance().getIconPath(plotID); Icon icon = IOUtils.readIcon(iconPath); - child[i] = new ChartWidgetOption(Inter.getLocText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]); + child[i] = new ChartWidgetOption(com.fr.design.i18n.Toolkit.i18nText(typeName[i].getName()), icon, ChartEditor.class, rowChart[0]); allCharts[i] = rowChart; } diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java index f9d7891f6..eb1c266bd 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartControlPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; @@ -30,13 +30,13 @@ public class ChartControlPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(Inter.getLocText("Chart"), Chart.class, ChartTypeUpdatePane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Chart"), Chart.class, ChartTypeUpdatePane.class) }; } @Override protected String title4PopupWindow() { - return Inter.getLocText("Chart-Manage_Chart_Type"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Manage_Chart_Type"); } public void populate(ChartCollection cc) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index 500b4f964..af5c7b7f7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -14,7 +14,7 @@ import com.fr.chart.chartattr.ChartCollection; import com.fr.design.gui.chart.MiddleChartDialog; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.dialog.BasicDialog; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; /** @@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog { this.setModal(true); this.setLayout(new BorderLayout()); final ChartTypePane chartTypePane = new ChartTypePane(); - setTitle(Inter.getLocText("M-Popup_ChartType")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")); this.applyClosingAction(); this.applyEscapeAction(); @@ -55,8 +55,8 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); - ok = new UIButton(Inter.getLocText("OK")); - cancel = new UIButton(Inter.getLocText("Cancel")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); buttonPane.add(ok); buttonPane.add(cancel); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index 995b8370b..9b7ca0b78 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -15,7 +15,7 @@ import com.fr.chart.charttypes.ChartTypeManager; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.license.exception.RegistEditionException; import com.fr.license.function.VT4FR; @@ -60,7 +60,7 @@ public class ChartTypePane extends ChartCommonWizardPane { mainTypeList = new JList(defaultListModel); for (int i = 0; i < typeName.length; i++) { - defaultListModel.insertElementAt(Inter.getLocText(typeName[i].getName()), i); + defaultListModel.insertElementAt(com.fr.design.i18n.Toolkit.i18nText(typeName[i].getName()), i); } mainTypeList.addListSelectionListener(listSelectionListener); @@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane { JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("M-Popup_ChartType"))); + spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"))); this.add(spane); iconViewList.setSelectedIndex(0); @@ -157,7 +157,7 @@ public class ChartTypePane extends ChartCommonWizardPane { Chart chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()]; if(chart.getPlot() != null){ if(chart.getPlot() instanceof MapPlot && !supportMap()){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Chart-Map_Not_Supported")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Not_Supported")); throw new RegistEditionException(VT4FR.ChartMap); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/AxisStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/AxisStylePane.java deleted file mode 100644 index 907682081..000000000 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/AxisStylePane.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.fr.design.chart.axis; - -import com.fr.general.Inter; -import com.fr.design.dialog.BasicPane; - -public abstract class AxisStylePane extends BasicPane { - private static final long serialVersionUID = 8969849654720197617L; - - public abstract void populate(T axis); - - public abstract void update(T axis); - - @Override - protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Set", "ChartF-Axis", "Format"}); - } -} \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java index 9d5e49073..e07379c69 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertLinePane.java @@ -1,6 +1,6 @@ package com.fr.design.chart.axis; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.chart.chartattr.ChartAlertValue; @@ -15,14 +15,14 @@ public class ChartAlertLinePane extends JListControlPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(Inter.getLocText("ChartF-Alert-Line"), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), ChartAlertValue.class, ChartAlertValuePane.class) }; } @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Edit", "ChartF-Alert-Line"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "ChartF-Alert-Line"}); } public void populate(ChartAlertValue[] alertList) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java index c4e254202..124a582e4 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValueInTopBottomPane.java @@ -1,6 +1,6 @@ package com.fr.design.chart.axis; -import com.fr.general.Inter; + /** @@ -11,10 +11,10 @@ import com.fr.general.Inter; public class ChartAlertValueInTopBottomPane extends ChartAlertValuePane { protected String getLeftName() { - return Inter.getLocText("Chart_Alert_Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Bottom"); } protected String getRightName() { - return Inter.getLocText("Chart_Alert_Top"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Top"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java index 4fc0b56b0..d599c19e6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java @@ -20,7 +20,7 @@ import com.fr.design.style.FRFontPane; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; @@ -61,12 +61,12 @@ public class ChartAlertValuePane extends BasicBeanPane { JPanel alertLinePane =FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(alertLinePane); - alertLinePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"ChartF-Alert-Line", "Set"}))); + alertLinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Alert-Line", "Set"}))); JPanel valuePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); alertLinePane.add(valuePane); - valuePane.add(new UILabel(Inter.getLocText(new String[]{"ChartF_Alert", "Value"}) + ":")); + valuePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF_Alert", "Value"}) + ":")); textField = new UITextField(); textField.setColumns(4); @@ -88,14 +88,14 @@ public class ChartAlertValuePane extends BasicBeanPane { JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); alertLinePane.add(lineStylePane); - lineStylePane.add(new UILabel(Inter.getLocText("Line-Style") + ":")); + lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style") + ":")); lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); lineStylePane.add(lineCombo); JPanel lineColorPane =FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); alertLinePane.add(lineColorPane); - lineColorPane.add(new UILabel(Inter.getLocText(new String[]{"ChartF-Alert-Line", "Color"}) + ":")); + lineColorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Alert-Line", "Color"}) + ":")); colorBox = new ColorSelectBox(80); lineColorPane.add(colorBox); @@ -105,7 +105,7 @@ public class ChartAlertValuePane extends BasicBeanPane { JPanel tipPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(tipPane); - tipPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Chart_Alert_Tip") + ":", null)); + tipPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Tip") + ":", null)); JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); tipPane.add(centerPane); @@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane { double[] rowSize = {t, t, t, t, t}; double[] columnSize = {0.1, 0.2, 0.5, 0.2}; Component[][] components= { - {null, new UILabel(Inter.getLocText("Content") + ":"), contentField = new UITextField(3)}, - {null, new UILabel(Inter.getLocText("FRFont") + ":"), fontNameBox}, - {null, new UILabel(Inter.getLocText("FRFont-Size") + ":"), fontSizeBox}, - {null, new UILabel(Inter.getLocText("Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Content") + ":"), contentField = new UITextField(3)}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FRFont") + ":"), fontNameBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") + ":"), fontSizeBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, {null, null, rightButton = new UIRadioButton(getRightName())}, }; @@ -148,16 +148,16 @@ public class ChartAlertValuePane extends BasicBeanPane { } protected String getLeftName() {// 居左 居右 - return Inter.getLocText("Chart_Alert_Left"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Left"); } protected String getRightName() { - return Inter.getLocText("Chart_Alert_Right"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Right"); } @Override protected String title4PopupWindow() { - return Inter.getLocText("ChartF-Alert-Line"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"); } private void showFormulaPane() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java index 3832bdf16..71366d543 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartStyleAxisPane.java @@ -15,7 +15,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.chart.gui.style.axis.ChartAxisUsePane; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -25,9 +25,9 @@ import com.fr.general.Inter; * Time : 上午8:48 */ public abstract class ChartStyleAxisPane extends BasicPane implements ListSelectionListener { - protected static final String CATE_AXIS = Inter.getLocText("ChartF-Category_Axis"); - protected static final String VALUE_AXIS = Inter.getLocText("Chart_F_Radar_Axis"); - protected static final String SECOND_AXIS = Inter.getLocText(new String[]{"Second", "Chart_F_Radar_Axis"}); + protected static final String CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis"); + protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_F_Radar_Axis"); + protected static final String SECOND_AXIS = com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Second", "Chart_F_Radar_Axis"}); private JList mainList; private CardLayout cardLayout; private JPanel cardDisplayPane = null; diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java index 3b2e21f73..deedb9aee 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java @@ -1,7 +1,7 @@ package com.fr.design.chart.axis; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { @@ -10,10 +10,10 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { } protected String getValueAxisName() { - return Inter.getLocText("Main_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Main_Axis"); } protected String getSecondValueAxisName() { - return Inter.getLocText("Second_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Second_Axis"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java index 8eba60022..afc2942f8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/GanntChartStyleAxisPane.java @@ -2,7 +2,7 @@ package com.fr.design.chart.axis; import com.fr.chart.chartattr.Plot; import com.fr.design.mainframe.chart.gui.style.axis.ChartCategoryPane; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -19,7 +19,7 @@ public class GanntChartStyleAxisPane extends BinaryChartStyleAxisPane { protected AxisStyleObject getXAxisPane(Plot plot) { ChartCategoryPane categoryPane = new ChartCategoryPane(); categoryPane.getAxisValueTypePane().removeTextAxisPane(); - return new AxisStyleObject(Inter.getLocText("Chart_Date_Axis"), categoryPane); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"), categoryPane); } protected AxisStyleObject getYAxisPane(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java index 759f9bb92..d5645fa75 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -31,13 +31,13 @@ public class MinMaxValuePane extends JPanel { protected UITextField secUnitField; public MinMaxValuePane() { - minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"})); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"})); minValueField = new UITextField(6); - maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"})); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"})); maxValueField = new UITextField(6); - isCustomMainUnitBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "FR-Chart_MainGraduationUnit"})); + isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "FR-Chart_MainGraduationUnit"})); mainUnitField = new UITextField(6); - isCustomSecUnitBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "FR-Chart_SecondGraduationUnit"})); + isCustomSecUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "FR-Chart_SecondGraduationUnit"})); secUnitField = new UITextField(6); double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java index 9e618ef6d..922eaf3a0 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/XYChartStyleAxisPane.java @@ -2,7 +2,7 @@ package com.fr.design.chart.axis; import com.fr.chart.chartattr.Plot; import com.fr.design.mainframe.chart.gui.style.axis.ChartValuePane; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -17,10 +17,10 @@ public class XYChartStyleAxisPane extends BinaryChartStyleAxisPane { } protected AxisStyleObject getXAxisPane(Plot plot) { - return new AxisStyleObject(Inter.getLocText("ChartF-X_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), new ChartValuePane()); } protected AxisStyleObject getYAxisPane(Plot plot) { - return new AxisStyleObject(Inter.getLocText("ChartF-Y_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), new ChartValuePane()); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java index c5f966b4d..832d1c84c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java @@ -1,7 +1,7 @@ package com.fr.design.chart.comp; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; import com.fr.design.gui.icombobox.LineComboBox; @@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane { private ColorSelectBox colorSelectBox; public BorderAttriPane() { - this(Inter.getLocText("Line-Style"), Inter.getLocText("Color")); + this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); } public BorderAttriPane(String lineString, String colorSting) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java index 95b027324..f8d56b04d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAnalysisLineStyleAction.java @@ -5,13 +5,13 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + public class SetAnalysisLineStyleAction extends ChartComponentAction{ public SetAnalysisLineStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "AnalysisLine"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "AnalysisLine"})); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java index 57ccfd11b..e3abec9b4 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetAxisStyleAction.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; /** @@ -18,7 +18,7 @@ import com.fr.stable.StringUtils; public class SetAxisStyleAction extends ChartComponentAction { public SetAxisStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "ChartF-Axis", "Format"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "ChartF-Axis", "Format"})); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java index 84d3800ed..a961a5819 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction { public SetChartStyleAciton(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"DashBoard-ChartFloat", "Style"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-ChartFloat", "Style"})); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java index 1f2014e34..f6b553249 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataLabelStyleAction.java @@ -5,13 +5,13 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + public class SetDataLabelStyleAction extends ChartComponentAction{ public SetDataLabelStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "Data-Label"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Data-Label"})); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSeriesAttrAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSeriesAttrAction.java deleted file mode 100644 index c2e61caee..000000000 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSeriesAttrAction.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.fr.design.chart.gui.active.action; - -import java.awt.event.ActionEvent; - -import com.fr.design.chart.gui.ChartComponent; -import com.fr.design.mainframe.chart.PaneTitleConstants; -import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; - -/** - * Created by IntelliJ IDEA. - * Author : Richer - * Version: 6.5.6 - * Date : 11-11-22 - * Time : 下午5:28 - */ -public class SetDataSeriesAttrAction extends ChartComponentAction { - public SetDataSeriesAttrAction(ChartComponent chartComponent) { - super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "ChartF-Series", "Format"})); - } - - public void actionPerformed(ActionEvent e) { - DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_SERIES_TITLE); - } -} \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java index 21e27aed8..0dd5e0a78 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetDataSheetAction.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -20,7 +20,7 @@ public class SetDataSheetAction extends ChartComponentAction { public SetDataSheetAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText("Chart_Set_Data_Sheet")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Chart_Set_Data_Sheet")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java index 38c5caa43..e88772db5 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -19,7 +19,7 @@ public class SetLegendStyleAction extends ChartComponentAction { public SetLegendStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText("Set_Legend_Sytle")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Set_Legend_Sytle")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java index adae15508..1d6fd311d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetPlotStyleAction.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -19,7 +19,7 @@ public class SetPlotStyleAction extends ChartComponentAction { public SetPlotStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "ChartF-Plot"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "ChartF-Plot"})); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java index 34ab20e49..68b4e16b0 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetTitleStyleAction.java @@ -5,7 +5,7 @@ import java.awt.event.ActionEvent; import com.fr.design.chart.gui.ChartComponent; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + /** * Created by IntelliJ IDEA. @@ -19,7 +19,7 @@ public class SetTitleStyleAction extends ChartComponentAction { public SetTitleStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(Inter.getLocText(new String[]{"Set", "Title", "Style"})); + this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Title", "Style"})); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java index 70c55638a..e61c34752 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java @@ -7,7 +7,7 @@ import com.fr.design.javascript.EmailPane; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; -import com.fr.general.Inter; + import com.fr.js.EmailJavaScript; import javax.swing.*; @@ -32,13 +32,13 @@ public class ChartEmailPane extends EmailPane{ JPanel contentPane; if (supportExport) { double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred}; - showTplContent = new UICheckBox(Inter.getLocText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), showTplContent}, {new UILabel(), tipsPane2}},rSizes, columnSize, 6); @@ -46,16 +46,16 @@ public class ChartEmailPane extends EmailPane{ double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred}; contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), tipsPane2}},rSizes, columnSize, 8); } centerPane = new JPanel(new BorderLayout()); if (needRenamePane()) { - JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(Inter.getLocText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},}, + JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},}, new double[] {preferred}, columnSize, 6); centerPane.add(namePane, BorderLayout.NORTH); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java index a5bde730e..13d66c6e6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.DataContentsPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -58,7 +58,7 @@ public class GisMapDataPane extends DataContentsPane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("ChartF-Gis"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Gis"); } public void setSupportCellData(boolean surpportCellData) { @@ -109,7 +109,7 @@ public class GisMapDataPane extends DataContentsPane{ double[] columnSize = { p,f }; double[] rowSize = { p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("ChartF-Data-Resource") + ":"), jcb}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"), jcb}, } ; JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0); @@ -130,7 +130,7 @@ public class GisMapDataPane extends DataContentsPane{ @Override protected String title4PopupWindow() { - return Inter.getLocText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); } }, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java index 3d8faa2bf..b6e90e843 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.itable.UITableEditor; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; @@ -51,8 +51,8 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(new String[]{Inter.getLocText("Chart-Address"), Inter.getLocText("Chart-LngLat")}); - lnglatOrder = new UIButtonGroup(new String[]{Inter.getLocText("Chart-LngFirst"), Inter.getLocText("Chart-LatFirst")}); + addressType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-LngLat")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-LngFirst"), com.fr.design.i18n.Toolkit.i18nText("Chart-LatFirst")}); addressPane = new TinyFormulaPane(); addressNamePane = new TinyFormulaPane(); double p = TableLayout.PREFERRED; @@ -70,7 +70,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(new String[]{Inter.getLocText("Chart-Gis_Address"), Inter.getLocText("Chart-Gis_LatLng")}); - lnglatOrder = new UIButtonGroup(new String[]{Inter.getLocText("Chart-Lng_First"),Inter.getLocText("Chart-Lat_First")}); + addressType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address"), com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_LatLng")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Lng_First"),com.fr.design.i18n.Toolkit.i18nText("Chart-Lat_First")}); addressType.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -96,19 +96,19 @@ public class GisMapTableDataContentPane extends FurtherBasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 0)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); - northPane.add(new BoldFontTextLabel(Inter.getLocText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); @@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("LayerData"); + return com.fr.design.i18n.Toolkit.i18nText("LayerData"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java index 91ec7e872..c0f488d09 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeLayerPane.java @@ -12,7 +12,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.UIDialog; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -303,7 +303,7 @@ public class MapCubeLayerPane extends BasicBeanPane{ * 返回界面标题. */ protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java index 97c978476..55afcc7a9 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java @@ -10,7 +10,7 @@ import com.fr.design.editor.editor.TextEditor; import com.fr.design.gui.itableeditorpane.UIArrayTableModel; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.xcombox.ComboBoxUseEditor; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; @@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane{ private void initCom() { this.setLayout(new BorderLayout(0, 0)); - UIArrayTableModel model = new UIArrayTableModel(new String[]{Inter.getLocText("FR-Chart-Area_Name"), Inter.getLocText("FR-Chart-Drill_Map")}, new int[] {}) { + UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) { public boolean isCellEditable(int row, int col) { return col != 0; } @@ -77,7 +77,7 @@ public class MapCubeSetDataPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Drill_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Setting"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java index d91987996..56f68dc57 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapDataPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.data.DataContentsPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -87,7 +87,7 @@ public class MapDataPane extends DataContentsPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Map_ShowWay") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ShowWay") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); @@ -99,7 +99,7 @@ public class MapDataPane extends DataContentsPane { return list; } protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Chart-Map", "Data"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"}); } }; pane.add(mainPane, BorderLayout.CENTER); @@ -127,7 +127,7 @@ public class MapDataPane extends DataContentsPane { * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText(new String[]{"Chart-Map", "Data"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart-Map", "Data"}); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java index 19d4d2405..34f1a0b5c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreCubeLayerPane.java @@ -5,7 +5,7 @@ import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.MapPlot; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.MultiTabPane; -import com.fr.general.Inter; + import java.util.ArrayList; import java.util.List; @@ -87,7 +87,7 @@ public class MapMoreCubeLayerPane extends MultiTabPane{ * @return 返回标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Muiti_In"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Muiti_In"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java index bba5fc301..d860a9095 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapMoreReportIndexPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itable.UITableEditor; import com.fr.design.gui.itextfield.UITextField; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; @@ -52,13 +52,13 @@ public class MapMoreReportIndexPane extends BasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); - northPane.add(new BoldFontTextLabel(Inter.getLocText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); @@ -57,7 +57,7 @@ public class MapSinglePane extends FurtherBasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); } }, BorderLayout.CENTER); } @@ -80,7 +80,7 @@ public class MapSinglePane extends FurtherBasicBeanPane { * 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText(new String[]{"SingleLayer", "Chart-Map"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"SingleLayer", "Chart-Map"}); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java index ee42b894a..e64b6fcff 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java @@ -7,7 +7,7 @@ import com.fr.design.data.tabledata.wrapper.TableDataWrapper; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -33,7 +33,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane implements AbstrctMapAt northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UIButton loadMap = new UIButton(Inter.getLocText("FR-Chart-Import_Map")); + UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Import_Map")); loadMap.setPreferredSize(new Dimension(160, 20)); northPane.add(loadMap); loadMap.addActionListener(selectPictureActionListener); if(isNeedDataSource){ - UILabel label =new UILabel(Inter.getLocText("FR-Chart-Table_Data") + ":", SwingConstants.RIGHT) ; + UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Table_Data") + ":", SwingConstants.RIGHT) ; tableDataNameBox = new DatabaseTableDataPane(label) { protected void userEvent() { @@ -91,7 +91,7 @@ refreshAreaNameBox(); tableDataNameBox.setPreferredSize(new Dimension(200, 20)); northPane.add(tableDataNameBox); - northPane.add(new BoldFontTextLabel(Inter.getLocText(new String[]{"Filed", "Field"}) + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Field"}) + ":")); areaString = new FilterComboBox(); areaString.setPreferredSize(new Dimension(120, 20)); @@ -229,7 +229,7 @@ refreshAreaNameBox(); @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Datasource-User_Defined", "Chart-Map"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Datasource-User_Defined", "Chart-Map"}); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index 849446b08..38b6f4bd6 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.itableeditorpane.UIArrayTableModel; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.xcombox.ComboBoxUseEditor; import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; @@ -67,7 +67,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UILabel lable = new UILabel(Inter.getLocText("Chart-DS_TableData") + ":", SwingConstants.RIGHT); + UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData") + ":", SwingConstants.RIGHT); // 数据集, 字段, 数据列表, 使用该数据进行自动命名 tableDataBox = new DatabaseTableDataPane(lable) { @@ -83,10 +83,10 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc columnBox.setPreferredSize(new Dimension(40, 20)); columnBox.addItemListener(columnChange); - northPane.add(new UILabel(Inter.getLocText("FR-Chart-Map_Field")+":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":")); northPane.add(columnBox); - tableEditorModel = new UIArrayTableModel(new String[]{Inter.getLocText("FR-Chart-Map_Use_Field"), Inter.getLocText("FR-Chart-Area_Name")}, new int[]{}) { + tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")}, new int[]{}) { public boolean isCellEditable(int row, int col) { return col != 0; } @@ -158,7 +158,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Define", "Area_Name"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "Area_Name"}); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java index 6c054361f..0cf7f4622 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java @@ -22,7 +22,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; @@ -48,10 +48,10 @@ import java.util.ArrayList; */ public class MapGroupExtensionPane extends BasicPane implements UIObserver { private static final String[] TYPE_NAMES = new String[]{ - Inter.getLocText("FR-Chart-World_Map"), - Inter.getLocText("FR-Chart-State_Map"), - Inter.getLocText("FR-Chart-Province_Map"), - Inter.getLocText("FR-Chart-Custom_Map")}; + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-World_Map"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-State_Map"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Province_Map"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Custom_Map")}; private static final int WORD = 0; private static final int NATION = 1; private static final int STATE = 2; @@ -211,7 +211,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createAreaItem(final String oldName) { - JMenuItem editFileItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Filed"})); + JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Filed"})); editFileItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapCustomPane image = new MapCustomPane(); @@ -259,7 +259,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createMarkerItem(final String oldName) { - JMenuItem editMarkerItem = new JMenuItem(Inter.getLocText(new String[]{"Edit", "Image", "Marker"})); + JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Marker"})); editMarkerItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapCustomPane image = new MapCustomPane(); @@ -293,7 +293,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createLayerItem(final String oldName) { - JMenuItem corrItem = new JMenuItem(Inter.getLocText(new String[]{"Filed", "Corresponding_Fields"})); + JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Corresponding_Fields"})); corrItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane(); @@ -320,16 +320,16 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private void showRenameWaring(String newName){ - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed") - + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") + + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); } private JMenuItem createRenameItem() { - JMenuItem renameItem = new JMenuItem(Inter.getLocText("FR-Chart-Map_Rename")); + JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename")); renameItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), - Inter.getLocText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject()); + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject()); if (StringUtils.isNotBlank(newName)) { String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject()); if(ComparatorUtils.equals(oldName, newName)){ @@ -400,7 +400,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { @Override protected void done() { - FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存. + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Saved")); // 地图已经保存. } }; diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java index 249d3a878..ade5b8eae 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java @@ -40,7 +40,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.UIDialog; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.CoreGraphHelper; import com.fr.stable.StringUtils; import com.fr.design.utils.gui.GUICoreUtils; @@ -122,7 +122,7 @@ public class MapImageEditPane extends BasicBeanPane { UIScrollPane pane = new UIScrollPane(recordTable); pane.setPreferredSize(new Dimension(150, 320)); - pane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Filed", "WF-Name"}))); + pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"}))); this.add(pane, BorderLayout.EAST); } @@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane { }); bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT); bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY()); - bg.setTitle(Inter.getLocText(new String[]{"Edit", "Filed", "WF-Name"})); + bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"})); bg.setVisible(true); } @@ -523,7 +523,7 @@ public class MapImageEditPane extends BasicBeanPane { private int editViewRow = -1;// 所对应的view的index行 , 确定当前正在编辑的viewList的行, 然后改变值 - private UILabel namedLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Pre_Defined") + "------"); + private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Pre_Defined") + "------"); private JPanel listPane = new JPanel(); public EditNamePane() { @@ -630,13 +630,13 @@ public class MapImageEditPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); } } @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java index b56a436f4..3ca7e5e59 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java @@ -21,7 +21,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import javax.swing.*; @@ -431,7 +431,7 @@ public class UIGroupExtensionPane extends BasicPane { }; isPressOnDelete = true; bp.setLayout(new BorderLayout()); - bp.add(new BoldFontTextLabel(Inter.getLocText(new String[]{"Delete", "Chart-Map"}) + "?", SwingConstants.CENTER)); + bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Delete", "Chart-Map"}) + "?", SwingConstants.CENTER)); clearLastListSelection(list); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java index 0afe15c95..f033358cc 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java @@ -22,7 +22,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; public class ConditionTrendLinePane extends BasicBeanPane { @@ -53,32 +53,32 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pane.add(namePane); - namePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Chart_TrendLine" , "WF-Name"}), null)); - namePane.add(new UILabel(Inter.getLocText(new String[]{"Define", "WF-Name"}))); + namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null)); + namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"}))); namePane.add(nameLabel = new UITextField("", 6)); pane.add(linePane = new BorderAttriPane()); - linePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Chart_Trend", "Line-Style"}), null)); + linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null)); JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(typePane); - typePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Chart_Trend", "Type"}), null)); + typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Type"}), null)); JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(buttonPane); - buttonPane.add(exponentButton = new UIRadioButton(Inter.getLocText("Chart_Exponent"))); - buttonPane.add(linearButton = new UIRadioButton(Inter.getLocText("Chart_Linear"))); - buttonPane.add(logButton = new UIRadioButton(Inter.getLocText("Chart_Log"))); - buttonPane.add(polynomialButton = new UIRadioButton(Inter.getLocText("Chart_Polynomial"))); - buttonPane.add(powerButton = new UIRadioButton(Inter.getLocText("Chart_Power"))); + buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Exponent"))); + buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Linear"))); + buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Log"))); + buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Polynomial"))); + buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Power"))); JPanel maPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(maPane); - maPane.add(maButton = new UIRadioButton(Inter.getLocText("Chart_Move_Average"))); - maPane.add(new UILabel(Inter.getLocText("cycle") + ":")); + maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average"))); + maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle") + ":")); maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1))); maSpinner.setEnabled(false); @@ -97,14 +97,14 @@ public class ConditionTrendLinePane extends BasicBeanPane { private JPanel initExtendsPane() { JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置 - extendsPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Chart_Trend", "Forecast"}), null)); + extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Forecast"}), null)); - extendsPane.add(new UILabel(Inter.getLocText("Chart_TrendLine_Forward") + ":")); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":")); extendsPane.add(forwardLabel = new UITextField("0", 5)); - extendsPane.add(new UILabel(Inter.getLocText("cycle"))); - extendsPane.add(new UILabel(Inter.getLocText("Chart_TrendLine_Backward") + ":")); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":")); extendsPane.add(backwardLabel = new UITextField("0", 5)); - extendsPane.add(new UILabel(Inter.getLocText("cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle"))); return extendsPane; } @@ -127,7 +127,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Chart_TrendLine"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"); } ActionListener listener = new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java index 26d919ead..844dadb40 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.design.style.FRFontPane; import com.fr.design.style.color.ColorSelectBox; @@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane { nameBox.setPreferredSize(new Dimension(80, 20)); String[] styles = { - Inter.getLocText("FRFont-plain"), - Inter.getLocText("FRFont-bold"), - Inter.getLocText("FRFont-italic"), - Inter.getLocText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; this.add(fontStyleBox = new UIComboBox(styles)); fontStyleBox.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java index a0f05a03f..2d421de9e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java @@ -1,6 +1,6 @@ package com.fr.design.chart.series.SeriesCondition; -import com.fr.general.Inter; + import com.fr.chart.chartglyph.CustomAttr; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; @@ -19,7 +19,7 @@ public class DataSeriesAttrCustomPane extends DataSeriesAttrPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(Inter.getLocText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class) }; } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java index 77b6c78fc..9167d0b94 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java @@ -1,6 +1,6 @@ package com.fr.design.chart.series.SeriesCondition; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.chart.chartattr.Plot; @@ -37,13 +37,13 @@ public class DataSeriesAttrPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(Inter.getLocText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) }; } @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Condition", "Display"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"}); } public void populate(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index f617cf2ca..92cd574ea 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -13,7 +13,7 @@ import com.fr.data.condition.ListCondition; import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -166,7 +166,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane(names, values); @@ -48,7 +48,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane Component[][] components; if (!this.needRenamePane) { components = new Component[][]{ - {new UILabel(Inter.getLocText("FR-Designer_Form-Object")), targetFrameComboBox}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox}, }; } else { itemNameTextField = new UITextField(); components = new Component[][]{ - {new UILabel(Inter.getLocText("FR-Designer_Name_has_Colon")), itemNameTextField}, - {new UILabel(Inter.getLocText("FR-Designer_Form-Object")), targetFrameComboBox}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name_has_Colon")), itemNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox}, }; } JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -99,7 +99,7 @@ public class FormHyperlinkNorthPane extends BasicBeanPane @Override protected String title4PopupWindow() { - return Inter.getLocText("Hyperlink-Form_link"); + return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java index c59feefe8..665a01501 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/FormHyperlinkPane.java @@ -7,7 +7,7 @@ import com.fr.design.hyperlink.AbstractHyperLinkPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.ElementCaseEditorProvider; -import com.fr.general.Inter; + import com.fr.js.FormHyperlinkProvider; import com.fr.stable.ParameterProvider; import com.fr.stable.bridge.StableFactory; @@ -39,12 +39,12 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane{ namedPane= new MapDefiAreaNamePane(false); areaPane.setImageSelectType(MapShapeValue.AREA); // pointPane.setImageSelectType(MapShapeValue.POINT); - tabbedPane.add(Inter.getLocText("FR-Chart-Map_ImageArea"),areaPane); -// tabbedPane.add(Inter.getLocText("FR-Chart-Map_ImagePoint"),pointPane); - tabbedPane.add(Inter.getLocText("FR-Chart-Map_Corresponding_Fields"),namedPane); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImageArea"),areaPane); +// tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImagePoint"),pointPane); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"),namedPane); editingPane = areaPane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java index 7201a8b54..45f803607 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.frpane.UITitlePanel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itabpane.TitleChangeListener; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; import javax.swing.*; @@ -65,7 +65,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ chartEditPane.setContainer(container); chartEditPane.addTitleChangeListener(titleListener); String tabname = chartEditPane.getSelectedTabName(); - nameLabel.setText(Inter.getLocText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); resetChartEditPane(); } @@ -81,7 +81,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ @Override public void fireTitleChange(String addName) { - nameLabel.setText(Inter.getLocText("Chart-Property_Table") + '-' + addName); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + '-' + addName); } }; @@ -118,7 +118,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ * 返回View的标题. */ public String getViewTitle() { - return Inter.getLocText("CellElement-Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("CellElement-Property_Table"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java index 61d968e33..a044c059b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartEditPane.java @@ -20,7 +20,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ChartTypePane; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import javax.swing.JPanel; import javax.swing.event.ChangeEvent; @@ -215,7 +215,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Property_Table"); } public void populate(ChartCollection collection) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java index 1bf04c439..aef8c2070 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsConfigPane.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.chart; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Charts; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; import javax.swing.*; @@ -12,7 +12,7 @@ import javax.swing.*; */ public abstract class ChartsConfigPane extends AbstractChartAttrPane { - public final static String CHART_STYLE_TITLE = Inter.getLocText("Chart-Style_Name"); + public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"); public abstract Class acceptType(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java index 51a268338..fdf2e5a6b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java @@ -1,25 +1,25 @@ package com.fr.design.mainframe.chart; -import com.fr.general.Inter; + public class PaneTitleConstants { - public final static String CHART_TYPE_TITLE = Inter.getLocText("Type"); - public final static String CHART_DATA_TITLE = Inter.getLocText("Data"); - public final static String CHART_STYLE_TITLE = Inter.getLocText("Style"); - public final static String CHART_OTHER_TITLE = Inter.getLocText("Animation_Special"); + public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Type"); + public final static String CHART_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Data"); + public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Style"); + public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Animation_Special"); - public final static String CHART_STYLE_TITLE_TITLE = Inter.getLocText("Title"); - public final static String CHART_STYLE_LEGNED_TITLE = Inter.getLocText("ChartF-Legend"); - public final static String CHART_STYLE_SERIES_TITLE = Inter.getLocText("ChartF-Series"); - public final static String CHART_STYLE_AXIS_TITLE = Inter.getLocText("ChartF-Axis"); - public final static String CHART_STYLE_AREA_TITLE = Inter.getLocText("Background"); - public final static String CHART_STYLE_DATA_TITLE = Inter.getLocText("Chart_Data_Sheet"); - public final static String CHART_STYLE_LABEL_TITLE = Inter.getLocText("Data-Label"); - public final static String CHART_STYLE_LINE_TITLE = Inter.getLocText("AnalysisLine"); + public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Title"); + public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend"); + public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Series"); + public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis"); + public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Background"); + public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet"); + public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Data-Label"); + public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("AnalysisLine"); - public final static String CHART_STYLE_AREA_AREA_TITLE = Inter.getLocText("D-ChartArea"); - public final static String CHART_STYLE_AREA_PLOT_TITLE = Inter.getLocText("ChartF-Plot"); + public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("D-ChartArea"); + public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot"); - public final static String CHART_OTHER_TITLE_CHANGE = Inter.getLocText("Chart-Switch"); + public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index cf1664b17..888ee73c1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -70,7 +70,7 @@ public class ChangeConfigPane extends BasicBeanPane { double[] columnSize = {p, f}; double[] rowSize = {p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Change_Style")),configStyleButton}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Style")),configStyleButton}, new Component[]{configPane, null}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -107,19 +107,19 @@ public class ChangeConfigPane extends BasicBeanPane { double[] rowSize = {p, p, p}; timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0); colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH); - switchStyleGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Designer_Show"), Inter.getLocText("FR-Designer_Hide")}); + switchStyleGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hide")}); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Arrow_Style")), switchStyleGroup, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), timeInterval, new UILabel(Inter.getLocText("FR-Base-Time_Second"))}, - new Component[]{new UILabel(Inter.getLocText("Background")),colorSelectBox4carousel, null} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Arrow_Style")), switchStyleGroup, null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background")),colorSelectBox4carousel, null} }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); } private JPanel createTitleStylePane() { - final UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); + final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); styleAttrPane = new ChartTextAttrPane() { protected JPanel getContentPane(JPanel buttonPane) { double p = TableLayout.PREFERRED; @@ -143,7 +143,7 @@ public class ChangeConfigPane extends BasicBeanPane { private JPanel createButtonBackgroundColorPane(){ colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH); } private JPanel createButtonConfigPane() { @@ -160,8 +160,8 @@ public class ChangeConfigPane extends BasicBeanPane { } private void initButtonGroup() { - configStyleButton = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Button_Style"), - Inter.getLocText("Plugin-ChartF_Carousel_Style")}); + configStyleButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Button_Style"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Carousel_Style")}); configStyleButton.setPreferredSize(new Dimension(WIDTH * 2, (int) configStyleButton.getPreferredSize().getHeight())); configStyleButton.addActionListener(new ActionListener() { @Override @@ -227,6 +227,6 @@ public class ChangeConfigPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Chart-Change_Config_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"); } } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java index 7fe51b94b..10df74d92 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java @@ -7,7 +7,7 @@ package com.fr.design.mainframe.chart.gui; import com.fr.design.mainframe.chart.gui.other.ChartDesignerConditionAttrPane; import com.fr.design.mainframe.chart.gui.other.ChartDesignerInteractivePane; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -37,7 +37,7 @@ public class ChartDesignerOtherPane extends ChartOtherPane { * @return 返回标题. */ public String title4PopupWindow() { - return Inter.getLocText("Advanced"); + return com.fr.design.i18n.Toolkit.i18nText("Advanced"); } private boolean isHaveCondition() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index c29616d2c..48f20d31b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.imenutable.UIMenuNameableCreator; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.mainframe.chart.gui.ChartTypePane.ComboBoxPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; @@ -102,7 +102,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initConfigCreator() { - configCreator = new UIMenuNameableCreator(Inter.getLocText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); + configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); } private void initAddButton() { @@ -175,7 +175,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private String getNewChartName() { int count = indexList.size() + 1; while (true) { - String name_test = Inter.getLocText("FR-Chart-Module_Name") + count; + String name_test = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Module_Name") + count; boolean repeated = false; for (int i = 0, len = indexList.size(); i < len; i++) { ChartChangeButton nameable = indexList.get(i); @@ -253,7 +253,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); } private void changeCollectionSelected(String name) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java index fbe0008af..968fba127 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java @@ -10,7 +10,7 @@ import com.fr.data.util.function.SumFunction; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + /** * 公式选择. @@ -19,9 +19,9 @@ import com.fr.general.Inter; */ public class CalculateComboBox extends UIComboBox{ - public static final String[] CALCULATE_ARRAY = {Inter.getLocText("DataFunction-None"), Inter.getLocText("DataFunction-Sum"), - Inter.getLocText("DataFunction-Average"), Inter.getLocText("DataFunction-Max"), - Inter.getLocText("DataFunction-Min"), Inter.getLocText("DataFunction-Count")}; + public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Sum"), + com.fr.design.i18n.Toolkit.i18nText("DataFunction-Average"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Max"), + com.fr.design.i18n.Toolkit.i18nText("DataFunction-Min"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Count")}; public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class, MaxFunction.class, MinFunction.class, CountFunction.class}; @@ -31,7 +31,7 @@ public class CalculateComboBox extends UIComboBox{ } public void reset() { - this.setSelectedItem(Inter.getLocText("DataFunction-None")); + this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None")); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java index 4991072a1..97ca09a23 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ChartDataFilterPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.style.AbstractChartTabPane; import com.fr.design.mainframe.chart.gui.style.ThirdTabPane; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -109,7 +109,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * @return 返回标题. */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Data_Filter"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"); } /** @@ -222,13 +222,13 @@ public class ChartDataFilterPane extends ThirdTabPane { } protected JPanel initOtherPane() { - onlyPreData = new UICheckBox(Inter.getLocText("Plugin-ChartF_OnlyUseBeforeRecords")); + onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OnlyUseBeforeRecords")); JPanel panel1 = new JPanel(new BorderLayout()); JPanel panel2 = new JPanel(new BorderLayout()); panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); - UILabel label = new UILabel(Inter.getLocText("Plugin-ChartF_RecordsNum")); - combineOther = new UICheckBox(Inter.getLocText("FR-Chart-Data_CombineOther")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RecordsNum")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); combineOther.setSelected(true); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -244,7 +244,7 @@ public class ChartDataFilterPane extends ThirdTabPane { //默认不显示 preDataNumPane.setVisible(false); panel1.add(preDataNumPane, BorderLayout.CENTER); - notShowNull = new UICheckBox(Inter.getLocText("FR-Chart-Data_NotShowCate")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowCate")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -258,7 +258,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); panel2.add(presentPane, BorderLayout.SOUTH); double[] column = {f}; @@ -281,7 +281,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * 界面标题 "分类" */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Style_Category"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Category"); } /** @@ -397,13 +397,13 @@ public class ChartDataFilterPane extends ThirdTabPane { protected JPanel initOtherPane() { - onlyPreData = new UICheckBox(Inter.getLocText("Plugin-ChartF_OnlyUseBeforeRecords")); + onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OnlyUseBeforeRecords")); JPanel panel1 = new JPanel(new BorderLayout()); JPanel panel2 = new JPanel(new BorderLayout()); panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); - UILabel label = new UILabel(Inter.getLocText("Plugin-ChartF_RecordsNum")); - combineOther = new UICheckBox(Inter.getLocText("FR-Chart-Data_CombineOther")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RecordsNum")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); combineOther.setSelected(true); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -419,7 +419,7 @@ public class ChartDataFilterPane extends ThirdTabPane { //默认不显示 preDataNumPane.setVisible(false); panel1.add(preDataNumPane, BorderLayout.CENTER); - notShowNull = new UICheckBox(Inter.getLocText("FR-Chart-Data_NotShowSeries")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowSeries")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -433,7 +433,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); panel2.add(presentPane, BorderLayout.SOUTH); double[] column = {f}; @@ -457,7 +457,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java index d8d216547..e38a2c1f3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/NormalChartDataPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.van.chart.designer.AbstractVanChartScrollPane; import javax.swing.BorderFactory; @@ -64,7 +64,7 @@ public class NormalChartDataPane extends DataContentsPane { this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6)); JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0)); northPane.add(jcb, BorderLayout.CENTER); - UILabel label1 = new UILabel(Inter.getLocText("Chart-Data_Resource")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Resource")); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java index 0181a8cfa..a0ead25d1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java @@ -13,7 +13,7 @@ import com.fr.design.present.FormulaPresentPane; import com.fr.design.present.dict.DictionaryPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.general.Inter; + /** * 公式下拉框编辑器. @@ -24,9 +24,9 @@ public class PresentComboBox extends UIComboBox{ private Present present; private String[] ITEMS = { - Inter.getLocText("DS-Dictionary"), - Inter.getLocText("Present-Formula_Present"), - Inter.getLocText("Present-No_Present") + com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"), + com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"), + com.fr.design.i18n.Toolkit.i18nText("Present-No_Present") }; public PresentComboBox() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java index 4a3074230..d353c2784 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/ReportDataPane.java @@ -8,7 +8,7 @@ import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import java.awt.*; @@ -36,7 +36,7 @@ public class ReportDataPane extends FurtherBasicBeanPane{ * @return 界面的标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart_Cell_Data"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Cell_Data"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java index 0c1f90dd4..2fb202cfe 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/TableDataPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -36,7 +36,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ } private void initDataPane() { - UILabel label = new BoldFontTextLabel(Inter.getLocText("Chart-DS_TableData")) ; + UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData")) ; label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); tableDataPane = new DatabaseTableDataPane(label) { @Override @@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ * @return 返回标题. */ public String title4PopupWindow() { - return Inter.getLocText(new String[]{"TableData", "Data"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata"); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java index 62f152049..73559a805 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartdata.BubbleReportDefinition; import com.fr.chart.chartdata.BubbleSeriesValue; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -26,7 +26,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa public BubblePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); filterPane = new ChartDataFilterPane(new BubblePlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); @@ -35,10 +35,10 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa @Override protected String[] columnNames() { return new String[]{ - Inter.getLocText("Bubble-Series_Name"), - Inter.getLocText("ChartF-X_Axis"), - Inter.getLocText("ChartF-Y_Axis"), - Inter.getLocText("FRFont-Size") + com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), + com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), + com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java index 236036c61..405fe274d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotMoreCateReportDataContentPane.java @@ -13,7 +13,7 @@ import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -54,7 +54,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor public CategoryPlotMoreCateReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(Inter.getLocText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); JPanel catePane = new JPanel(); catePane.setLayout(new BorderLayout(2, 2)); @@ -76,7 +76,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor this.add(catePane, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java index 7923adafa..c71ac065c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java @@ -10,7 +10,7 @@ import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -34,12 +34,12 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent public CategoryPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(Inter.getLocText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); categoryName.setPreferredSize(new Dimension(246,30)); categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7)); this.add(categoryName, "0,0,2,0"); filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); } @@ -51,7 +51,7 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent this.setLayout(new BorderLayout(4, 0)); if(StringUtils.isNotEmpty(leftLabel)) { - UILabel label1 = new UILabel(Inter.getLocText("FR-Chart-Category_Name")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); label1.setPreferredSize(new Dimension(75, 20)); this.add(label1, BorderLayout.WEST); } @@ -91,8 +91,8 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent @Override protected String[] columnNames() { return new String[]{ - Inter.getLocText("FR-Chart-Series_Name"), - Inter.getLocText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java index c0b9da446..7245a44c1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/GanttPlotReportDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.frpane.UICorrelationPane; import com.fr.design.gui.itable.UITable; import com.fr.design.gui.itable.UITableEditor; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import javax.swing.event.ChangeEvent; import java.util.ArrayList; @@ -21,14 +21,14 @@ import java.util.List; */ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPane { - private static final String STEP = Inter.getLocText("ChartF-Step"); - private static final String START = Inter.getLocText("ChartF-PlansToBegin"); - private static final String END = Inter.getLocText("ChartF-EndOfTheProject"); + private static final String STEP = com.fr.design.i18n.Toolkit.i18nText("ChartF-Step"); + private static final String START = com.fr.design.i18n.Toolkit.i18nText("ChartF-PlansToBegin"); + private static final String END = com.fr.design.i18n.Toolkit.i18nText("ChartF-EndOfTheProject"); - private static final String RESTART = Inter.getLocText("ChartF-TheActualStart"); - private static final String REEND = Inter.getLocText("ChartF-TheActualEnd"); - private static final String PERCENT = Inter.getLocText("StyleFormat-Percent"); - private static final String PRO = Inter.getLocText("Chart_Project"); + private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualStart"); + private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("ChartF-TheActualEnd"); + private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Percent"); + private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Chart_Project"); public GanttPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index a2aa7db05..2a04eabc0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -25,8 +25,8 @@ import java.awt.Component; */ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPane { - private static final String CATENAME = Inter.getLocText(new String[]{"ChartF-Meter", "StyleFormat-Category", "WF-Name"}); - private static final String NVALUE = Inter.getLocText("Chart-Pointer_Value"); + private static final String CATENAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"); + private static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value"); private TinyFormulaPane singCatePane; private TinyFormulaPane singValuePane; @@ -59,7 +59,7 @@ public class MeterPlotReportDataContentPane extends AbstractReportDataContentPan this.setLayout(new BorderLayout()); this.add(panel, BorderLayout.NORTH); filterPane = new ChartDataFilterPane(new MeterPlot(), parent); - JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); + JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); pane.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java index 13e1176aa..732664fe1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/PiePlotReportDataContentPane.java @@ -8,7 +8,7 @@ import com.fr.chart.chartdata.SeriesDefinition; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import java.util.List; @@ -24,15 +24,15 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane public PiePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4"); } @Override protected String[] columnNames() { return new String[]{ - Inter.getLocText(new String[]{"Chart_Legend(Series)", "WF-Name"}), - Inter.getLocText(new String[]{"Chart_Legend(Series)", "Values"}) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Value") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java index 82023e305..226f482b1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/StockPlotReportDataContentPane.java @@ -20,7 +20,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -38,12 +38,12 @@ import java.util.List; * @version 创建时间：2012-12-19 下午04:10:47 */ public class StockPlotReportDataContentPane extends AbstractReportDataContentPane { - private static final String AXIS = Inter.getLocText("Chart_HorialTimeAxis"); - private static final String VOLUME = Inter.getLocText("ChartF_Stock_Volume"); - private static final String OPEN = Inter.getLocText("ChartF_Stock_Open"); - private static final String HIGHT = Inter.getLocText("ChartF_Stock_High"); - private static final String LOW = Inter.getLocText("ChartF_Stock_Low"); - private static final String CLOSE = Inter.getLocText("ChartF_Stock_Close"); + private static final String AXIS = com.fr.design.i18n.Toolkit.i18nText("Chart_HorialTimeAxis"); + private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Volume"); + private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Open"); + private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_High"); + private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Low"); + private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("ChartF_Stock_Close"); private static final int PRE_WIDTH = 210; private static final int VOLUMN_INDEX = 0; private static final int OPEN_INDEX = 1; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java index 678e2ff22..59ae03bad 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java @@ -8,7 +8,7 @@ import com.fr.chart.chartdata.ScatterSeriesValue; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import java.util.ArrayList; import java.util.List; @@ -25,15 +25,15 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten public XYScatterPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(Inter.getLocText("Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new XYScatterPlot(), parent), "0,6,2,4"); } protected String[] columnNames() { return new String[]{ - Inter.getLocText("Series_Name"), - Inter.getLocText("Chart_Scatter") + "x", - Inter.getLocText("Chart_Scatter") + "y" + com.fr.design.i18n.Toolkit.i18nText("Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "x", + com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "y" }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java index e7972b450..cac5863ed 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -45,7 +45,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane yCombox.setPreferredSize(new Dimension(100, 20)); bubbleSize.setPreferredSize(new Dimension(100, 20)); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -55,17 +55,17 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane double[] columnSize_north = {p, f}; double[] rowSize_north = {p, p, p, p}; Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName}, new Component[]{new UILabel("x"), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), bubbleSize} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize} }; JPanel north = TableLayoutHelper.createTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 1)); Component[][] components = new Component[][]{ new Component[]{north}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane), null}, }; @@ -91,7 +91,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); @@ -102,7 +102,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); @@ -118,7 +118,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane BubbleTableDefinition definition = (BubbleTableDefinition) top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(Inter.getLocText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java index 3de6583db..a8c4aba76 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotMoreCateTableDataContentPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -58,7 +58,7 @@ public class CategoryPlotMoreCateTableDataContentPane extends CategoryPlotTableD JPanel categoryPane = new JPanel(new BorderLayout(4, 0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel categoryLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Category_Name")); + UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java index 69b1e9eed..4c2e70850 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -41,11 +41,11 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa categoryCombox = new UIComboBox(); JPanel categoryPane = new JPanel(new BorderLayout(4,0)); categoryPane.setBorder(BorderFactory.createMatteBorder(0, 0, 6, 1, getBackground())); - UILabel label1 = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Category_Name")) ; + UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")) ; label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); categoryCombox.setPreferredSize(new Dimension(100,20)); - categoryCombox.addItem(Inter.getLocText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); categoryPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{categoryCombox,null,null,label1,null})); categoryPane.setPreferredSize(new Dimension(246,30)); categoryPane.setBorder(BorderFactory.createEmptyBorder(0,24,10,15)); @@ -90,7 +90,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(categoryCombox, list); - categoryCombox.addItem(Inter.getLocText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); seriesTypeComboxPane.refreshBoxListWithSelectTableData(list); } @@ -100,7 +100,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa */ public void clearAllBoxList(){ clearBoxItems(categoryCombox); - categoryCombox.addItem(Inter.getLocText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); seriesTypeComboxPane.clearAllBoxList(); } @@ -136,7 +136,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa NormalTableDataDefinition data = (NormalTableDataDefinition)top; if(data == null || ComparatorUtils.equals(data.getCategoryName(), StringUtils.EMPTY)) { - categoryCombox.setSelectedItem(Inter.getLocText("Chart-Use_None")); + categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } else if(data!= null && !this.boxItemsContainsObject(categoryCombox,data.getCategoryName())){ categoryCombox.setSelectedItem(null); }else { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java index 1694c0635..4db13903b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/GanttPlotTableDataContentPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -50,13 +50,13 @@ public class GanttPlotTableDataContentPane extends AbstractTableDataContentPane{ double[] rowSize = { p,p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Step_Name")),step}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Plan_Start")),planStart}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Plan_End")),planEnd}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Actual_Start")),finalStart}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Actual_End")),finalEnd}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Use_Percent")),percent}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Use_Items")),project}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Step_Name")),step}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_Start")),planStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Plan_End")),planEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_Start")),finalStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Actual_End")),finalEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent")),percent}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items")),project}, } ; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java index 5fa413e01..04349ccfc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/MeterPlotTableDataContentPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -25,8 +25,8 @@ import java.util.List; * @version 创建时间：2012-12-21 下午04:51:50 */ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane { - private static final String METER_NAME = Inter.getLocText("Chart-Category_Use_Name"); - private static final String METER_VALUE = Inter.getLocText("Chart-Pointer_Value"); + private static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Use_Name"); + private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Chart-Pointer_Value"); private UIComboBox nameBox; private UIComboBox valueBox; @@ -46,7 +46,7 @@ public class MeterPlotTableDataContentPane extends AbstractTableDataContentPane Component[][] components = createComponents(); - JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),filterPane); + JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); filterPane.setBorder(BorderFactory.createEmptyBorder(0,10,0,15)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java index a2cd2ec68..1da844507 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldNamePane.java @@ -20,7 +20,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -40,8 +40,8 @@ import java.util.List; * @version 创建时间：2012-12-26 下午04:39:46 */ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane { - private static final String[] HEADS = {Inter.getLocText("FR-Chart-Field_Name"), Inter.getLocText("FR-Chart-Series_Name"), Inter.getLocText("FR-Chart-Data_Summary")}; - private static final String[] HEADS_NO_SUMMARY = {Inter.getLocText("FR-Chart-Field_Name"), Inter.getLocText("FR-Chart-Series_Name")}; + private static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Summary")}; + private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Field_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name")}; private UICorrelationPane seriesDataPane; private List field = new ArrayList(); private JPanel centerPane; @@ -62,7 +62,7 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(4, LayoutConstants.VGAP_MEDIUM)); JPanel northPane = new JPanel(new BorderLayout(4, 0)); - UILabel label1 = new UILabel(Inter.getLocText("ChartF-Series_Name_From")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From")); label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH, ChartDataPane.LABEL_HEIGHT)); northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null})); northPane.setBorder(BorderFactory.createEmptyBorder(10, 24, 0, 15)); @@ -56,7 +56,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane { this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); dataScreeningPane = new ChartDataFilterPane(this.initplot, parent); - JPanel panel = new UIExpandablePane(Inter.getLocText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane); + JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane); panel.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,5)); this.add(panel, BorderLayout.SOUTH); @@ -94,7 +94,7 @@ public class SeriesTypeUseComboxPane extends UIComboBoxPane { * @return 界面标题 */ protected String title4PopupWindow() { - return Inter.getLocText("ChartF-Series_Name_From"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java index 41776c1b6..1457ba7a4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/StockPlotTableDataContentPane.java @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.UIEditLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -25,7 +25,7 @@ import java.util.List; */ public class StockPlotTableDataContentPane extends AbstractTableDataContentPane { - private static final String TIMEAXIS = Inter.getLocText("Chart-Horizontal_TimeAxis"); + private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Chart-Horizontal_TimeAxis"); private static final int LABEL_WIDTH = 105; private UIComboBox axisBox; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java index 27483facd..a5b06db0c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -39,7 +39,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP yCombox = new UIComboBox(); dataScreeningPane = new ChartDataFilterPane(new XYScatterPlot(), parent); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); seriesName.setPreferredSize(new Dimension(100, 20)); xCombox.setPreferredSize(new Dimension(100, 20)); @@ -51,11 +51,11 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(" " + Inter.getLocText("Chart-Series_Name") + ":"),seriesName}, - new Component[]{new BoldFontTextLabel(" " + Inter.getLocText("Chart-Scatter_Name") + "x" + ":"), xCombox}, - new Component[]{new BoldFontTextLabel(" " + Inter.getLocText("Chart-Scatter_Name") + "y" + ":"), yCombox}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name") + ":"),seriesName}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "x" + ":"), xCombox}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "y" + ":"), yCombox}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Data_Filter"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Filter"))}, new Component[]{dataScreeningPane,null} }; @@ -80,7 +80,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP protected void refreshBoxListWithSelectTableData(List columnNameList) { refreshBoxItems(seriesName, columnNameList); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); refreshBoxItems(xCombox, columnNameList); refreshBoxItems(yCombox, columnNameList); } @@ -90,7 +90,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); } @@ -133,7 +133,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP ScatterTableDefinition definition = (ScatterTableDefinition)top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(Inter.getLocText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java index 0fb21f59e..23bb3a4cf 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartConditionAttrPane.java @@ -11,7 +11,7 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.dialog.BasicScrollPane; import com.fr.design.gui.frpane.UICorrelationComboBoxPane; import com.fr.design.gui.imenutable.UIMenuNameableCreator; -import com.fr.general.Inter; + import javax.swing.*; import java.util.ArrayList; @@ -39,7 +39,7 @@ public class ChartConditionAttrPane extends BasicScrollPane { * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); } @Override @@ -49,9 +49,9 @@ public class ChartConditionAttrPane extends BasicScrollPane { List list = new ArrayList(); if(plot instanceof CustomPlot) { - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Condition_Attributes"), new CustomAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new CustomAttr(), showPane)); } else { - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Condition_Attributes"), new ConditionAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new ConditionAttr(), showPane)); } conditionPane.refreshMenuAndAddMenuAction(list); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java index bd33d805f..76a19f975 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java @@ -8,7 +8,7 @@ import com.fr.base.BaseFormula; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartdata.TopDefinition; import com.fr.design.mainframe.chart.gui.ChartOtherPane; -import com.fr.general.Inter; + import com.fr.js.JavaScriptImpl; import com.fr.js.WebHyperlink; import com.fr.third.org.hsqldb.lib.HashMap; @@ -33,10 +33,10 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane { List list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Hyperlink-Web_link"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("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, Inter.getLocText("FR-Engine_Interactive-chart"), null, null)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Interactive-chart"), null, null)); return list; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java index 9cdfed88f..273149f86 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java @@ -43,7 +43,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartOtherPane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.js.EmailJavaScript; import com.fr.js.FormHyperlinkProvider; import com.fr.js.JavaScript; @@ -146,30 +146,30 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb * @return 返回标题. */ public String title4PopupWindow() { - return Inter.getLocText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); } @Override protected JPanel createContentPane() { - isChartAnimation = new UICheckBox(Inter.getLocText("Chart-Animation_JSShow")); - isSeriesDragEnable = new UICheckBox(Inter.getLocText("Chart-Series_Drag")); - - isDatapointValue = new UICheckBox(Inter.getLocText("Chart-Use_Value")); - dataPointValueFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); - isDatapointPercent = new UICheckBox(Inter.getLocText("Chart-Value_Percent")); - dataPointPercentFormat = new UIButton(Inter.getLocText("Chart-Use_Format")); - tooltipStyle = new UIComboBox(new String[]{Inter.getLocText("Chart-White_Black"), Inter.getLocText("Chart-Black_White")}); - tooltipStyleLabel = new UILabel(Inter.getLocText("Chart-Style_Name")); - tooltipShowType = new UIComboBox(new String[]{Inter.getLocText("Chart-Series_SingleData"), Inter.getLocText("Chart-Series_AllData")}); - tooltipShowTypeLabel = new UILabel(Inter.getLocText("Chart-Use_Show")); - - isAddressTittle = new UICheckBox(Inter.getLocText("Chart-Area_Title")); - isAddress = new UICheckBox(Inter.getLocText("Chart-Gis_Address")); - isAddressName = new UICheckBox(Inter.getLocText("Chart-Address_Name")); - - isAxisShowToolTip = new UICheckBox(Inter.getLocText("Chart-Interactive_AxisTooltip")); - isAxisZoom = new UICheckBox(Inter.getLocText("Chart-Use_Zoom")); - isAutoRefresh = new UICheckBox(Inter.getLocText(new String[]{"Chart-Use_Auto", "Chart-Use_Refresh"})); + isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Animation_JSShow")); + isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Drag")); + + isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")); + dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); + dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-White_Black"), com.fr.design.i18n.Toolkit.i18nText("Chart-Black_White")}); + tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name")); + tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Series_SingleData"), com.fr.design.i18n.Toolkit.i18nText("Chart-Series_AllData")}); + tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show")); + + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name")); + + isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_AxisTooltip")); + isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom")); + isAutoRefresh = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Enable_Auto_Refresh")); autoRefreshTime = new UISpinner(1, Integer.MAX_VALUE, 1); superLink = new UICorrelationComboBoxPane(); @@ -179,7 +179,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb checkAutoRefresh(); } }); - timeSwitch = new UICheckBox(Inter.getLocText("FR-Chart-Interactive_timeSwitch")); + timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Interactive_timeSwitch")); timeSwitchPane = new TimeSwitchPane(); initFormatListener(); return initPaneWithListener(); @@ -326,7 +326,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb double[] rowSize = new double[]{p, p}; if (plot.isShowAllDataPointLabel()) { - isDatapointPercent.setText(Inter.getLocText("Chart-Value_Conversion")); + isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); } if (plot.isSupportAddress4Gis()) { UIButton tmpButton = new UIButton(); //用来调整对齐 @@ -408,11 +408,11 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAutoRefresh, null}, new Component[]{GUICoreUtils.createFlowPane(new Component[]{ - new UILabel(Inter.getLocText("Chart-Time_Interval")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Interval")), autoRefreshTime, - new UILabel(Inter.getLocText("Chart-Time_Seconds")) + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds")) }, 1)}, - new Component[]{new UILabel("" + Inter.getLocText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + ""), null}, + new Component[]{new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + ""), null}, }; autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize); } @@ -568,9 +568,9 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb addressType = ((GisMapReportDefinition) definition).isAddress(); } if (addressType) { - this.isAddress.setText(Inter.getLocText("Chart-Use_Address")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Address")); } else { - this.isAddress.setText(Inter.getLocText("Chart-Use_LatLng")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_LatLng")); } } } @@ -859,24 +859,24 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb List list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Reportlet"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Web"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Dynamic_Parameters"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Float_Chart"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Cell"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Float"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, Inter.getLocText("Chart-Link_Form"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), hyperlink, getUseMap(map, FormHyperlinkProvider.class))); return list; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java index 29617500a..09ca6a638 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartSwitchPane.java @@ -15,7 +15,7 @@ import com.fr.design.mainframe.chart.ChartEditPane; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.general.Inter; + public class ChartSwitchPane extends AbstractAttrNoScrollPane{ @@ -34,7 +34,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{ JPanel pane = new JPanel(); pane.setLayout(new BorderLayout()); - changeButton = new UIButton(Inter.getLocText("Switch")); + changeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Switch")); pane.add(changeButton, BorderLayout.NORTH); @@ -84,7 +84,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{ * @param 返回标题 */ public String title4PopupWindow() { - return Inter.getLocText("Chart-Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java index 0e1a65ffb..7c3838349 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.itextfield.UITextField; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -41,17 +41,17 @@ public class TimeSwitchPane extends JPanel implements UIObserver { private static final int TICK_WIDTH = 84; private static final int TICK_HEIGHT = 20; private static final int COM_GAP =5; - private static final String YEAR = Inter.getLocText("Year"); - private static final String MONTH =Inter.getLocText("Month"); - private static final String DAY =Inter.getLocText("Sun"); - private static final String HOUR = Inter.getLocText("Sche-Hour"); - private static final String MINUTE = Inter.getLocText("Sche-Minute"); - private static final String SECOND = Inter.getLocText("Sche-Second"); + private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year"); + private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Month"); + private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun"); + private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"); + private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"); + private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Sche-Second"); private static String[] TYPES = new String[]{ - Inter.getLocText("Year"), Inter.getLocText("Month"), Inter.getLocText("Sun"), - Inter.getLocText("Sche-Hour"), Inter.getLocText("Sche-Minute"), - Inter.getLocText("Sche-Second") + com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), + com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), + com.fr.design.i18n.Toolkit.i18nText("Sche-Second") }; private static Map VALUES = new HashMap(); @@ -66,12 +66,12 @@ public class TimeSwitchPane extends JPanel implements UIObserver { private static Map INTS = new HashMap(); static { - INTS.put(ChartConstants.YEAR_TYPE, Inter.getLocText("Year")); - INTS.put(ChartConstants.MONTH_TYPE, Inter.getLocText("Month")); - INTS.put(ChartConstants.DAY_TYPE, Inter.getLocText("Sun")); - INTS.put(ChartConstants.HOUR_TYPE, Inter.getLocText("Sche-Hour")); - INTS.put(ChartConstants.MINUTE_TYPE, Inter.getLocText("Sche-Minute")); - INTS.put(ChartConstants.SECOND_TYPE, Inter.getLocText("Sche-Second")); + INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); + INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Second")); } private UIButton addButton; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java index 899c4c019..92b268d97 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.style.NumberDragBar; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -81,18 +81,18 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ } private void initComponents() { - isLabelShow = new UICheckBox(Inter.getLocText("FR-Utils_Label")); - auto = new UICheckBox(Inter.getLocText(new String[]{"FR-App-All_Auto", "FR-Chart-Axis_labelInterval"})); - custom = new UICheckBox(Inter.getLocText(new String[]{"FR-App-All_Custom", "FR-Chart-Axis_labelInterval"})); - showWay = new UIComboBox(new String[]{Inter.getLocText("FR-Chart-Axis_labelInterval"),Inter.getLocText("FR-Chart-Axis_labelWrap")}); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Label")); + auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval")); + custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval")); + showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelInterval"),com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelWrap")}); customLabelSamleTime = new UITextField(); - String[] nameObjects = {Inter.getLocText("FR-Chart_All_Normal"), Inter.getLocText("FR-Chart-Text_Vertical"), Inter.getLocText("FR-Chart-Text_Rotation")}; + String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("FR-Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Text_Rotation")}; labelOrientationChoose = new UIComboBox(nameObjects); orientationBar = new NumberDragBar(-NUM90, NUM90); orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); - String[] sampleType = {Inter.getLocText("FR-App-All_Auto"), Inter.getLocText("FR-App-All_Custom")}; + String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Custom")}; labelSampleChoose = new UIComboBox(sampleType); customLabelSamleTime = new UITextField(); checkCustomSampleField(); @@ -160,8 +160,8 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(Inter.getLocText("FR-Chart-Axis_labelShowway")), showWay, null}, - new Component[]{null, new UILabel(Inter.getLocText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -214,7 +214,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(Inter.getLocText("FR-Chart-Axis_labelShowway")), showWay, null} + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelShowway")), showWay, null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } @@ -226,7 +226,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(Inter.getLocText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -288,8 +288,8 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null,new UILabel(Inter.getLocText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime}, - new Component[]{null,new UILabel(Inter.getLocText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelSampleChoose, customLabelSamleTime}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, new Component[]{null,orientationSpinner, orientationBar, null}, new Component[]{null,textAttrPane, null, null}, }; @@ -315,7 +315,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ * 界面标签 */ protected String title4PopupWindow() { - return Inter.getLocText("ChartF-Tick_Label"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Tick_Label"); } private int getLabelTextOrientationIndex(TextAttr textAttr) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index dcf7e2cd5..b8db10307 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; @@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineColor = new ColorSelectBox(100); - String[] nameArray = {Inter.getLocText("External"),Inter.getLocText("Inside"),Inter.getLocText("ChartF-Cross"),Inter.getLocText("None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"), @@ -53,11 +53,11 @@ public class ChartAxisLineStylePane extends BasicPane{ double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Type")),axisLineStyle} , - new Component[]{new UILabel(Inter.getLocText("Color")),axisLineColor}, - new Component[]{new UILabel(Inter.getLocText("MainGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null}, new Component[]{null, mainTickPosition}, - new Component[]{new UILabel(Inter.getLocText("SecondGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null}, new Component[]{null,secondTickPosition} } ; JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Style"},components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java index 58acf7161..0b00dd521 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.dialog.BasicPane; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -39,7 +39,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane { } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(Inter.getLocText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); axisTitleContentPane = new UITextField(); axisTitleAttrPane = new ChartTextAttrPane(); axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9)); @@ -57,7 +57,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,axisTitleContentPane}, new Component[]{null,axisTitleAttrPane}, - new Component[]{null,new UILabel(Inter.getLocText("Alignment-Style"))}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, new Component[]{null,titleAlignmentPane,}, }; titlePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -98,7 +98,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane { public void update(Axis axis) { if(isAxisTitleVisable.isSelected()) { if(axis.getTitle() == null) { - Title newTitle = new Title(Inter.getLocText(new String[]{"ChartF-Axis", "ChartF-Title"})); + Title newTitle = new Title(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); axis.setTitle(newTitle); axisTitleContentPane.setText(Utils.objectToString(newTitle.getTextObject())); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java index a83d27181..ca2c2d361 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StableUtils; @@ -38,7 +38,7 @@ public class ChartAxisTitlePane extends BasicPane{ } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(Inter.getLocText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); axisTitleContentPane = new TinyFormulaPane(); axisTitleAttrPane = new ChartTextAttrPane(); axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9)); @@ -56,7 +56,7 @@ public class ChartAxisTitlePane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{null,axisTitleContentPane}, new Component[]{null,axisTitleAttrPane}, - new Component[]{null,new UILabel(Inter.getLocText("Alignment-Style"))}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, new Component[]{null,titleAlignmentPane,}, }; titlePane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); @@ -97,7 +97,7 @@ public class ChartAxisTitlePane extends BasicPane{ public void update(Axis axis) { if(isAxisTitleVisable.isSelected()) { if(axis.getTitle() == null) { - Title newTitle = new Title(Inter.getLocText(new String[]{"ChartF-Axis", "ChartF-Title"})); + Title newTitle = new Title(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); axis.setTitle(newTitle); axisTitleContentPane.populateBean(Utils.objectToString(newTitle.getTextObject())); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java index ca3504f14..4858473f4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisValueTypePane.java @@ -9,7 +9,7 @@ import com.fr.chart.chartattr.CategoryAxis; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + /** * 坐标轴 值类型界面(文本坐标轴 或者 日期坐标轴). @@ -49,7 +49,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题. */ protected String title4PopupWindow() { - return Inter.getLocText("AxisValue"); + return com.fr.design.i18n.Toolkit.i18nText("AxisValue"); } /** @@ -110,7 +110,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Chart_Text_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Text_Axis"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java index 01b129228..42598a211 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.*; import com.fr.design.dialog.BasicPane; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -75,7 +75,7 @@ public class ChartBackgroundPane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{typeComboBox, null} , new Component[]{centerPane, null}, - new Component[]{new UILabel(Inter.getLocText("Chart_Alpha_Int")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Alpha_Int")), null}, new Component[]{null, transparent} }; JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Background"}, components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java index 5568eda69..edc5e496f 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -16,9 +16,9 @@ public class ChartBeautyPane extends BasicBeanPane{ private UIComboBox styleBox; public ChartBeautyPane() { - String[] nameArray = {Inter.getLocText("Common"), - Inter.getLocText("Plane3D"),Inter.getLocText(new String[]{"Gradient", "HighLight"}), - Inter.getLocText("TopDownShade"),Inter.getLocText("Transparent") //新加的两种风格，注意兼容处理 + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), + com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), + com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 }; styleBox = new UIComboBox(nameArray); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java index 749d0d9c1..b0c9ff66a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; @@ -28,14 +28,14 @@ public class ChartBorderPane extends BasicPane{ private void initComponents() { currentLineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); currentLineColorPane = new ColorSelectBox(100); - isRoundBorder = new UICheckBox(Inter.getLocText("Border-Style-Radius")); + isRoundBorder = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Border-Style-Radius")); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] columnSize = { p,f }; double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Line-Style")+":"),currentLineCombo}, - new Component[]{new UILabel(Inter.getLocText("Color")+":"),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java index 842f4f008..efade76a0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -34,15 +34,15 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{ public ChartDataPointLabel4GisPane(ChartStylePane parent){ this.parent = parent; - isLabelShow = new UICheckBox(Inter.getLocText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); - isAddressTittle = new UICheckBox(Inter.getLocText("Chart-Area_Title")); - isAddress = new UICheckBox(Inter.getLocText("Chart-Gis_Address")); + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address")); isAddress.setSelected(true); - isAddressName = new UICheckBox(Inter.getLocText("Chart-Address_Name")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name")); - isDatapointValue = new UICheckBox(Inter.getLocText("Chart-Use_Value")); - valueFormatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); divideComoBox = new UIComboBox(ChartConstants.DELIMITERS); textFontPane = new ChartTextAttrPane(); @@ -56,7 +56,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{ double[] rowSize = { p,p,p,p,p,p}; JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - delimiterPane.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); Component[][] components = new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java index 442c8bf07..e10688726 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -29,13 +29,13 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane { public ChartDataPointLabel4MapPane(ChartStylePane parent) { this.parent = parent; - isLabelShow = new UICheckBox(Inter.getLocText("FR-Chart-Chart_Label")); - isCategory = new UICheckBox(Inter.getLocText("FR-Chart-Area_Name")); - isValue = new UICheckBox(Inter.getLocText("FR-Chart-Area_Value")); - valueFormatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")); + isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); - isValuePercent = new UICheckBox(Inter.getLocText("Chart-Value_Percent")); - valuePercentFormatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); divideComoBox = new UIComboBox(ChartConstants.DELIMITERS); textFontPane = new ChartTextAttrPane(); @@ -58,7 +58,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane { components[4] = new Component[]{isValuePercent,valuePercentFormatButton} ; JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - delimiterPane.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); components[5] = new Component[]{delimiterPane,null}; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java index 6463e043d..21a51280a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java @@ -20,7 +20,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StringUtils; import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont; @@ -80,7 +80,7 @@ public class ChartDatapointLabelPane extends BasicPane{ public ChartDatapointLabelPane(String[] locationNameArray, Integer[] locationValueArray, Plot plot, ChartStylePane parent) { this.parent = parent; - isLabelShow = new UICheckBox(Inter.getLocText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); if(locationNameArray != null && locationNameArray.length > 0 && locationValueArray != null && locationValueArray.length > 0) { nameValueMap.clear(); @@ -96,18 +96,18 @@ public class ChartDatapointLabelPane extends BasicPane{ boolean isGuidline = plot.isSupportLeadLine(); if(plot.isSupportCategoryFilter()) { - isCategory = new UICheckBox(Inter.getLocText("Chart-Category_Name")); + isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name")); } - isSeries = new UICheckBox(Inter.getLocText("Chart-Series_Name")); - isValue = new UICheckBox(Inter.getLocText("Chart-Use_Value")); + isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")); + isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")); isValue.setSelected(true); - valueFormatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); if(plot.isSupportValuePercent()) { - isValuePercent = new UICheckBox(Inter.getLocText("Chart-Value_Percent")); - valuePercentFormatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); if (plot.isShowAllDataPointLabel()) { - isValuePercent.setText(Inter.getLocText("Chart-Value_Conversion")); + isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); } } @@ -117,7 +117,7 @@ public class ChartDatapointLabelPane extends BasicPane{ textFontPane = new ChartTextAttrPane(); if(isGuidline) { - isGuid = new UICheckBox(Inter.getLocText("ChartF-Show_GuidLine")); + isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine")); } if (plot.isShowAllDataPointLabel()) { @@ -140,7 +140,7 @@ public class ChartDatapointLabelPane extends BasicPane{ if(positionBox != null) { JPanel positionPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); - positionPane.add(new BoldFontTextLabel(Inter.getLocText("Chart-Layout_Position")), BorderLayout.WEST); + positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")), BorderLayout.WEST); positionPane.add(positionBox, BorderLayout.CENTER); components[0] = new Component[]{positionPane, null}; if(isGuidline) { @@ -166,7 +166,7 @@ public class ChartDatapointLabelPane extends BasicPane{ JPanel delimiterPane = new JPanel(new BorderLayout(LayoutConstants.VGAP_MEDIUM, LayoutConstants.VGAP_MEDIUM)); if (plot.isSupportDelimiter()) { - delimiterPane.add(new BoldFontTextLabel(Inter.getLocText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); delimiterPane.add(divideComoBox, BorderLayout.CENTER); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java index 7ddd89d52..2192d1a1a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.background.gradient.FixedGradientBar; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.JPanel; @@ -55,8 +55,8 @@ public class ChartFillStylePane extends BasicBeanPane{ JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - buttonPane.add(accButton = new UIButton(Inter.getLocText("FR-Designer_Chart_Acc_Set"))); - buttonPane.add(gradientButton = new UIButton(Inter.getLocText("FR-Designer_Gradient-Color"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient-Color"))); customPane.add(buttonPane, BorderLayout.NORTH); changeColorSetPane = new JPanel(cardLayout = new CardLayout()); @@ -129,19 +129,19 @@ public class ChartFillStylePane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Chart", "Color"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color"); } private String[] getNameObj() { ChartPreStyleConfig config = ChartPreStyleConfig.getInstance(); ArrayList nameArr = new ArrayList(); - nameArr.add(Inter.getLocText("FR-Designer_DEFAULT")); + nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); Iterator keys = config.names(); while (keys.hasNext()) { Object key = keys.next(); nameArr.add(Utils.objectToString(key)); } - nameArr.add(Inter.getLocText("FR-Designer_Custom")); + nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); return nameArr.toArray(new String[nameArr.size()]); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index 7a28ecf54..39f16e861 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane { } protected Component[][] getComponents(JPanel buttonPane) { - UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{null, null}, new Component[]{text, fontNameComboBox}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 4ed76c91d..0a7e6bea6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -23,7 +23,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.FormatBox; import com.fr.general.DateUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -48,29 +48,29 @@ import java.util.regex.Pattern; public class DateAxisValuePane extends FurtherBasicBeanPane{ private static String[] TYPES = new String[]{ - Inter.getLocText("Year"), Inter.getLocText("Month"), Inter.getLocText("Sun"), - Inter.getLocText("Sche-Hour"), Inter.getLocText("Sche-Minute"), - Inter.getLocText("Sche-Second") + com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), + com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), + com.fr.design.i18n.Toolkit.i18nText("Sche-Second") }; private static Map VALUES = new HashMap(); static { - VALUES.put(Inter.getLocText("Year"), ChartConstants.YEAR_TYPE); - VALUES.put(Inter.getLocText("Month"), ChartConstants.MONTH_TYPE); - VALUES.put(Inter.getLocText("Sun"), ChartConstants.DAY_TYPE); - VALUES.put(Inter.getLocText("Sche-Hour"), ChartConstants.HOUR_TYPE); - VALUES.put(Inter.getLocText("Sche-Minute"), ChartConstants.MINUTE_TYPE); - VALUES.put(Inter.getLocText("Sche-Second"), ChartConstants.SECOND_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Month"), ChartConstants.MONTH_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sun"), ChartConstants.DAY_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), ChartConstants.HOUR_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), ChartConstants.MINUTE_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Second"), ChartConstants.SECOND_TYPE); } private static Map INTS = new HashMap(); static { - INTS.put(ChartConstants.YEAR_TYPE, Inter.getLocText("Year")); - INTS.put(ChartConstants.MONTH_TYPE, Inter.getLocText("Month")); - INTS.put(ChartConstants.DAY_TYPE, Inter.getLocText("Sun")); - INTS.put(ChartConstants.HOUR_TYPE, Inter.getLocText("Sche-Hour")); - INTS.put(ChartConstants.MINUTE_TYPE, Inter.getLocText("Sche-Minute")); - INTS.put(ChartConstants.SECOND_TYPE, Inter.getLocText("Sche-Second")); + INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); + INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Second")); } // 最大最小值 @@ -94,10 +94,10 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMin() { // 最小值. - minCheckBox = new UICheckBox(Inter.getLocText("Min_Value")); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, Inter.getLocText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minValueField.setEnabled(false); @@ -110,10 +110,10 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMax() { // 最大值 - maxCheckBox = new UICheckBox(Inter.getLocText("Max_Value")); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, Inter.getLocText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxValueField.setEnabled(false); @@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMain() { // 主要刻度单位 - mainTickBox = new UICheckBox(Inter.getLocText("MainGraduationUnit")); + mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit")); mainUnitField = new UITextField(); mainUnitField.setPreferredSize(new Dimension(30, 20)); mainUnitField.setEditable(false); @@ -238,7 +238,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ @Override public String title4PopupWindow() { - return Inter.getLocText("Chart_Date_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"); } private void checkBoxUse() { @@ -358,7 +358,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ String tmp = DateUtils.getDate2LStr(toDate); toDate = DateUtils.DATETIMEFORMAT2.parse(tmp); } catch (ParseException e) { - FineLoggerFactory.getLogger().error(Inter.getLocText("Cannot_Get_Date")); + FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Cannot_Get_Date")); } return toDate; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java index 53d67719f..1ea436824 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java @@ -30,7 +30,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; /** @@ -109,7 +109,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ private JPanel createAlertLinePane(String[] title, boolean first){ List list = new ArrayList(); - list.add(new UIMenuNameableCreator(Inter.getLocText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); if(first){ xAlertPane = new UICorrelationComboBoxPane(list); }else{ @@ -164,9 +164,9 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ boolean useLeftRight = numberAxis.getPosition() == Constants.LEFT || numberAxis.getPosition() == Constants.RIGHT; List menuList = new ArrayList(); if(useLeftRight) { - menuList.add(new UIMenuNameableCreator(Inter.getLocText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); } else { - menuList.add(new UIMenuNameableCreator(Inter.getLocText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class)); } editAlertPane.refreshMenuAndAddMenuAction(menuList); @@ -274,7 +274,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ lineInfo.setAttrLineColor(new AttrColor(Color.gray)); trendLine.setLineStyleInfo(lineInfo); conditionLine.setLine(trendLine); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class)); trendLinePane = new UICorrelationComboBoxPane(list); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java index 776bdadf2..e6f7d3b60 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.design.style.color.ColorSelectBox; @@ -55,8 +55,8 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { verticalColorPane = new ColorSelectBox(100); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Utils-Left_to_Right") + ":"),horizontalColorPane}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Utils-Top_to_Bottom") + ":"),verticalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom") + ":"),verticalColorPane}, }; backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_Interval_Back"}, components, rowSize, columnSize); @@ -69,12 +69,12 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { double[] rowSize = {p,p}; double[] columnSize = { p, f }; - isVerticleGridLine = new UICheckBox(Inter.getLocText("Utils-Left_to_Right")); - isHorizontalGridLine = new UICheckBox(Inter.getLocText("Utils-Top_to_Bottom")); + isVerticleGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")); gridColorPane = new ColorSelectBox(100); JPanel container = TableLayoutHelper.createTableLayoutPane(new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Color")),gridColorPane},} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane},} , rowSize, columnSize); Component[][] components = new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java index 43de42628..e13420324 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.design.style.color.ColorSelectBox; @@ -18,7 +18,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane { private ColorSelectBox gridColorPane; public Plot3DAxisAreaPane() { - gridLine = new UICheckBox(Inter.getLocText("ChartF-Grid_Line")); + gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line")); gridColorPane = new ColorSelectBox(100); double p = TableLayout.PREFERRED; @@ -28,7 +28,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane { Component[][] components = new Component[][]{ new Component[]{gridLine,null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Color")),gridColorPane,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java index c4bdc7109..9aeb036a1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java @@ -12,7 +12,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.design.style.color.ColorSelectBox; @@ -24,7 +24,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { public RadarAxisAreaPane() { horizontalColorPane = new ColorSelectBox(100); - isHorizontalGridLine = new UICheckBox(Inter.getLocText("Chart_Main_Grid")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")); gridColorPane = new ColorSelectBox(100); double p = TableLayout.PREFERRED; @@ -33,10 +33,10 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Interval_Back") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Main_Grid")),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Color")),gridColorPane,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")),null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java index 78bf74f6c..f2244aeb1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java @@ -14,7 +14,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartAxisTitleNoFormulaPane; import com.fr.design.mainframe.chart.gui.style.ChartAxisTitlePane; import com.fr.design.mainframe.chart.gui.style.ChartAxisValueTypePane; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont; @@ -52,7 +52,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ axisLineStylePane = new ChartAxisLineStylePane(); formatPane = new FormatPaneWithOutFont(); axisLabelPane = new ChartAxisLabelPane(); - axisReversed = new UICheckBox(Inter.getLocText("AxisReversed")); + axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("AxisReversed")); this.setLayout(new BorderLayout()); this.add(isSupportLineStyle() ? getPaneWithLineStyle() : getPaneWithOutLineStyle(),BorderLayout.CENTER); } @@ -123,7 +123,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText("ChartF-Category_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java index 93d577160..9f8d43b0a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartRadarPane.java @@ -5,7 +5,7 @@ import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.RadarAxis; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -27,7 +27,7 @@ public class ChartRadarPane extends ChartValuePane{ JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); valuePane.add(buttonPane); - String[] names = new String[]{Inter.getLocText("Chart_Axis_AutoCount"), Inter.getLocText("Chart_Axis_UnitCount")}; + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_AutoCount"), com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_UnitCount")}; Boolean[] values = new Boolean[]{Boolean.FALSE, Boolean.TRUE}; allMaxMin = new UIButtonGroup(names, values); buttonPane.add(allMaxMin); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java index 2cb7f0da1..bdceb6f47 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.style.axis; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.ValueAxis; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -17,7 +17,7 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{ protected JPanel aliagnZero4Second() {// 添加 0值对齐 JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - pane.add(isAlignZeroValue = new UICheckBox(Inter.getLocText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); return pane; } @@ -41,6 +41,6 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{ * @return 第二值轴 */ public String title4PopupWindow() { - return Inter.getLocText(new String[]{"Second", "Chart_F_Radar_Axis"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Second", "Chart_F_Radar_Axis"}); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java index 094d78f03..a45210a86 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValuePane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.style.axis; import com.fr.chart.chartattr.Axis; import com.fr.chart.chartattr.ValueAxis; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -20,7 +20,7 @@ public class ChartSecondValuePane extends ChartValuePane { protected JPanel aliagnZero4Second() {// 添加 0值对齐 JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - pane.add(isAlignZeroValue = new UICheckBox(Inter.getLocText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); return pane; } @@ -44,6 +44,6 @@ public class ChartSecondValuePane extends ChartValuePane { * @return 第二值轴 */ public String title4PopupWindow() { - return Inter.getLocText(new String[]{"Second", "Chart_F_Radar_Axis"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java index 3fcd8a916..3d468abb1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java @@ -24,7 +24,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartAxisLineStylePane; import com.fr.design.mainframe.chart.gui.style.ChartAxisTitleNoFormulaPane; import com.fr.design.mainframe.chart.gui.style.ChartAxisTitlePane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StringUtils; import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont; @@ -77,7 +77,7 @@ public class ChartValuePane extends ChartAxisUsePane{ axisLineStylePane = new ChartAxisLineStylePane(); zeroPane = aliagnZero4Second(); - axisReversed = new UICheckBox(Inter.getLocText("FR-Designer_AxisReversed")); + axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")); unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES); formatPane = new FormatPaneWithOutFont(); axisLabelPane = new ChartAxisLabelPane(); @@ -117,7 +117,7 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, new Component[]{new JSeparator()}, - new Component[]{new UILabel(Inter.getLocText(new String[]{"Value", "Define"}))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Define"))}, new Component[]{dataPane}, } ; @@ -143,7 +143,7 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, new Component[]{new JSeparator()}, - new Component[]{new UILabel(Inter.getLocText(new String[]{"Value", "Define"}))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Define"))}, new Component[]{dataPane}, } ; @@ -176,8 +176,8 @@ public class ChartValuePane extends ChartAxisUsePane{ // 返回对数相关界面. 百分比 没有此界面. protected JPanel addLogarithmicPane2ValuePane() { JPanel labelLogPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - labelLogPane.add(logBox = new UICheckBox(Inter.getLocText("FR-Designer_Logarithmic")+":")); - labelLogPane.add(new UILabel(Inter.getLocText("FR-Designer_Chart_Log_Base"))); + labelLogPane.add(logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Logarithmic")+":")); + labelLogPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Log_Base"))); logBaseField = new UITextField(4); logBaseField.setText("10"); @@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane{ * @return 返回标题. */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Chart_F_Radar_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_F_Radar_Axis"); } @Override @@ -335,7 +335,7 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, new Component[]{new JSeparator()}, - new Component[]{new UILabel(Inter.getLocText(new String[]{"Value", "Define"}))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Define"))}, new Component[]{dataPane}, } ; @@ -360,7 +360,7 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, new Component[]{new JSeparator()}, - new Component[]{new UILabel(Inter.getLocText(new String[]{"Value", "Define"}))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Define"))}, new Component[]{dataPane}, } ; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java index 54b997915..ab4ca532e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java @@ -10,7 +10,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartDataPointLabel4GisPane; import com.fr.design.mainframe.chart.gui.style.ChartDataPointLabel4MapPane; import com.fr.design.mainframe.chart.gui.style.ChartDatapointLabelPane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -93,13 +93,13 @@ public class ChartDataLabelPane extends BasicScrollPane{ protected String[] getLabelLocationNameArray() { Plot plot = chart.getPlot(); if(plot instanceof BarPlot){ - return new String[] {Inter.getLocText("BarInside"), Inter.getLocText("BarOutSide"), Inter.getLocText("Center")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("BarInside"), com.fr.design.i18n.Toolkit.i18nText("BarOutSide"), com.fr.design.i18n.Toolkit.i18nText("Center")}; }else if(plot instanceof PiePlot){ - return new String[] {Inter.getLocText("Chart_In_Pie"), Inter.getLocText("Chart_Out_Pie")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; }else if(plot instanceof RangePlot){ - return new String[]{Inter.getLocText("StyleAlignment-Top"), Inter.getLocText("StyleAlignment-Bottom"), Inter.getLocText("Center")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), com.fr.design.i18n.Toolkit.i18nText("Center")}; }else if(plot instanceof BubblePlot){ - return new String[] {Inter.getLocText("Chart_Bubble_Inside"), Inter.getLocText("Chart_Bubble_Outside")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")}; }else{ return new String[0]; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java index e0919c235..970e7889d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrNoColorPane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Label"); + return com.fr.design.i18n.Toolkit.i18nText("Label"); } private class ContentPane extends JPanel { - private UILabel value = new UILabel(Inter.getLocText("Value")); - private UILabel unit = new UILabel(Inter.getLocText("ChartF-Units")); + private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); + private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Units")); public ContentPane() { this.initComponents(); @@ -108,7 +108,7 @@ public class ChartLabelFontPane extends BasicScrollPane { valueTextAttrPane = new ChartTextAttrNoColorPane(); unitTextAttrPane = new ChartTextAttrNoColorPane(); cateTextAttrPane = new ChartTextAttrNoColorPane(); - categoryName = new UICheckBox(Inter.getLocText(new String[]{"StyleFormat-Category", "WF-Name"})); + categoryName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); categoryName.setSelected(true); categoryName.addActionListener(new ActionListener() { @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java index de04cb80d..faa2d25e1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datasheet/ChartDatasheetPane.java @@ -16,7 +16,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.mainframe.chart.gui.style.axis.ChartAxisPane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.format.FormatPaneWithNormalType; import javax.swing.JPanel; @@ -46,13 +46,13 @@ public class ChartDatasheetPane extends BasicScrollPane{ double f = TableLayout.FILL; double[] columnSize = {LayoutConstants.CHART_ATTR_TOMARGIN,f}; double[] rowSize = { p, p, p, p}; - isDatasheetVisable = new UICheckBox(Inter.getLocText("Chart_Show_Data_Sheet")); + isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Show_Data_Sheet")); textAttrPane = new ChartTextAttrPane(); formatPane = new FormatPaneWithNormalType(); Component[][] components = new Component[][]{ new Component[]{null,textAttrPane}, new Component[]{new JSeparator(),null}, - new Component[]{new UILabel(Inter.getLocText("Data_Type")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data_Type")), null}, new Component[]{null,formatPane}, }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java index a53d0a7ac..6186f96e3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java @@ -15,7 +15,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartBackgroundNoImagePane; import com.fr.design.mainframe.chart.gui.style.ChartBorderPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -52,12 +52,12 @@ public class ChartLegendPane extends BasicScrollPane{ } private void initComponents(){ - isLegendVisible = new UICheckBox(Inter.getLocText("Chart_Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Legend_Is_Visible")); textAttrPane = new ChartTextAttrPane(); borderPane = new ChartBorderPane(); - String[] textArray = {Inter.getLocText("StyleAlignment-Top"), Inter.getLocText("StyleAlignment-Bottom"), - Inter.getLocText("StyleAlignment-Left"), Inter.getLocText("StyleAlignment-Right"), Inter.getLocText("Right_Top")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), com.fr.design.i18n.Toolkit.i18nText("Right_Top")}; Integer[] valueArray = {Constants.TOP, Constants.BOTTOM, Constants.LEFT, Constants.RIGHT, Constants.RIGHT_TOP}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_top.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_bottom.png"), @@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane{ Component[][] components = new Component[][]{ new Component[]{null,textAttrPane}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Layout")),location} , + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} , new Component[]{new JSeparator(),null}, new Component[]{borderPane,null}, new Component[]{backgroundPane,null} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java index 1f54bfd06..3d720f3ff 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AbstractPlotSeriesPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -91,7 +91,7 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ * 界面标题. */ protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java index 139ceb925..f72aa8982 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java @@ -9,7 +9,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + /** * 属性表, 三维面积图 图表样式-系列界面. @@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane { JPanel pane = new JPanel(); pane.setLayout(new BorderLayout()); - pane.add(new BoldFontTextLabel(Inter.getLocText("Pitch_Percentage") + ":"), BorderLayout.WEST); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST); pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER); gapPane.populateBean(100.0); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java index 560617829..5c195fd49 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/AreaSeriesPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartBeautyPane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -36,7 +36,7 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { stylePane = new ChartBeautyPane(); - isCurve = new UICheckBox(Inter.getLocText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); double p = TableLayout.PREFERRED; @@ -46,8 +46,8 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java index fadcfa7ec..f6e000c66 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar2DSeriesPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartBeautyPane; -import com.fr.general.Inter; + public class Bar2DSeriesPane extends AbstractPlotSeriesPane{ @@ -48,8 +48,8 @@ public class Bar2DSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Series")), seriesGap}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Category")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap} }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java index 8731ad5f0..c05e51182 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Bar3DSeriesPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import java.awt.*; @@ -43,8 +43,8 @@ public class Bar3DSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = {p, f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Series")), seriesGap}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Category")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")), categoryGap} }; pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java index 187bf7058..04de8bfe1 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java @@ -16,7 +16,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + public class BubbleSeriesPane extends AbstractPlotSeriesPane{ protected UIButtonGroup bubbleMean; @@ -51,12 +51,12 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ } protected void initCom(){ - String[] nameArray = {Inter.getLocText(new String[]{"Chart_Bubble", "Chart_Area"}), - Inter.getLocText("Bubble-Width")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}), + com.fr.design.i18n.Toolkit.i18nText("Bubble-Width")}; Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH}; bubbleMean = new UIButtonGroup(nameArray, valueArray); zoomTime = new UITextField(); - isMinus = new UICheckBox(Inter.getLocText(new String[]{"Display", "Chart_Negative_Bubble"})); + isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Display", "Chart_Negative_Bubble"})); } @Override @@ -70,7 +70,7 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{bubbleMean,null}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, new Component[]{isMinus,null} } ; JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java index c50bda30a..4de4f6f48 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBar2DSeriesPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartBeautyPane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -36,10 +36,10 @@ public class CombinedBar2DSeriesPane extends Bar2DSeriesPane{ double[] columnSize = {p, f}; double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Type_Column"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"))}, new Component[]{fillColorPane, null}, new Component[]{stylePane, null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Change_Bar_Size")),zoomTime} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Bar_Size")),zoomTime} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java index 222572325..b738b02c2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedBubbleSeriesPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -33,10 +33,10 @@ public class CombinedBubbleSeriesPane extends BubbleSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Chart_BubbleChart")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart")), null}, new Component[]{fillColorPane, null}, new Component[]{bubbleMean,null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, new Component[]{isMinus,null} }; JPanel pane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java index 003aa7126..5f27c3760 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CombinedPie2DSeriesPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -35,10 +35,10 @@ public class CombinedPie2DSeriesPane extends Pie2DSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Type_Pie")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Pie")),null}, new Component[]{fillColorPane, null}, new Component[]{stylePane,null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart-Change_Pie_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Pie_Size")),zoomTime}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java index dfaf34555..c2f6e941f 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.xcombox.MarkerComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import java.awt.*; @@ -27,12 +27,12 @@ import java.util.List; */ public class CustomDefaultSeriesPane extends BasicPane{ - private static final String BAR = Inter.getLocText("ChartF-Column"); - private static final String BAR_STACK = Inter.getLocText("I-BarStyle_NormalStack"); - private static final String BAR3D = Inter.getLocText("FR-Chart-Bar3D_Chart"); - private static final String BAR3D_STACK = Inter.getLocText("FR-Chart-Bar3DStack_Chart"); - private static final String LINE = Inter.getLocText("I-LineStyle_Line"); - private static final String AREA_STACK = Inter.getLocText("I-AreaStyle_Stack"); + private static final String BAR = com.fr.design.i18n.Toolkit.i18nText("ChartF-Column"); + private static final String BAR_STACK = com.fr.design.i18n.Toolkit.i18nText("I-BarStyle_NormalStack"); + private static final String BAR3D = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3D_Chart"); + private static final String BAR3D_STACK = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3DStack_Chart"); + private static final String LINE = com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line"); + private static final String AREA_STACK = com.fr.design.i18n.Toolkit.i18nText("I-AreaStyle_Stack"); private UIComboBoxPane boxPane; @@ -147,8 +147,8 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = {p, f}; double[] rowSize = { p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Series_Gap")), seriesGap}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Category_Gap")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Gap")), categoryGap} }; this.add(TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize), BorderLayout.NORTH); @@ -237,10 +237,10 @@ public class CustomDefaultSeriesPane extends BasicPane{ public CustomLineDefaultSeriesPane(){ this.setLayout(new BorderLayout()); - isCurve = new UICheckBox(Inter.getLocText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {Inter.getLocText("Chart_Null_Value_Break"), Inter.getLocText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -248,10 +248,10 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Line-Style")),lineStyle}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Marker_Type")), markerPane}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} }; this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH); @@ -309,7 +309,7 @@ public class CustomDefaultSeriesPane extends BasicPane{ this.setLayout(new BorderLayout()); - isCurve = new UICheckBox(Inter.getLocText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); double p = TableLayout.PREFERRED; @@ -317,8 +317,8 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = { p,f }; double[] rowSize = { p,p }; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} }; this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java index f6a145350..2d859f547 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java @@ -18,7 +18,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartBeautyPane; -import com.fr.general.Inter; + /** * 组合图, 属性表, 图表样式-系列. @@ -46,10 +46,10 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{stylePane}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Series_Use_Default"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Series_Use_Default"))}, new Component[]{defaultSeriesStyle}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Add_Series_Setting"), SwingConstants.LEFT)}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Add_Series_Setting"), SwingConstants.LEFT)}, new Component[]{conditionPane} } ; @@ -69,7 +69,7 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { } List list = new ArrayList(); - list.add(new UIMenuNameableCreator(Inter.getLocText("FR-Chart-Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); conditionPane.refreshMenuAndAddMenuAction(list); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java index f3719329c..1fb1b8d09 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java @@ -19,7 +19,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import javax.swing.*; @@ -63,7 +63,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ liteConditionPane = new ChartConditionPane(); JPanel conditionPane = new JPanel(); conditionPane.setLayout(new BoxLayout(conditionPane, BoxLayout.Y_AXIS)); - conditionPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Chart-Series_Config"), null)); + conditionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"), null)); conditionPane.add(liteConditionPane); this.setLayout(new BorderLayout()); @@ -137,12 +137,12 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private JPanel getCustomAttrPane() { JPanel stylePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); - stylePane.add(barRadioButton = new UIRadioButton(Inter.getLocText("ChartF-Column"))); - stylePane.add(barStackButton = new UIRadioButton(Inter.getLocText("I-BarStyle_NormalStack"))); - stylePane.add(bar3DRadioButton = new UIRadioButton(Inter.getLocText("FR-Chart-Bar3D_Chart"))); - stylePane.add(bar3DStackButton = new UIRadioButton(Inter.getLocText("FR-Chart-Bar3DStack_Chart"))); - stylePane.add(lineRadioButton = new UIRadioButton(Inter.getLocText("ChartF-Line"))); - stylePane.add(areaStackButton = new UIRadioButton(Inter.getLocText("I-AreaStyle_Stack"))); + stylePane.add(barRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Column"))); + stylePane.add(barStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("I-BarStyle_NormalStack"))); + stylePane.add(bar3DRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3D_Chart"))); + stylePane.add(bar3DStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Bar3DStack_Chart"))); + stylePane.add(lineRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Line"))); + stylePane.add(areaStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("I-AreaStyle_Stack"))); ButtonGroup rendererButtonGroup = new ButtonGroup(); rendererButtonGroup.add(barRadioButton); @@ -168,7 +168,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ cardLayout.show(cardPane, "Bar"); JPanel styleChoosePane = new JPanel(); - styleChoosePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Chart-Choose_Style"), null)); + styleChoosePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Choose_Style"), null)); styleChoosePane.setLayout(new BoxLayout(styleChoosePane, BoxLayout.Y_AXIS)); styleChoosePane.add(stylePane); styleChoosePane.add(mainPane); @@ -246,7 +246,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return Inter.getLocText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); } private class CustomTypeBarSeriesPane extends BasicBeanPane{ @@ -257,8 +257,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UINumberDragPane categoryGap; public CustomTypeBarSeriesPane(){ - UILabel nameLabel = new UILabel(Inter.getLocText("FR-Chart-Axis_Choose")); - String[] names = new String[]{Inter.getLocText("ChartF-MainAxis"), Inter.getLocText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -276,8 +276,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] columnSize = {p, p}; double[] rowSize = { p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Series_Gap")), seriesGap}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Category_Gap")), categoryGap} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Gap")), categoryGap} }; @@ -312,7 +312,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return Inter.getLocText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); } } @@ -320,8 +320,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeBar3DSeriesPane(){ - UILabel nameLabel = new UILabel(Inter.getLocText("FR-Chart-Axis_Choose")); - String[] names = new String[]{Inter.getLocText("ChartF-MainAxis"), Inter.getLocText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -354,7 +354,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return Inter.getLocText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); } } @@ -364,8 +364,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeAreaSeriesPane(){ - UILabel nameLabel = new UILabel(Inter.getLocText("FR-Chart-Axis_Choose")); - String[] names = new String[]{Inter.getLocText("ChartF-MainAxis"), Inter.getLocText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -374,7 +374,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ positionPane.add(nameLabel); positionPane.add(positionGroup); - isCurve = new UICheckBox(Inter.getLocText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); markerPane.setPreferredSize(new Dimension(150,20)); @@ -383,8 +383,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] rowSize = { p,p,p }; Component[][] components = new Component[][]{ new Component[]{positionPane, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Marker_Type")), markerPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane} }; this.setLayout(new BorderLayout()); @@ -419,7 +419,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return Inter.getLocText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); } } @@ -432,8 +432,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ protected MarkerComboBox markerPane; public CustomTypeLineSeriesPane(){ - UILabel nameLabel = new UILabel(Inter.getLocText("FR-Chart-Axis_Choose")); - String[] names = new String[]{Inter.getLocText("ChartF-MainAxis"), Inter.getLocText("ChartF-SecondAxis")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-MainAxis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-SecondAxis")}; String[] values = new String[]{ChartAxisPosition.AXIS_LEFT.getAxisPosition(), ChartAxisPosition.AXIS_RIGHT.getAxisPosition()}; positionGroup = new UIButtonGroup(names, values); positionGroup.setAllToolTips(names); @@ -442,14 +442,14 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ positionPane.add(nameLabel); positionPane.add(positionGroup); - isCurve = new UICheckBox(Inter.getLocText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); isCurve.setPreferredSize(new Dimension(150,20)); lineStyle.setPreferredSize(new Dimension(150,20)); markerPane.setPreferredSize(new Dimension(150,20)); - String[] nameArray = {Inter.getLocText("Chart_Null_Value_Break"), Inter.getLocText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -457,10 +457,10 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{positionPane, null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Line-Style")),lineStyle}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Marker_Type")), markerPane}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} }; this.setLayout(new BorderLayout()); @@ -499,7 +499,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return Inter.getLocText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); } } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java index 378fdc5be..7b2712f87 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java @@ -16,7 +16,7 @@ import com.fr.design.gui.xcombox.MarkerComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; @@ -46,10 +46,10 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(Inter.getLocText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {Inter.getLocText("Chart_Null_Value_Break"), Inter.getLocText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -57,10 +57,10 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Line-Style")),lineStyle}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"ChartF-Marker", "FS_Report_Type"})), markerPane}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java index a178de6ff..cef280dfa 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MapSeriesPane.java @@ -15,7 +15,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.JPanel; import javax.swing.JSeparator; @@ -52,7 +52,7 @@ public class MapSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isHeatMap = new UICheckBox(Inter.getLocText("FR-Chart-Heat_Map")); + isHeatMap = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Heat_Map")); isHeatMap.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { checkHeatMapAreaTitles(); @@ -69,8 +69,8 @@ public class MapSeriesPane extends AbstractPlotSeriesPane{ double[] rowSize = { p, p, p, p, p}; Component[][] components = new Component[][]{ new Component[]{isHeatMap, null}, - new Component[]{new UILabel(Inter.getLocText("Chart-Data_Configuration")), areaTitles}, - new Component[]{new UILabel(Inter.getLocText("ChartF_ValueRange_MatchColor")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Configuration")), areaTitles}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF_ValueRange_MatchColor")),null}, new Component[]{colorPickPane,null}, } ; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 61af6458b..19602d5c2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import javax.swing.JPanel; import javax.swing.JSeparator; @@ -43,8 +43,8 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { protected JPanel getContentInPlotType() { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); - String[] orderUnit = new String[]{Inter.getLocText("Ge"), Inter.getLocText("Unit_Ten"), Inter.getLocText("Unit_Hundred"), - Inter.getLocText("Unit_Thousand"), Inter.getLocText("Unit_Ten_Thousand")}; + String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), + com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); @@ -73,12 +73,12 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] tmpComponent = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Pointer-A-Tick-Order") + ":", SwingUtilities.LEFT), order} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pointer-A-Tick-Order") + ":", SwingUtilities.LEFT), order} }; JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Unit") + ":", SwingUtilities.LEFT), unit}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Unit") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, new Component[]{colorPickerPane, null}, @@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return components; } else { components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Unit") + ":", SwingUtilities.LEFT), unit}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Unit") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, new Component[]{colorPickerPane, null}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java index 414dc131c..db7ba4257 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java @@ -1,13 +1,5 @@ package com.fr.design.mainframe.chart.gui.style.series; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JPanel; -import javax.swing.JSeparator; -import javax.swing.SpinnerNumberModel; - import com.fr.base.Utils; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.PiePlot; @@ -20,109 +12,113 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartBeautyPane; -import com.fr.general.Inter; import com.fr.design.utils.gui.GUICoreUtils; -public class Pie2DSeriesPane extends AbstractPlotSeriesPane{ +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +public class Pie2DSeriesPane extends AbstractPlotSeriesPane { - private static final long serialVersionUID = 2800670681079289596L; + private static final long serialVersionUID = 2800670681079289596L; private static final int NUM = 100; protected ChartBeautyPane stylePane; - protected UICheckBox isSecondPlot; - protected UIButtonGroup secondPlotType; - protected UIBasicSpinner smallPercent; - - public Pie2DSeriesPane(ChartStylePane parent, Plot plot) { - super(parent, plot, false); - } - - - protected void initCom() { - stylePane = new ChartBeautyPane(); - isSecondPlot = new UICheckBox(Inter.getLocText("Chart_Second_Plot")); - String[] nameArray = {Inter.getLocText("PieStyle"),Inter.getLocText("BarStyle")}; - Integer[] valueArray = {0, 1}; - secondPlotType = new UIButtonGroup(nameArray, valueArray); - smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); - - secondPlotType.setSelectedIndex(0); - - isSecondPlot.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - checkBoxUse(); - } - }); - } - - @Override - protected JPanel getContentInPlotType() { - initCom(); - - double p = TableLayout.PREFERRED; - double f = TableLayout.FILL; - double[] columnSize = { p, f }; - double[] rowSize = { p, p,p,p,p}; + protected UICheckBox isSecondPlot; + protected UIButtonGroup secondPlotType; + protected UIBasicSpinner smallPercent; + + public Pie2DSeriesPane(ChartStylePane parent, Plot plot) { + super(parent, plot, false); + } + + + protected void initCom() { + stylePane = new ChartBeautyPane(); + isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; + Integer[] valueArray = {0, 1}; + secondPlotType = new UIButtonGroup(nameArray, valueArray); + smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); + + secondPlotType.setSelectedIndex(0); + + isSecondPlot.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + checkBoxUse(); + } + }); + } + + @Override + protected JPanel getContentInPlotType() { + initCom(); + + double p = TableLayout.PREFERRED; + double f = TableLayout.FILL; + double[] columnSize = {p, f}; + double[] rowSize = {p, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{stylePane,null}, - new Component[]{new JSeparator(),null}, - new Component[]{isSecondPlot,null}, - new Component[]{new UILabel(" "+Inter.getLocText(new String[]{"Chart_Second_Plot", "Content"})),secondPlotType}, - new Component[]{new UILabel(" "+Inter.getLocText(new String[]{"ConditionB-is_less_than", "StyleFormat-Percent"})),smallPercent} - } ; - - return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); - } - - private void checkBoxUse() { - boolean use = isSecondPlot.isSelected(); - GUICoreUtils.setEnabled(secondPlotType, use); - GUICoreUtils.setEnabled(smallPercent, use); - } - - public void populateBean(Plot plot) { - super.populateBean(plot); - if(plot instanceof PiePlot) { - PiePlot piePlot = (PiePlot)plot; - stylePane.populateBean(piePlot.getPlotStyle()); - - isSecondPlot.setSelected(false); - if(piePlot.getSubType() == ChartConstants.PIE_PIE) { - isSecondPlot.setSelected(true); - secondPlotType.setSelectedIndex(0); - } else if(piePlot.getSubType() == ChartConstants.PIE_BAR) { - isSecondPlot.setSelected(true); - secondPlotType.setSelectedIndex(1); - } - - if(isSecondPlot.isSelected()) { - smallPercent.setValue(piePlot.getSmallPercent() * NUM); - } - } - - checkBoxUse(); - } - - public void updateBean(Plot plot) { - super.updateBean(plot); - if(plot instanceof PiePlot) { - PiePlot piePlot = (PiePlot)plot; - - piePlot.setPlotStyle(stylePane.updateBean()); - - if(isSecondPlot.isSelected()) { - if(secondPlotType.getSelectedIndex() == 0) { - piePlot.setSubType(ChartConstants.PIE_PIE); - } else if(secondPlotType.getSelectedIndex() == 1) { - piePlot.setSubType(ChartConstants.PIE_BAR); - } - - Number number = Utils.objectToNumber(smallPercent.getValue(), true); - if (number != null) { - piePlot.setSmallPercent(number.doubleValue() / NUM); - } - } else { - piePlot.setSubType(ChartConstants.PIE_NORMAL); - } - } - } + new Component[]{stylePane, null}, + new Component[]{new JSeparator(), null}, + new Component[]{isSecondPlot, null}, + new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Plot_Content")), secondPlotType}, + new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Less_Than_Percent")), smallPercent} + }; + + return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + } + + private void checkBoxUse() { + boolean use = isSecondPlot.isSelected(); + GUICoreUtils.setEnabled(secondPlotType, use); + GUICoreUtils.setEnabled(smallPercent, use); + } + + public void populateBean(Plot plot) { + super.populateBean(plot); + if (plot instanceof PiePlot) { + PiePlot piePlot = (PiePlot) plot; + stylePane.populateBean(piePlot.getPlotStyle()); + + isSecondPlot.setSelected(false); + if (piePlot.getSubType() == ChartConstants.PIE_PIE) { + isSecondPlot.setSelected(true); + secondPlotType.setSelectedIndex(0); + } else if (piePlot.getSubType() == ChartConstants.PIE_BAR) { + isSecondPlot.setSelected(true); + secondPlotType.setSelectedIndex(1); + } + + if (isSecondPlot.isSelected()) { + smallPercent.setValue(piePlot.getSmallPercent() * NUM); + } + } + + checkBoxUse(); + } + + public void updateBean(Plot plot) { + super.updateBean(plot); + if (plot instanceof PiePlot) { + PiePlot piePlot = (PiePlot) plot; + + piePlot.setPlotStyle(stylePane.updateBean()); + + if (isSecondPlot.isSelected()) { + if (secondPlotType.getSelectedIndex() == 0) { + piePlot.setSubType(ChartConstants.PIE_PIE); + } else if (secondPlotType.getSelectedIndex() == 1) { + piePlot.setSubType(ChartConstants.PIE_BAR); + } + + Number number = Utils.objectToNumber(smallPercent.getValue(), true); + if (number != null) { + piePlot.setSmallPercent(number.doubleValue() / NUM); + } + } else { + piePlot.setSubType(ChartConstants.PIE_NORMAL); + } + } + } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java index 61c6e64e3..5e07d0067 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java @@ -16,7 +16,7 @@ import com.fr.design.gui.xcombox.MarkerComboBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.CoreConstants; @@ -42,10 +42,10 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(Inter.getLocText("ChartF-Fill")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Fill")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {Inter.getLocText("Chart_Null_Value_Break"), Inter.getLocText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); @@ -54,10 +54,10 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart_Line_Style")),isCurve}, - new Component[]{new UILabel(Inter.getLocText(new String[]{"Chart_Line", "Line-Style"})),lineStyle }, - new Component[]{new UILabel(Inter.getLocText(new String[]{"ChartF-Marker", "FS_Report_Type"})), markerPane}, - new Component[]{new UILabel(Inter.getLocText("Null_Value_Show")),isNullValueBreak} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak} } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RangeSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RangeSeriesPane.java index 6752686df..d24fbcb56 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RangeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RangeSeriesPane.java @@ -11,7 +11,7 @@ import com.fr.chart.chartattr.RangePlot; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + public class RangeSeriesPane extends AbstractPlotSeriesPane{ @@ -37,7 +37,7 @@ public class RangeSeriesPane extends AbstractPlotSeriesPane{ protected JPanel getContentInPlotType() { seriesWidthSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, 100, 1)); JPanel pane = new JPanel(new BorderLayout()); - pane.add(new BoldFontTextLabel(Inter.getLocText(new String[]{"ChartF-Series", "Tree-Width"})),BorderLayout.WEST); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Width")),BorderLayout.WEST); pane.add(seriesWidthSpinner, BorderLayout.CENTER); return pane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java index 73542190e..72e89d6c7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; @@ -49,17 +49,17 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = { p,f }; double[] rowSize = { p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("UpBarBorderStyleAndColor")), null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Border", "Line-Style"})), upLineBox}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Border-Color")), upBorderColor}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Background", "Color"})), upBackColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("UpBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), upBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("DownBarBorderStyleAndColor")), null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Border", "Line-Style"})), downLineBox}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Border-Color")), downBorderColor}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Background", "Color"})), downBackColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("DownBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), downBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor}, } ; JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index f690a460a..3d179e236 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -18,7 +18,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorControlWindow; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -83,7 +83,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { regionNumPane.updateBean().intValue()), getValueArray(regionNumPane.updateBean().intValue())); } }); - designTypeButtonGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Chart-Mode_Auto"), Inter.getLocText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); + designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); designTypeButtonGroup.setSelectedIndex(0); designTypeButtonGroup.addChangeListener(new ChangeListener() { @Override @@ -154,9 +154,9 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { protected Component[][] createComponents(){ return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR_Chart-Data_Range_Configuration")), designTypeButtonGroup}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), fillStyleCombox}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), regionNumPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR_Chart-Data_Range_Configuration")), designTypeButtonGroup}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), fillStyleCombox}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), regionNumPane}, }; } @@ -172,7 +172,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { regionNumPane.updateBean().intValue()), getValueArray(regionNumPane.updateBean().intValue())); } }); - designTypeButtonGroup = new UIButtonGroup(new String[]{Inter.getLocText("FR-Chart-Mode_Auto"), Inter.getLocText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); + designTypeButtonGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")}, new Integer[]{0, 1}); designTypeButtonGroup.setSelectedIndex(0); designTypeButtonGroup.addChangeListener(new ChangeListener() { @Override @@ -206,12 +206,12 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { double d = TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH; double[] columnSize = {d, e}; double[] rowSize = {p}; - Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), regionNumPane}}; + Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), regionNumPane}}; stagePanel = TableLayout4VanChartHelper.createGapTableLayoutPane(tmpComp, rowSize, columnSize); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Tick_And_Color")), designTypeButtonGroup}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Tick_And_Color")), designTypeButtonGroup}, }; upControlPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java index bbd10ed4d..6d08de497 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java @@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.gui.style.ChartBackgroundNoImagePane; import com.fr.design.mainframe.chart.gui.style.ChartBorderPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; @@ -51,7 +51,7 @@ public class ChartTitlePane extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(Inter.getLocText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; @@ -110,7 +110,7 @@ public class ChartTitlePane extends BasicScrollPane { Component[][] components = new Component[][]{ new Component[]{null,titleContent,null}, new Component[]{null,textAttrPane,null}, - new Component[]{null,new BoldFontTextLabel(Inter.getLocText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java index aca30dae5..7de40187b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java @@ -17,7 +17,7 @@ import com.fr.design.mainframe.chart.gui.style.ChartBackgroundNoImagePane; import com.fr.design.mainframe.chart.gui.style.ChartBorderPane; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -51,7 +51,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(Inter.getLocText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; @@ -110,7 +110,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane { Component[][] components = new Component[][]{ new Component[]{null,titleContent,null}, new Component[]{null,textAttrPane,null}, - new Component[]{null,new BoldFontTextLabel(Inter.getLocText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java index 57a9dd143..3c679cfd3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java @@ -26,7 +26,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.js.NameJavaScriptGroup; import com.fr.log.FineLoggerFactory; import com.fr.stable.Constants; @@ -69,10 +69,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ protected String[] getNormalLayoutTipName() { return new String[] { - Inter.getLocText("FR-Chart-Style_TopDownShade"), - Inter.getLocText("FR-Chart-Style_Transparent"), - Inter.getLocText("FR-Chart-Style_Plane3D"), - Inter.getLocText("FR-Chart-Style_GradientHighlight") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_TopDownShade"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Transparent"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Plane3D"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_GradientHighlight") }; } @@ -108,7 +108,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ if(styleList != null && !styleList.isEmpty()) { Component[][] styleComp = new Component[][]{ new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart_Layout"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"))}, new Component[]{layoutPane}, }; stylePane = TableLayoutHelper.createTableLayoutPane(styleComp,rowSize,columnSize); @@ -180,22 +180,22 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ String styleName = chart.getPlot().getPlotFillStyle().getFillStyleName(); switch (plotStyle){ - case ChartConstants.STYLE_SHADE: if(ComparatorUtils.equals(Inter.getLocText("FR-Chart-Style_Retro"), styleName)){ + case ChartConstants.STYLE_SHADE: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"), styleName)){ styleList.get(STYLE_SHADE).isPressing = true; lastStyleIndex = STYLE_SHADE; } break; - case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(Inter.getLocText("FR-Chart-Style_Fresh"), styleName)){ + case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"), styleName)){ styleList.get(STYLE_TRANSPARENT).isPressing = true; lastStyleIndex = STYLE_TRANSPARENT; } break; - case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(Inter.getLocText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ styleList.get(STYLE_PLANE3D).isPressing = true; lastStyleIndex = STYLE_PLANE3D; } break; - case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(Inter.getLocText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ styleList.get(STYLE_HIGHLIGHT).isPressing = true; lastStyleIndex = STYLE_HIGHLIGHT; } @@ -229,16 +229,16 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ Object preStyle = null; String name = ""; if(styleList.get(STYLE_SHADE).isPressing){ - name = Inter.getLocText("FR-Chart-Style_Retro"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_TRANSPARENT).isPressing){ - name = Inter.getLocText("FR-Chart-Style_Fresh"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_PLANE3D).isPressing){ - name = Inter.getLocText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_HIGHLIGHT).isPressing){ - name = Inter.getLocText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); preStyle = manager.getPreStyle(name); } if(preStyle == null){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java index ea9efb669..61fdad32d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java @@ -8,7 +8,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.AreaIndependentChart; -import com.fr.general.Inter; + /** * 面积图 属性表 选择类型 布局 界面. @@ -33,10 +33,10 @@ public class AreaPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String area = Inter.getLocText("FR-Chart-Type_Area"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); - String td = Inter.getLocText("FR-Chart-Chart_3D"); + String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); return new String[]{ stack + area, percent + stack + area, @@ -139,7 +139,7 @@ public class AreaPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Area"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java index 1bb3c9887..83566b3ab 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.BarIndependentChart; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + /** * 条形图 属性表 选择类型 布局界面. @@ -31,16 +31,16 @@ public class BarPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String bar = Inter.getLocText("FR-Chart-Type_Bar"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); - String td = Inter.getLocText("FR-Chart-Chart_3D"); + String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); return new String[]{ bar, stack + bar, percent + stack + bar, td + bar, - td + bar + "(" + Inter.getLocText("FR-Chart-Direction_Horizontal") + ")", + td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", td + stack + bar, td + percent + stack + bar }; @@ -65,7 +65,7 @@ public class BarPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Bar"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java index 0b7ae24b1..9c2f56d11 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BubblePlotPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.BubblePlot; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.BubbleIndependentChart; -import com.fr.general.Inter; + /** * 气泡图 属性表 选择类型 布局界面. @@ -25,7 +25,7 @@ public class BubblePlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Chart_BubbleChart") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart") }; } @@ -44,7 +44,7 @@ public class BubblePlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Chart_BubbleChart"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java index 0ee3811b5..30a4fa8b6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.ColumnIndependentChart; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + /** * 柱形图 属性表 选择类型 布局界面. @@ -30,16 +30,16 @@ public class ColumnPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - String column = Inter.getLocText("FR-Chart-Type_Column"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); - String td = Inter.getLocText("FR-Chart-Chart_3D"); + String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D"); return new String[]{ column, stack + column, percent + stack + column, td + column, - td + column + "(" + Inter.getLocText("FR-Chart-Direction_Horizontal") + ")", + td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", td + stack + column, td + percent + stack + column }; @@ -63,7 +63,7 @@ public class ColumnPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Column"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java index e049b7011..8858cbc8c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/CustomPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.CustomIndependentChart; -import com.fr.general.Inter; + /** * 组合图 属性表 图表类型 界面. @@ -26,7 +26,7 @@ public class CustomPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("ChartF-Comb_Chart") + com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart") }; } @@ -45,7 +45,7 @@ public class CustomPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("ChartF-Comb_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java index 16c3c6cfd..486152bfb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/DonutPlotPane.java @@ -10,7 +10,7 @@ import com.fr.chart.chartattr.Donut3DPlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.DonutIndependentChart; -import com.fr.general.Inter; + import com.fr.stable.Constants; import java.awt.*; @@ -35,10 +35,10 @@ public class DonutPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String donut = Inter.getLocText("FR-Chart-Type_Donut"); + String donut = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); return new String[]{ donut, - Inter.getLocText("FR-Chart-Chart_3D") + donut + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + donut }; } @@ -103,7 +103,7 @@ public class DonutPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Donut"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java index f7b224dce..dd8e86316 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/FunnelPlotPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.FunnelPlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.FunnelIndependentChart; -import com.fr.general.Inter; + import java.text.DecimalFormat; @@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Type_Funnel") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel") }; } @@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Funnel"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java index ce2eee589..75094492e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GanttPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.GanttIndependentChart; -import com.fr.general.Inter; + /** * 甘特图 属性表 选择类型 布局界面. @@ -24,7 +24,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Gantt_Chart") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart") }; } @@ -47,7 +47,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Gantt_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java index ee6ebe18b..ad3337594 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -52,7 +52,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ if(styleList != null && !styleList.isEmpty()) { components = new Component[][]{ new Component[]{layoutPane}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Waring_Please_Input_The_Key"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Waring_Please_Input_The_Key"))}, new Component[]{keyInput}, }; } @@ -72,7 +72,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - "gis"+Inter.getLocText("FR-Chart-Map_Map") + "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map") }; } @@ -90,8 +90,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeLayoutTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Type_BaiduMap"), - Inter.getLocText("FR-Chart-Map_GoogleMap") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_BaiduMap"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_GoogleMap") }; } @@ -172,7 +172,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return "gis"+Inter.getLocText("FR-Chart-Map_Map"); + return "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java index 4cbb2661b..bcc8ff0fa 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/LinePlotPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartattr.LinePlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.LineIndependentChart; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + public class LinePlotPane extends AbstractChartTypePane{ @@ -21,7 +21,7 @@ public class LinePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("I-LineStyle_Line") + com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line") }; } @@ -83,7 +83,7 @@ public class LinePlotPane extends AbstractChartTypePane{ } public String title4PopupWindow() { - return Inter.getLocText("I-LineStyle_Line"); + return com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java index 767f00842..fa667e1a2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java @@ -11,7 +11,7 @@ import com.fr.chart.charttypes.MapIndependentChart; import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane; import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -50,10 +50,10 @@ public class MapPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Map_Normal"), - Inter.getLocText("FR-Chart-Map_Bubble"), - Inter.getLocText("FR-Chart-Map_Pie"), - Inter.getLocText("FR-Chart-Map_Column") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Normal"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Bubble"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Pie"), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Column") }; } @@ -72,7 +72,7 @@ public class MapPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Map_Map"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java index 0c5612e20..d3638408b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MeterPlotPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.MeterStyle; import com.fr.chart.charttypes.MeterIndependentChart; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + /** * 仪表盘, 属性表 类型选择 界面. @@ -31,9 +31,9 @@ public class MeterPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { - String meter = Inter.getLocText("FR-Chart-Type_Meter"); + String meter = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); return new String[]{ - Inter.getLocText("FR-Chart-Mode_Custom") + meter, + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + meter, meter + "1", meter + "2" }; @@ -77,7 +77,7 @@ public class MeterPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Type_Meter"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java index b29e41550..2509e4ec9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/PiePlotPane.java @@ -10,7 +10,7 @@ import com.fr.chart.chartattr.PiePlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.chart.charttypes.PieIndependentChart; -import com.fr.general.Inter; + import com.fr.stable.Constants; import java.awt.*; @@ -36,10 +36,10 @@ public class PiePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String pie = Inter.getLocText("I-PieStyle_Normal"); + String pie = com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); return new String[]{ pie, - Inter.getLocText("FR-Chart-Chart_3D") + pie + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + pie }; } @@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("I-PieStyle_Normal"); + return com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); } private void createPieCondition(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java index 5ba271caa..a9f45abb6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RadarPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.RadarIndependentChart; -import com.fr.general.Inter; + /** * 雷达图 属性表 选择类型 布局界面. @@ -24,7 +24,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Radar_Chart") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart") }; } @@ -48,7 +48,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Radar_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java index 61393a6d6..29ea3be8c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/RangePlotPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.RangePlot; import com.fr.chart.charttypes.RangeIndependentChart; -import com.fr.general.Inter; + /** * 全距图 属性表 选择类型 布局 界面. @@ -25,7 +25,7 @@ public class RangePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("ChartF-Range_Chart") + com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart") }; } @@ -49,7 +49,7 @@ public class RangePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("ChartF-Range_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java index 9c6177d12..ecc3514af 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/StockPlotPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.chart.gui.type; import com.fr.chart.base.ChartConstants; import com.fr.chart.chartattr.Chart; import com.fr.chart.charttypes.StockIndependentChart; -import com.fr.general.Inter; + /** * 股价图 属性表 选择类型 布局 界面. @@ -24,7 +24,7 @@ public class StockPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Stock_Chart") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart") }; } @@ -48,7 +48,7 @@ public class StockPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Stock_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java index 34f9c43eb..ad4ad9e14 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/XYScatterPlotPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.XYScatterPlot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.charttypes.XYScatterIndependentChart; -import com.fr.general.Inter; + import com.fr.stable.Constants; /** @@ -28,7 +28,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("I-xyScatterStyle_Marker") + com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker") }; } @@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("I-xyScatterStyle_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java index 00e1dbc7d..10a354921 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import java.awt.event.ActionEvent; @@ -18,7 +18,7 @@ public class ChartEmptyDataStyleAction extends UpdateAction { public ChartEmptyDataStyleAction() { this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/EmptyChart.png")); - this.setName(Inter.getLocText("FR-Designer_Chart_Empty_Data")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data")); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index b4c56afc3..720451254 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -16,7 +16,7 @@ import com.fr.design.utils.ImageUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.stable.CoreGraphHelper; import com.fr.stable.StringUtils; @@ -74,7 +74,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { } private JPanel creatNorthPane() { - emptyData = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + emptyData = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); emptyData.setSelectedIndex(0); emptyData.setPreferredSize(new Dimension(WIDTH, HEIGHT)); emptyData.addActionListener(new ActionListener() { @@ -85,7 +85,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { } }); - UILabel promptContent = new UILabel(Inter.getLocText("FR-Designer_Tip_Content")); + UILabel promptContent = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Content")); JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEFT, TEN, 0); northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); return northPane; @@ -98,7 +98,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); centerPane.add(previewContainerPane, BorderLayout.CENTER); - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Preview")); + JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); previewOwnerPane.setLayout(new BorderLayout()); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); @@ -118,8 +118,8 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); - defaultRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer_DEFAULT")); - customRadioButton = new UIRadioButton(Inter.getLocText("FR-Designer-Widget-Style_Custom")); + defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); + customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")); ButtonGroup buttonGroup = new ButtonGroup(); defaultRadioButton.setSelected(true); buttonGroup.add(defaultRadioButton); @@ -133,7 +133,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { jp.add(customRadioButton); selectPictureButton = new UIButton( - Inter.getLocText("FR-Designer_Background_Image_Select")); + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); selectPictureButton.addActionListener(getSelectPictureActionListener()); jp.add(selectPictureButton); @@ -212,7 +212,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { @Override public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Chart_Empty_Data"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data"); } public void populateBean() { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java index ac29a6df8..b306ae6a1 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java @@ -10,7 +10,7 @@ import com.fr.design.chart.series.SeriesCondition.impl.FormHyperlinkPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.frpane.BaseHyperlinkGroup; -import com.fr.general.Inter; + import com.fr.js.FormHyperlinkProvider; import com.fr.stable.ArrayUtils; import com.fr.stable.bridge.StableFactory; @@ -32,10 +32,10 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - new NameObjectCreator(Inter.getLocText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), - new NameObjectCreator(Inter.getLocText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), - new NameObjectCreator(Inter.getLocText("FR-Designer_Chart_Float"), ChartHyperRelateFloatLink.class, ChartHyperRelateFloatLinkPane.ChartNoRename.class), - new NameObjectCreator(Inter.getLocText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float"), ChartHyperRelateFloatLink.class, ChartHyperRelateFloatLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java index 0d27409a4..a6353d36c 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartAccColorPane; import com.fr.design.style.background.gradient.FixedGradientBar; -import com.fr.general.Inter; + import javax.swing.JPanel; import java.awt.BorderLayout; @@ -53,8 +53,8 @@ public class ChartPreFillStylePane extends BasicBeanPane { JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - buttonPane.add(accButton = new UIButton(Inter.getLocText("FR-Designer_Chart_Acc_Set"))); - buttonPane.add(gradientButton = new UIButton(Inter.getLocText("FR-Designer_Gradient-Color"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient-Color"))); customPane.add(buttonPane, BorderLayout.NORTH); changeColorSetPane = new JPanel(cardLayout = new CardLayout()); @@ -74,7 +74,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { double[] columnSize = {p, p}; double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(" " + Inter.getLocText("ColorMatch")), null}, + new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("ColorMatch")), null}, new Component[]{null, customPane}, }; @@ -105,7 +105,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); } public void populateBean(ChartColorMatching condition) { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java index f964c4534..eebef3929 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java @@ -7,7 +7,7 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -59,7 +59,7 @@ public class ChartPreStyleAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("FR-Menu-Server_Chart_PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Menu-Server_Chart_PreStyle"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java index e77d17594..a3a29d00f 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.transaction.Configurations; @@ -33,14 +33,14 @@ public class ChartPreStyleManagerPane extends JListControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(Inter.getLocText("FR-Designer_PreStyle"), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PreStyle"), ChartColorMatching.class, ChartPreStylePane.class) }; } @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Chart-PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart-PreStyle"); } public void populateBean() { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java index 1668afcc0..907311a3b 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java @@ -12,7 +12,7 @@ import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Inter; + import javax.swing.JPanel; import java.awt.BorderLayout; @@ -39,7 +39,7 @@ public class ChartPreStylePane extends BasicBeanPane { JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.LEFT)); - pane.add(new BoldFontTextLabel(Inter.getLocText("FR-Designer_Preview"))); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"))); JPanel boxPane = new JPanel(); boxPane.setLayout(new BorderLayout()); @@ -103,7 +103,7 @@ public class ChartPreStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java index a37f8a490..53b2402fd 100644 --- a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java @@ -8,7 +8,7 @@ import com.fr.design.chart.series.SeriesCondition.impl.FormHyperlinkPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.frpane.BaseHyperlinkGroup; -import com.fr.general.Inter; + import com.fr.js.FormHyperlinkProvider; import com.fr.stable.ArrayUtils; import com.fr.stable.bridge.StableFactory; @@ -28,9 +28,9 @@ public class FormHyperlinkGroup extends BaseHyperlinkGroup { public NameableCreator[] getHyperlinkCreators() { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - new NameObjectCreator(Inter.getLocText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), - new NameObjectCreator(Inter.getLocText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), - new NameObjectCreator(Inter.getLocText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java index eb7ed1168..becbea7d6 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.PaneTitleConstants; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -82,7 +82,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private JPanel createRefreshPane() { - refreshEnabled = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + refreshEnabled = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); refreshEnabled.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -97,7 +97,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(Inter.getLocText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, }; contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); @@ -105,14 +105,14 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { panel.add(refreshEnabled, BorderLayout.NORTH); panel.add(contentPane, BorderLayout.CENTER); - JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Design-Chart_Auto_Refresh"), panel); + JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Design-Chart_Auto_Refresh"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Use_Refresh"), gapPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Refresh"), gapPane); } private JPanel createHyperlinkPane() { hyperLinkPane = new ExtendedChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("M_Insert-Hyperlink"), hyperLinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperLinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/file/FILEChooserPane4Chart.java b/designer-chart/src/main/java/com/fr/file/FILEChooserPane4Chart.java deleted file mode 100644 index 9d8d24978..000000000 --- a/designer-chart/src/main/java/com/fr/file/FILEChooserPane4Chart.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.fr.file; - -import com.fr.base.extension.FileExtension; -import com.fr.file.filter.ChooseFileFilter; -import com.fr.general.Inter; -import com.fr.stable.ProductConstants; - -/** - * Created by IntelliJ IDEA. - * Author : daisy - * Version: 7.1.1 - */ -public class FILEChooserPane4Chart extends FILEChooserPane { - - private static final FILEChooserPane4Chart INSTANCE = new FILEChooserPane4Chart(true, true); - - /** - * @param showEnv - * @param showLoc - * @return - */ - public static FILEChooserPane4Chart getInstance(boolean showEnv, boolean showLoc) { - INSTANCE.showEnv = showEnv; - INSTANCE.showLoc = showLoc; - INSTANCE.showWebReport = false; - INSTANCE.setModelOfPlaceList(); - INSTANCE.removeAllFilter(); - return INSTANCE; - } - - /** - * @param showEnv - * @param showLoc - */ - public FILEChooserPane4Chart(boolean showEnv, boolean showLoc) { - super(showEnv, showLoc); - } - - @Override - protected void fileType() { - String appName = ProductConstants.APP_NAME; - if (FileExtension.CRT.matchExtension(suffix)) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CRT, appName + Inter.getLocText(new String[]{"Utils-The-Chart", "FR-App-All_File"}))); - return; - } - } - - @Override - protected String getEnvProjectName() { - return Inter.getLocText("FR-Chart-Env_Directory"); - } - - -} \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java index f7caf5d2c..b2adfec25 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java +++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java @@ -6,7 +6,7 @@ import com.fr.design.extra.PluginConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.general.http.HttpClient; import com.fr.plugin.chart.DownloadSourcesEvent; @@ -79,7 +79,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { public void installOnline() { - int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer-Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); + int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); if (choose == JOptionPane.OK_OPTION) { initDialog(); @@ -174,7 +174,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { setProgress(0); dialog = new JDialog(); - dialog.setTitle(Inter.getLocText("FR-Designer-Dependence_Install_Online")); + dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Online")); JPanel contentPane = new JPanel(new BorderLayout()); contentPane.add(label, BorderLayout.CENTER); @@ -202,13 +202,13 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { dialog.dispose(); if (result) { - int choose = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION); + int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION); if (choose == JOptionPane.OK_OPTION) { RestartHelper.restart(); } } else { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Dependence_Install_Failed")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Failed")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java index 2595f5487..0c6f1b84e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.area; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.area.AreaIndependentVanChart; import com.fr.plugin.chart.area.VanChartAreaPlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/18. */ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewArea"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -27,14 +27,14 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String area = Inter.getLocText("FR-Chart-Type_Area"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); + String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); return new String[]{ area, stack + area, percent + stack + area, - Inter.getLocText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewArea"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java index 2d2509aa6..3c03971d4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.bar; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.bar.BarIndependentVanChart; import com.fr.plugin.chart.column.VanChartColumnPlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/10/20. */ public class VanChartBarPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewBar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); private static final long serialVersionUID = 2879689884048643002L; @@ -27,14 +27,14 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String bar = Inter.getLocText("FR-Chart-Type_Bar"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); + String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); return new String[]{ bar, stack + bar, percent + stack + bar, - Inter.getLocText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") }; } @@ -43,7 +43,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewBar"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java index 651d057f6..c0ec2ebe1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleInteractivePane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.bubble; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartConstants; import com.fr.plugin.chart.bubble.VanChartBubblePlot; import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort; @@ -13,7 +13,7 @@ public class VanChartBubbleInteractivePane extends VanChartInteractivePaneWithOu protected String[] getNameArray() { Plot plot = chart.getPlot(); if(plot instanceof VanChartBubblePlot && ((VanChartBubblePlot) plot).isForceBubble()) { - return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"), Inter.getLocText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; } return super.getNameArray(); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java index aa7f46047..25788b992 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubblePlotPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.base.VanChartZoom; import com.fr.plugin.chart.bubble.BubbleIndependentVanChart; @@ -20,7 +20,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/3/31. */ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewBubble");; + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble");; private static final long serialVersionUID = -3481633368542654247L; @@ -38,8 +38,8 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Chart_BubbleChart"), - Inter.getLocText("Plugin-ChartF_NewForceBubble") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewForceBubble") }; } @@ -48,7 +48,7 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewBubble"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java index c0e8f23b9..4ec1e2cef 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java @@ -6,7 +6,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.bubble.VanChartBubblePlot; import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.van.chart.bubble.component.VanChartBubblePane; @@ -69,7 +69,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { @Override public String getPaneTitle(){ - return Inter.getLocText("Plugin-ChartF_Custom_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Axis"); } }; stackAndAxisEditExpandablePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(stackAndAxisEditPane.getPaneTitle(), stackAndAxisEditPane); @@ -78,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createBubblePane() { bubblePane = new VanChartBubblePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Bubble"), bubblePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"), bubblePane); } protected void populateCondition(ConditionAttr defaultAttr){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java index 088a6468a..590d85987 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import javax.swing.JPanel; @@ -26,10 +26,10 @@ public class VanChartBubblePane extends BasicBeanPane { public VanChartBubblePane(){ minDiameter = new UISpinner(0,Double.MAX_VALUE,1,0); maxDiameter = new UISpinner(0,Double.MAX_VALUE,1,0); - shadow = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); - displayNegative = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); + shadow = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + displayNegative = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); @@ -49,10 +49,10 @@ public class VanChartBubblePane extends BasicBeanPane { protected Component[][] getComponent () { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MinDiameter")), minDiameter}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MaxDiameter")), maxDiameter}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shadow")), shadow}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_DisplayNegative")), displayNegative}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MinDiameter")), minDiameter}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxDiameter")), maxDiameter}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shadow")), shadow}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayNegative")), displayNegative}, }; } @@ -78,6 +78,6 @@ public class VanChartBubblePane extends BasicBeanPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java index 65a8f18e4..e2c08011c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.ChartDataFilterPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -45,7 +45,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon xCombox.setPreferredSize(PREFERRED_SIZE); yCombox.setPreferredSize(PREFERRED_SIZE); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); initBubbleSize(); @@ -56,15 +56,15 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon double[] rowSize_north = {p, p, p, p}; Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName}, new Component[]{new UILabel("x" ), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), bubbleSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}, }; JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); - JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Data_Filter"),dataScreeningPane); + JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane); dataScreeningPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); filterPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5)); @@ -95,7 +95,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); @@ -106,7 +106,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); @@ -122,7 +122,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon BubbleTableDefinition definition = (BubbleTableDefinition) top; if(definition.getSeriesName() == null || ComparatorUtils.equals(StringUtils.EMPTY, definition.getSeriesName())) { - seriesName.setSelectedItem(Inter.getLocText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } else { combineCustomEditValue(seriesName, definition.getSeriesName()); } @@ -136,7 +136,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon } protected void populateBubbleSize(BubbleTableDefinition definition) { - if (ComparatorUtils.equals(definition.getBubbleSize(), Inter.getLocText("Chart-Use_None"))){ + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"))){ combineCustomEditValue(bubbleSize, StringUtils.EMPTY); }else { combineCustomEditValue(bubbleSize, definition.getBubbleSize()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java index 35c035264..e9f4a4116 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.column; import com.fr.design.chart.comp.BorderAttriPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.general.Inter; + import java.awt.Dimension; @@ -14,7 +14,7 @@ public class ColumnBorderAttriPane extends BorderAttriPane { private UISpinner radius; public ColumnBorderAttriPane() { - this(Inter.getLocText("plugin-ChartF_Radius")); + this(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")); } public ColumnBorderAttriPane(String radiusString) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java index c618fa2c2..ce0cb0644 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.column; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.column.ColumnIndependentVanChart; import com.fr.plugin.chart.column.VanChartColumnPlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/9/24. */ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewColumn"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); private static final long serialVersionUID = 5950923001789733745L; @@ -28,14 +28,14 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - String column = Inter.getLocText("FR-Chart-Type_Column"); - String stack = Inter.getLocText("FR-Chart-Type_Stacked"); - String percent = Inter.getLocText("FR-Chart-Use_Percent"); + String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent"); return new String[]{ column, stack + column, percent + stack + column, - Inter.getLocText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewColumn"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index d4d9788c9..c0864b122 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrSeriesImageBackground; import com.fr.plugin.chart.column.VanChartColumnPlot; import com.fr.stable.Constants; @@ -70,29 +70,29 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createSeriesStylePane(double[] row, double[] col) { - isFixedWidth = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_YES"), Inter.getLocText("Plugin-ChartF_NO")}); + isFixedWidth = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")}); columnWidth = new UISpinner(0,1000,1,0); columnWidth.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); seriesGap = new UINumberDragPane(-100, 100); categoryGap = new UINumberDragPane(0, 100); - isFillWithImage = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_YES"), Inter.getLocText("Plugin-ChartF_NO")}); + isFillWithImage = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")}); imagePane = new ImageBackgroundQuickPane(false); imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); JPanel panel1 = new JPanel(new BorderLayout()); - JPanel isFixedWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Fixed_Column_Width"),isFixedWidth); + JPanel isFixedWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed_Column_Width"),isFixedWidth); isFixedWidthPane.setBorder(BorderFactory.createEmptyBorder(0,0,6,0)); panel1.add(isFixedWidthPane, BorderLayout.NORTH); panel1.add(columnWidth, BorderLayout.CENTER); Component[][] components2 = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Series")),seriesGap}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Gap_Category")),categoryGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Series")),seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gap_Category")),categoryGap}, }; JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); Component[][] components3 = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Filled_With_Image")),isFillWithImage}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Filled_With_Image")),isFillWithImage}, }; JPanel panel3 = TableLayout4VanChartHelper.createGapTableLayoutPane(components3, row, col); @@ -116,7 +116,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { checkImagePane(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), borderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), borderPane); } private void checkAll() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java index cd80447dd..969e87011 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrSeriesStackAndAxis; import com.fr.van.chart.designer.style.series.VanChartSeriesConditionPane; @@ -50,7 +50,7 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane(new String[]{Inter.getLocText("Plugin-ChartF_YES"), Inter.getLocText("Plugin-ChartF_NO")}); - isPercentStacked = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_YES"), Inter.getLocText("Plugin-ChartF_NO")}); + isStacked = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")}); + isPercentStacked = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")}); double p = TableLayout.PREFERRED; double[] columnSize = {p, p}; double[] rowSize = {p, p, p, p}; @@ -74,10 +74,10 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane{ yDirection = new UISpinner(0, 100, 1, 20); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Position") + "(%): " + Inter.getLocText("Plugin-ChartF_X_Direction"), SwingConstants.LEFT),xDirection}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Y_Direction"), SwingConstants.RIGHT),yDirection}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius") + "(px): ",SwingConstants.LEFT),radius} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Position") + "(%): " + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_X_Direction"), SwingConstants.LEFT),xDirection}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Y_Direction"), SwingConstants.RIGHT),yDirection}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius") + "(px): ",SwingConstants.LEFT),radius} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, new double[]{-2, -2, -2}, new double[]{-2, -1}); this.setLayout(new BorderLayout(0,0)); - this.add(TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Location"), panel), BorderLayout.CENTER); + this.add(TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location"), panel), BorderLayout.CENTER); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java index d7551a489..b4d7174dd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomAxisConditionPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.custom.component; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrSeriesStackAndAxis; import com.fr.van.chart.column.VanChartCustomStackAndAxisConditionPane; @@ -19,8 +19,8 @@ public class VanChartCustomAxisConditionPane extends VanChartCustomStackAndAxisC protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("ChartF-X_Axis")),XAxis}, - new Component[]{new UILabel(Inter.getLocText("ChartF-Y_Axis")),YAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")),YAxis}, }; return components; @@ -28,7 +28,7 @@ public class VanChartCustomAxisConditionPane extends VanChartCustomStackAndAxisC @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Custom_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Axis"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java index 8e4212480..850869f86 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; import com.fr.plugin.chart.custom.CustomPlotFactory; @@ -35,7 +35,7 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane { private static final int CUSTOM_TYPE_NUM = 4; - public static final String MASSAGE = Inter.getLocText("Plugin-ChartF_At_Least_One_Chart"); + public static final String MASSAGE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_At_Least_One_Chart"); private List customTypeList = new ArrayList(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java index 7e675c6e6..3e6777f74 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java @@ -24,7 +24,7 @@ import com.fr.design.javascript.JavaScriptImplPane; import com.fr.design.javascript.ParameterJavaScriptPane; import com.fr.design.module.DesignModuleFactory; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.js.EmailJavaScript; import com.fr.js.FormHyperlinkProvider; @@ -102,12 +102,12 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { * @return 返回标题字符串. */ public String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); } @Override protected String getAddItemText() { - return Inter.getLocText("FR-Designer_Add_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink"); } @Override @@ -236,24 +236,24 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { protected java.util.List refreshList(HashMap map) { java.util.List list = new ArrayList(); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Reportlet"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Mail"), new EmailJavaScript(), VanChartEmailPane.class)); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Web"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Mail"), new EmailJavaScript(), VanChartEmailPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Dynamic_Parameters"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), new ParameterJavaScript(), getUseMap(map, ParameterJavaScript.class))); list.add(new UIMenuNameableCreator("JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Float_Chart"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Cell"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Float"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new UIMenuNameableCreator(Inter.getLocText("Chart-Link_Form"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), hyperlink, getUseMap(map, FormHyperlinkProvider.class))); return list; diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java index 242a9b639..7773b9f21 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomConditionAttrPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.custom.other; import com.fr.chart.chartattr.Chart; import com.fr.design.dialog.BasicScrollPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.custom.VanChartCustomPlot; import javax.swing.JPanel; @@ -66,6 +66,6 @@ public class VanChartCustomConditionAttrPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java index 3f55e1536..5915d6a82 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.custom.other; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.custom.VanChartCustomPlot; import com.fr.plugin.chart.custom.type.CustomStyle; @@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane { protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartCustomPlotHyperlinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomAxisTabPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomAxisTabPane.java index 1f64ae675..ec65edb69 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomAxisTabPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomAxisTabPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.custom.style; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartAxisPlot; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.custom.CustomPlotFactory; @@ -81,7 +81,7 @@ public class VanChartCustomAxisTabPane extends VanChartCustomPlotTabPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java index 33b9766d8..db55cb49b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/PlotFactory.java @@ -7,7 +7,7 @@ import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.style.FormatPane; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.area.VanChartAreaPlot; import com.fr.plugin.chart.bubble.VanChartBubblePlot; import com.fr.plugin.chart.column.VanChartColumnPlot; @@ -343,7 +343,7 @@ public class PlotFactory { JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value instanceof Integer) { String text = ComparatorUtils.equals(value, FormatField.FormatContents.NULL) - ? Inter.getLocText("Plugin-ChartF_Auto") + ? com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto") : FormatField.getInstance().getName((Integer) value); label.setText(" " + text); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java index 341c2af3d..271e01c51 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java @@ -4,7 +4,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -31,14 +31,14 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { protected Component[][] getPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_FillColor")), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor")), typeComboBox}, new Component[]{null, centerPane}, }; } }; transparent = new UINumberDragPane(0, 100); - JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Alpha"), transparent); + JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha"), transparent); this.setLayout(new BorderLayout()); this.add(fillColorPane, BorderLayout.NORTH); @@ -46,7 +46,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { } protected String title4PopupWindow(){ - return Inter.getLocText("Plugin-ChartF_FillColor"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor"); } public void populate(AttrAreaSeriesFillColorBackground fillColorBackground) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java index da00db777..75e6ce03b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -28,7 +28,7 @@ public class VanChartBeautyPane extends BasicBeanPane { double[] columnSize = {f, e}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Style")), styleBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Style")), styleBox}, } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -36,8 +36,8 @@ public class VanChartBeautyPane extends BasicBeanPane { } protected String[] getNameArray(){ - return new String[]{Inter.getLocText("Chart-Default_Name"), - Inter.getLocText("Plugin-Chart_TopDownShade") + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_TopDownShade") }; } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java index 109da8b77..cdce6c840 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -24,7 +24,7 @@ public class VanChartFillStylePane extends ChartFillStylePane { double[] columnSize = {f, e}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("ColorMatch")),styleSelectBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ColorMatch")),styleSelectBox}, new Component[]{null,customPane}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java index d20d7e6d9..8008aa1e0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.JPanel; @@ -25,7 +25,7 @@ public class VanChartFloatPositionPane extends BasicBeanPane { this.setLayout(new BorderLayout()); - this.add(new UILabel(Inter.getLocText("plugin-ChartF_XYFromTheUpLeft")), BorderLayout.CENTER); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_XYFromTheUpLeft")), BorderLayout.CENTER); this.add(createCustomFloatPositionPane(), BorderLayout.SOUTH); } @@ -38,8 +38,8 @@ public class VanChartFloatPositionPane extends BasicBeanPane { double[] columnSize = {p, f}; double[] rowSize = {p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_positionX")+": "),floatPosition_x}, - new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_positionY")+": "),floatPosition_y} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_positionX")+": "),floatPosition_x}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_positionY")+": "),floatPosition_y} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java index 62e36e569..06615c040 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartHtmlLabelPane.java @@ -13,7 +13,7 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartHtmlLabel; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -55,7 +55,7 @@ public class VanChartHtmlLabelPane extends JPanel{ } public VanChartHtmlLabelPane() { - useHtml = new UIToggleButton(Inter.getLocText("Plugin-ChartF_Html")); + useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html")); JPanel widthAndHeightPane = createWidthAndHeightPane(); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -125,9 +125,9 @@ public class VanChartHtmlLabelPane extends JPanel{ } protected JPanel createWidthAndHeightPane() { - isCustomWidth = new UICheckBox(Inter.getLocText("Plugin-ChartF_Custom_Width")); + isCustomWidth = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Width")); customWidth = new UITextField(6); - isCustomHeight = new UICheckBox(Inter.getLocText("Plugin-ChartF_Custom_Height")); + isCustomHeight = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Height")); customHeight = new UITextField(6); isCustomWidth.addActionListener(new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java index a8757c816..5dedcbec9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrLine; import com.fr.plugin.chart.type.LineStyle; import com.fr.stable.Constants; @@ -31,7 +31,7 @@ public class VanChartLineTypePane extends BasicPane { createLineStyle(); - nullValueBreak = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + nullValueBreak = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); this.setLayout(new BorderLayout()); double p = TableLayout.PREFERRED; @@ -40,8 +40,8 @@ public class VanChartLineTypePane extends BasicPane { } protected void createLineStyle() { - String[] textArray = new String[]{Inter.getLocText("Plugin-ChartF_NormalLine"), - Inter.getLocText("Plugin-ChartF_StepLine"), Inter.getLocText("Plugin-ChartF_CurveLine")}; + String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NormalLine"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StepLine"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")}; lineStyle = new UIButtonGroup(textArray, LineStyle.values()); } @@ -52,9 +52,9 @@ public class VanChartLineTypePane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")),lineWidth}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Style_Present")),lineStyle}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Null_Value_Break")),nullValueBreak}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),lineWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")),lineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Null_Value_Break")),nullValueBreak}, }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); @@ -69,7 +69,7 @@ public class VanChartLineTypePane extends BasicPane { } protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line"); } public void populate(VanChartAttrLine line) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java index 2522296cc..4d9291394 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.component; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -21,8 +21,8 @@ public class VanChartLineWidthPane extends VanChartLineTypePane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Null_Value_Break")), nullValueBreak}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Null_Value_Break")), nullValueBreak}, }; return TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java index a7e5b97c2..6ad945f8a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButtonGroup; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; @@ -32,7 +32,7 @@ public class VanChartMarkerPane extends BasicPane { public VanChartMarkerPane() { this.setLayout(new BorderLayout(0, 4)); - String[] array = new String[]{Inter.getLocText("Plugin-ChartF_Rule"), Inter.getLocText("Plugin-ChartF_Custom")}; + String[] array = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rule"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}; commonORCustom = new UIButtonGroup(array, array); commonORCustom.addChangeListener(new ChangeListener() { @@ -57,8 +57,8 @@ public class VanChartMarkerPane extends BasicPane { } } }; - centerPane.add(commonMarkerPane, Inter.getLocText("Plugin-ChartF_Rule")); - centerPane.add(imageMarkerPane, Inter.getLocText("Plugin-ChartF_Custom")); + centerPane.add(commonMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rule")); + centerPane.add(imageMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")); layoutComponents(); } @@ -86,7 +86,7 @@ public class VanChartMarkerPane extends BasicPane { } protected void layoutComponents() { - this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Point_Style"), commonORCustom), BorderLayout.NORTH); + this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point_Style"), commonORCustom), BorderLayout.NORTH); this.add(centerPane, BorderLayout.CENTER); } @@ -99,7 +99,7 @@ public class VanChartMarkerPane extends BasicPane { } protected String title4PopupWindow(){ - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } public void populate(VanChartAttrMarker marker) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java index 688b5a589..bca5c425f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; @@ -56,8 +56,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane(new String[]{Inter.getLocText("Plugin-ChartF_Common"), - Inter.getLocText("Plugin-ChartF_Custom")}); + content = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); initFormatPane(parent, showOnPane); @@ -82,8 +82,8 @@ public class VanChartTooltipContentPane extends BasicBeanPane(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); + shadow = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shadow")), shadow}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shadow")), shadow}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java index d765f5e77..1031e4aec 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java @@ -5,7 +5,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane; import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane; -import com.fr.general.Inter; + import javax.swing.JPanel; import java.awt.Component; @@ -37,7 +37,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro */ @Override public String title4PopupWindow() { - return Inter.getLocText("Chart-Default_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"); } }); paneList.add(new ColorBackgroundQuickPane()); @@ -49,7 +49,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro return new Component[][]{ new Component[]{typeComboBox, null}, new Component[]{centerPane, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java index 8947f14cd..6caa79e48 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component.background; import com.fr.chart.chartglyph.GeneralInfo; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.general.Inter; + import java.awt.Component; @@ -23,10 +23,10 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg radius = new UISpinner(0,1000,1,0); return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent}, - new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")),radius} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java index b3e4aba56..86278cbe0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.GradientBackgroundQuickPane; import com.fr.design.style.background.gradient.FixedGradientBar; import com.fr.general.Background; -import com.fr.general.Inter; + import javax.swing.JPanel; import javax.swing.event.ChangeEvent; @@ -32,7 +32,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { } protected void constructPane(){ - String[] textArray = {Inter.getLocText("Utils-Left_to_Right"), Inter.getLocText("Utils-Top_to_Bottom")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")}; Integer[] valueArray = {GradientBackground.LEFT2RIGHT, GradientBackground.TOP2BOTTOM}; directionPane = new UIButtonGroup(textArray, valueArray); directionPane.setSelectedIndex(0); @@ -45,7 +45,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { Component[][] components = new Component[][]{ new Component[]{gradientBar, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Gradient_Direction")),directionPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Direction")),directionPane}, }; JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -99,7 +99,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { * @return 名称 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-Chart_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java index a9eff68d6..ee5b36ee1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java @@ -7,7 +7,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane; import com.fr.design.mainframe.backgroundpane.ColorBackgroundQuickPane; import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -33,7 +33,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane { protected Component[][] getPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Shape_Fill")), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, }; } @@ -42,7 +42,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane { paneList.add(new NullBackgroundQuickPane(){ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_SeriesColor"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SeriesColor"); } }); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java index 276a4afef..5a5a36815 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -43,8 +43,8 @@ public class VanChartBorderPane extends BasicPane { protected Component[][] getUseComponent() { return new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")),currentLineCombo}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java index bd0a0d6ad..6c697f7b5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.component.border; import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.base.AttrBorderWithAlpha; @@ -29,9 +29,9 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ protected Component[][] getUseComponent() { return new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")),currentLineCombo}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),currentLineColorPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java index 715f94637..f815e8b60 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.AttrBorder; import com.fr.chart.chartglyph.GeneralInfo; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.general.Inter; + import javax.swing.JSeparator; import java.awt.BorderLayout; @@ -28,9 +28,9 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane { protected Component[][] getUseComponent() { return new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")),currentLineCombo}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),currentLineColorPane}, - new Component[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")),radius} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius} } ; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java index 46aa26a25..1d64d257c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/CategoryNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -18,6 +18,6 @@ public class CategoryNameFormatPaneWithCheckBox extends VanChartFormatPaneWithCh @Override protected String getCheckBoxText() { - return Inter.getLocText("Chart-Category_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java index 40421cde3..4f4441a6f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedPercentFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -16,7 +16,7 @@ public class ChangedPercentFormatPaneWithCheckBox extends VanChartFormatPaneWith @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Change_Percent"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Percent"); } protected boolean isPercent() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithCheckBox.java index 24ad5b41a..e89c9b41f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ChangedValueFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -16,6 +16,6 @@ public class ChangedValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCh @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Change_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Value"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java index 2856ac69e..ce157d349 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithNormalType.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component.format; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -42,7 +42,7 @@ public class FormatPaneWithNormalType extends FormatPaneWithOutFont { protected Component[][] getTypeComboBoxComponent (UIComboBox typeComboBox) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_DataType"), SwingConstants.LEFT), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DataType"), SwingConstants.LEFT), typeComboBox}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java index 6d5067703..23159b40a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.component.format; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.style.FormatPane; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -32,7 +32,7 @@ public class FormatPaneWithOutFont extends FormatPane { typePane.setBorder(BorderFactory.createEmptyBorder()); return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{null, centerPane}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java index b00a3d7e4..de5e194a5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -16,6 +16,6 @@ public class MapAreaNameFormatPaneWithCheckBox extends CategoryNameFormatPaneWit @Override protected String getCheckBoxText() { - return Inter.getLocText("FR-Chart-Area_Name"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java index 8f91cf845..4355bf7f2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/PercentFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -18,7 +18,7 @@ public class PercentFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBo @Override protected String getCheckBoxText() { - return Inter.getLocText("Chart-Use_Percent"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent"); } protected boolean isPercent() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java index c0f8e9a17..a6b455db5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -18,6 +18,6 @@ public class SeriesNameFormatPaneWithCheckBox extends VanChartFormatPaneWithChec @Override protected String getCheckBoxText() { - return Inter.getLocText("Chart-Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java index 3ea03e051..77cd36e33 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.format; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import javax.swing.JPanel; @@ -18,6 +18,6 @@ public class ValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox @Override protected String getCheckBoxText() { - return Inter.getLocText("Chart-Use_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java index 45910b876..7bb9f71d5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/VanChartFormatPaneWithCheckBox.java @@ -6,7 +6,7 @@ import com.fr.design.gui.frpane.UIBubbleFloatPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.style.FormatPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.format.AttrTooltipFormat; import com.fr.stable.Constants; @@ -41,7 +41,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ this.setLayout(new BorderLayout()); isSelectedBox = new UICheckBox(getCheckBoxText()); - formatButton = new UIButton(Inter.getLocText("Chart-Use_Format")); + formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); this.add(isSelectedBox, BorderLayout.CENTER); this.add(formatButton, BorderLayout.EAST); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java index d952b712e..c69833d34 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/label/GaugeLabelContentPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.designer.component.label; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.VanChartLabelContentPane; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -16,7 +16,7 @@ public class GaugeLabelContentPane extends VanChartLabelContentPane { } protected String getLabelContentTitle() { - return Inter.getLocText("Plugin-ChartF_Content"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"); } protected JPanel getLabelContentPane(JPanel contentPane) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java index d1c334bd0..b932a509c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.xcombox.MarkerComboBox; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -130,16 +130,16 @@ public class VanChartCommonMarkerPane extends BasicBeanPane protected Component[][] getUseComponent() { return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")), markerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_FillColor")), markerFillColor}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius")), radius}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor")), markerFillColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius")), radius}, }; } protected Component[][] getUseComponentWithOutFillColor() { return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")), markerPane}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Radius")), radius}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius")), radius}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java index 7d94c2712..75fc63eed 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.stable.Constants; @@ -40,8 +40,8 @@ public class VanChartImageMarkerPane extends BasicBeanPane { double[] col = {p, f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Width")), width}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Height")), height}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Width")), width}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Height")), height}, }; JPanel sizePanel = TableLayoutHelper.createTableLayoutPane(components, row, col); @@ -70,7 +70,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Image_Map_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Image_Map_Data"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java index 3dc10b337..3e48ed826 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/data/OneDimensionalPlotReportDataContentPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.data; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.MeterPlotReportDataContentPane; -import com.fr.general.Inter; + /** @@ -16,11 +16,11 @@ public class OneDimensionalPlotReportDataContentPane extends MeterPlotReportData @Override protected String getCateNameString() { - return Inter.getLocText("FR-Chart-Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"); } @Override protected String getNValueString() { - return Inter.getLocText("Chart-Series_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java index 8c5677f59..43cfeac24 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.RefreshMoreLabel; import com.fr.plugin.chart.vanchart.VanChart; @@ -58,7 +58,7 @@ public class AutoRefreshPane extends BasicBeanPane { protected JPanel createContentPane() { JPanel content = new JPanel(new BorderLayout(0, 6)); - moreLabel = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + moreLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); moreLabel.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -68,7 +68,7 @@ public class AutoRefreshPane extends BasicBeanPane { autoRefreshTime = new UISpinner(0, Integer.MAX_VALUE, 1, 0); - autoTooltip = new UICheckBox(Inter.getLocText("Plugin-ChartF_Auto_Tooltip")); + autoTooltip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto_Tooltip")); autoTooltip.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -82,7 +82,7 @@ public class AutoRefreshPane extends BasicBeanPane { jPanel.add(autoTooltip, BorderLayout.CENTER); jPanel.add(tooltipSet, BorderLayout.EAST); - JPanel moreLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_More_Label"), moreLabel); + JPanel moreLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_More_Label"), moreLabel); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -108,7 +108,7 @@ public class AutoRefreshPane extends BasicBeanPane { protected Component[][] initComponent(JPanel autoTooltipPane){ return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(Inter.getLocText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, new Component[]{autoTooltip,null, tooltipSet}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java index a36bc9bab..0ddefeb1f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.AbstractVanChartScrollPane; import javax.swing.JPanel; @@ -37,7 +37,7 @@ public class VanChartConditionAttrPane extends AbstractVanChartScrollPane */ @Override public String title4PopupWindow() { - return Inter.getLocText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java index e96a7cd81..ba477f110 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java @@ -9,7 +9,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; import com.fr.van.chart.designer.component.VanChartUIListControlPane; @@ -30,14 +30,14 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane public void populate(Nameable[] nameableArray, Class showPane) { initComponentPane(); this.setBorder(null); - NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(Inter.getLocText("Condition_Attributes"), ConditionAttr.class, showPane)}; + NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, showPane)}; refreshNameableCreator(creators); super.populate(nameableArray); } @Override public NameableCreator[] createNameableCreators() { - return new NameObjectCreator[]{new NameObjectCreator(Inter.getLocText("Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; + return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; } @@ -62,12 +62,12 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane @Override public String getAddItemText() { - return Inter.getLocText("FR-Designer_Add_Condition"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Condition"); } @Override public String title4PopupWindow() { - return Inter.getLocText("Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 2c5e20352..08f908d09 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -11,7 +11,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; @@ -74,7 +74,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { public String title4PopupWindow() { - return Inter.getLocText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); } @Override @@ -114,20 +114,20 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { if (!plot.isSupportZoomDirection()) { return null; } - zoomWidget = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); - zoomResize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Change"), Inter.getLocText("Plugin-ChartF_Non_Adjustment")}); + zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Non_Adjustment")}); from = new TinyFormulaPane(); to = new TinyFormulaPane(); zoomType = new UIButtonGroup(getNameArray(), getValueArray()); - zoomGesture = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); - JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomWidget"), zoomWidget); - JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomGesture"), zoomGesture); + JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget); + JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomGesture"), zoomGesture); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_WidgetBoundary")), zoomResize}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_From")), from}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_To")), to}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_From")), from}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_To")), to}, }; double f = TableLayout.FILL; @@ -143,12 +143,12 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { checkZoomPane(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Use_Zoom"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom"), panel); } protected JPanel getzoomTypePane(UIButtonGroup zoomType) { - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_ZoomType"), zoomType); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomType"), zoomType); } protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) { @@ -165,8 +165,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { if (!(plot.getAxisPlotType() == AxisPlotType.RECTANGLE)){ return null; } - axisRotation = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); + axisRotation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); axisRotation.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -175,10 +175,10 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { }); Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Reversal")),axisRotation} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Reversal")),axisRotation} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Axis"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Axis"), panel); } private void checkZoomEnabled() { @@ -194,8 +194,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected String[] getNameArray() { - return new String[]{Inter.getLocText("ChartF-X_Axis"), Inter.getLocText("ChartF-Y_Axis") - ,Inter.getLocText("Plugin-ChartF_XYAxis"),Inter.getLocText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis") + ,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"),com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; } protected String[] getValueArray() { @@ -205,15 +205,15 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { } protected JPanel createToolBarPane(double[] row, double[] col){ - isSort = new UICheckBox(Inter.getLocText("Plugin-ChartF_Sort")); - exportImages = new UICheckBox(Inter.getLocText("Plugin-ChartF_ExportImage")); - fullScreenDisplay = new UICheckBox(Inter.getLocText("Plugin-ChartF_FullScreenDisplay")); - collapse = new UIToggleButton(Inter.getLocText("Plugin-ChartF_Collapse")); + isSort = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Sort")); + exportImages = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ExportImage")); + fullScreenDisplay = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FullScreenDisplay")); + collapse = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Collapse")); Component[][] components = createToolBarComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ToolBar"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ToolBar"), panel); } protected double[] getToolBarRowSize () { @@ -223,33 +223,33 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected Component[][] createToolBarComponents() { return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")),isSort}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),isSort}, new Component[]{null, exportImages}, new Component[]{null, fullScreenDisplay}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_layout")),collapse}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_layout")),collapse}, }; } protected Component[][] createToolBarComponentsWithOutSort() { return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")), exportImages}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")), exportImages}, new Component[]{null, fullScreenDisplay}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_layout")),collapse} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_layout")),collapse} }; } protected JPanel createAnimationPane(){ - isChartAnimation = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Animation_Effects"), isChartAnimation); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Animation"), panel); + isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation_Effects"), isChartAnimation); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), panel); } protected JPanel createAutoRefreshPane(VanChartPlot plot){ autoRefreshPane = getMoreLabelPane(plot); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Moniter_refresh"), autoRefreshPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Moniter_refresh"), autoRefreshPane); } protected AutoRefreshPane getMoreLabelPane(VanChartPlot plot) { @@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createHyperlinkPane() { superLink = new VanChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("M_Insert-Hyperlink"), superLink); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), superLink); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java index 8b252bed6..0f70c7762 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartAreaFillColorConditionPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.ChartConstants; import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Plot; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrAreaSeriesFillColorBackground; import com.fr.van.chart.designer.component.VanChartAreaSeriesFillColorPane; @@ -20,7 +20,7 @@ public class VanChartAreaFillColorConditionPane extends AbstractNormalMultiLine @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_FillColor"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor"); } @Override @@ -43,7 +43,7 @@ public class VanChartAreaFillColorConditionPane extends AbstractNormalMultiLine * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_FillColor"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java index 932155270..ae78715e7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.bubble.attr.VanChartAttrBubble; import com.fr.van.chart.bubble.component.VanChartBubblePane; @@ -18,7 +18,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); } @Override @@ -37,7 +37,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi */ @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Bubble"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bubble"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java index 525eab5fd..a3a4e47c0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartCurveConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.line.condition.AttrCurve; import com.fr.van.chart.map.line.VanChartCurvePane; @@ -49,7 +49,7 @@ public class VanChartCurveConditionPane extends AbstractNormalMultiLineCondition } @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Curve"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Curve"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java index 4959b60a8..2cec63a6d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Plot; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrDataSheet; import com.fr.van.chart.designer.style.datasheet.VanchartDataSheetNoCheckPane; @@ -33,12 +33,12 @@ public class VanChartDataSheetContentPane extends AbstractNormalMultiLineConditi @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); } @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java index 051bb8469..206cc785d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartEffectConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrEffect; import com.fr.van.chart.designer.style.series.VanChartEffectPane; @@ -44,7 +44,7 @@ public class VanChartEffectConditionPane extends AbstractNormalMultiLineConditio @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Flash_Animation"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Animation"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java index 4c38d4bef..84c78f3a6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartFloatColorConditionPane.java @@ -5,7 +5,7 @@ import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrFloatColor; /** @@ -23,7 +23,7 @@ public class VanChartFloatColorConditionPane extends ConditionAttrSingleConditio public VanChartFloatColorConditionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) { super(conditionAttributesPane, isRemove); - UILabel nameLabel = new UILabel(Inter.getLocText("plugin-ChartF_FloatColor")); + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_FloatColor")); colorSelectionPane = new ColorSelectBox(80); if (isRemove) { @@ -38,7 +38,7 @@ public class VanChartFloatColorConditionPane extends ConditionAttrSingleConditio */ @Override public String nameForPopupMenuItem() { - return Inter.getLocText("plugin-ChartF_FloatColor"); + return com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_FloatColor"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java index 822567176..e028c6e31 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLabelConditionPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Plot; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrLabel; import com.fr.van.chart.designer.style.label.VanChartPlotLabelNoCheckPane; import com.fr.van.chart.designer.style.label.VanChartPlotLabelPane; @@ -39,7 +39,7 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("FR-Chart-Chart_Label"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"); } public void setDefault() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java index 04255eb18..c85ee0638 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineEffectConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import com.fr.van.chart.designer.style.series.VanChartEffectPane; @@ -24,7 +24,7 @@ public class VanChartLineEffectConditionPane extends VanChartEffectConditionPane @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Line_Map_Animation"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Map_Animation"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java index 0f772b059..40aecb878 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartLineTypeConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrLine; import com.fr.van.chart.designer.component.VanChartLineTypePane; @@ -17,7 +17,7 @@ public class VanChartLineTypeConditionPane extends AbstractNormalMultiLineCondit @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_LineStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle"); } @Override @@ -39,7 +39,7 @@ public class VanChartLineTypeConditionPane extends AbstractNormalMultiLineCondit * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_LineStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java index 5caa1f9da..b167b67c5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartMarkerConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.van.chart.designer.component.VanChartMarkerPane; @@ -17,7 +17,7 @@ public class VanChartMarkerConditionPane extends AbstractNormalMultiLineConditio @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override @@ -39,7 +39,7 @@ public class VanChartMarkerConditionPane extends AbstractNormalMultiLineConditio * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java index b39cee4ce..731c02361 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesColorConditionPane.java @@ -7,7 +7,7 @@ import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + /** * 条件属性 配色（系列背景色） @@ -25,7 +25,7 @@ public class VanChartSeriesColorConditionPane extends ConditionAttrSingleConditi public VanChartSeriesColorConditionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) { super(conditionAttributesPane, isRemove); - nameLabel = new UILabel(Inter.getLocText("plugin-ChartF_MatchColor")); + nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_MatchColor")); colorSelectionPane = new ColorSelectBox(80); if (isRemove) { @@ -40,7 +40,7 @@ public class VanChartSeriesColorConditionPane extends ConditionAttrSingleConditi * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("plugin-ChartF_MatchColor"); + return com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_MatchColor"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java index 74692dff5..f16367845 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartSeriesImageBackgroundConditionPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrSeriesImageBackground; import javax.swing.JPanel; @@ -21,7 +21,7 @@ public class VanChartSeriesImageBackgroundConditionPane extends AbstractNormalMu @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_FilledWithImage"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FilledWithImage"); } @Override @@ -39,7 +39,7 @@ public class VanChartSeriesImageBackgroundConditionPane extends AbstractNormalMu * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_FilledWithImage"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FilledWithImage"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartStructureNodeConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartStructureNodeConditionPane.java index 7442cf669..6ed9d5867 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartStructureNodeConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartStructureNodeConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrNode; import com.fr.van.chart.structure.desinger.style.StructureNodeStylePane; @@ -17,7 +17,7 @@ public class VanChartStructureNodeConditionPane extends AbstractNormalMultiLineC @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Node"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node"); } @Override @@ -35,7 +35,7 @@ public class VanChartStructureNodeConditionPane extends AbstractNormalMultiLineC * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Node"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java index 0ed9e3ec1..4ec723f19 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTooltipConditionPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Plot; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipNoCheckPane; import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane; @@ -39,7 +39,7 @@ public class VanChartTooltipConditionPane extends AbstractNormalMultiLineConditi * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Tooltip"); } public void setDefault() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java index cd4d4f43a..946465407 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartTrendLineConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrTrendLine; import com.fr.van.chart.designer.component.VanChartTrendLinePane; @@ -16,7 +16,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return Inter.getLocText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); } @Override @@ -34,7 +34,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi * @return item的名称 */ public String nameForPopupMenuItem() { - return Inter.getLocText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java index d0721c7aa..e8cacbd4a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/HeatMapRangeLegendPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.designer.style; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula; -import com.fr.general.Inter; + import com.fr.plugin.chart.type.LegendType; import com.fr.van.chart.range.component.GradualIntervalConfigPane; import com.fr.van.chart.range.component.GradualLegendPane; @@ -34,8 +34,8 @@ public class HeatMapRangeLegendPane extends VanChartRangeLegendPane { @Override protected UIButtonGroup createLegendTypeButton(){ return new UIButtonGroup(new String[]{ - Inter.getLocText("Plugin-ChartF_Legend_Gradual"), - Inter.getLocText("Plugin-ChartF_Legend_Section") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Gradual"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Section") }, new LegendType[]{LegendType.GRADUAL, LegendType.SECTION}); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java index 7a07f3ebd..70c4497a7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.VanChartLegend; import com.fr.stable.Constants; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -78,7 +78,7 @@ public class VanChartPlotLegendPane extends BasicPane { } protected void initComponents(){ - isLegendVisible = new UICheckBox(Inter.getLocText("Chart-Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Legend_Is_Visible")); legendPane = createLegendPane(); double p = TableLayout.PREFERRED; @@ -118,9 +118,9 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), createDisplayStrategy()),null} + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), createDisplayStrategy()),null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } @@ -143,16 +143,16 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{createTitlePositionPane(new double[]{p,p,p},columnSize),null}, new Component[]{createTitleStylePane(),null} , - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), panel),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel),null}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } protected JPanel createTitlePositionPane(double[] row, double[] col){ - String[] textArray = {Inter.getLocText("Chart-StyleAlignment_Top"), Inter.getLocText("Chart-StyleAlignment_Bottom"), - Inter.getLocText("Chart-StyleAlignment_Left"), Inter.getLocText("Chart-StyleAlignment_Right"), Inter.getLocText("Chart-Right_Top")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Bottom"), + com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Chart-StyleAlignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Chart-Right_Top")}; Integer[] valueArray = {Constants.TOP, Constants.BOTTOM, Constants.LEFT, Constants.RIGHT, Constants.RIGHT_TOP}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_top.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_bottom.png"), @@ -164,12 +164,12 @@ public class VanChartPlotLegendPane extends BasicPane { location = new UIButtonGroup(iconArray, valueArray); location.setAllToolTips(textArray); - customFloatPositionButton = new UIToggleButton(Inter.getLocText("Plugin-ChartF_CustomFloatPosition")); + customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomFloatPosition")); customFloatPositionButton.setEventBannded(true); Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Chart-Layout_Position")),location}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),location}, new Component[]{null,customFloatPositionButton} }; @@ -178,7 +178,7 @@ public class VanChartPlotLegendPane extends BasicPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); } private void initPositionListener(){ @@ -226,17 +226,17 @@ public class VanChartPlotLegendPane extends BasicPane { protected JPanel createTitleStylePane(){ textAttrPane = new ChartTextAttrPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), textAttrPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane); } protected JPanel createDisplayStrategy(){ maxProportion = new UISpinner(0,100,1,30); - limitSize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); - limitSizeTitle = new UILabel(Inter.getLocText("Plugin-ChartF_MaxProportion")); + limitSize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")}); + limitSizeTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion")); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),limitSize); - maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize); + maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion,TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); panel.add(limitSizePane, BorderLayout.NORTH); @@ -252,7 +252,7 @@ public class VanChartPlotLegendPane extends BasicPane { } private JPanel createHighlightPane(){ - highlightButton = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); + highlightButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -261,7 +261,7 @@ public class VanChartPlotLegendPane extends BasicPane { double[] rowSize = {p,p}; Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Highlight")),highlightButton} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Highlight")),highlightButton} }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java index 007497df4..745240309 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartRangeLegendPane.java @@ -4,7 +4,7 @@ package com.fr.van.chart.designer.style; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.VanChartLegend; import com.fr.plugin.chart.range.VanChartRangeLegend; import com.fr.plugin.chart.type.LegendType; @@ -88,9 +88,9 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane { protected UIButtonGroup createLegendTypeButton(){ return new UIButtonGroup(new String[]{ - Inter.getLocText("Plugin-ChartF_Legend_Ordinary"), - Inter.getLocText("Plugin-ChartF_Legend_Gradual"), - Inter.getLocText("Plugin-ChartF_Legend_Section") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Ordinary"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Gradual"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Section") }, new LegendType[]{LegendType.ORDINARY, LegendType.GRADUAL, LegendType.SECTION}); } @@ -104,7 +104,7 @@ public class VanChartRangeLegendPane extends VanChartPlotLegendPane { initLegendTypeButtonListener(); - JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Legend_Form"),legendTypeButton); + JPanel legendTypeButtonWithTilePane = createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Legend_Form"),legendTypeButton); legendTypeButtonWithTilePane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); rangeLegendPane = createRangeLegendPane(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java index 0b1e7a166..48e733dc2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java @@ -16,7 +16,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.VanChartTitle; import com.fr.plugin.chart.vanchart.VanChart; import com.fr.stable.Constants; @@ -81,7 +81,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { } private void initComponents() { - isTitleVisible = new UICheckBox(Inter.getLocText("Chart-Title_Is_Visible")); + isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Title_Is_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; @@ -119,7 +119,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { new Component[]{createTitleContentPane(new double[]{p,p,p},column),null}, new Component[]{createTitlePositionPane(new double[]{p,p,p},column),null}, new Component[]{createTitleStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, new Component[]{createDisplayStrategy(),null} }; @@ -128,14 +128,14 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { private JPanel createTitleContentPane(double[] row, double[] col){ titleContent = new TinyFormulaPane(); - useHtml = new UIToggleButton(Inter.getLocText("Plugin-ChartF_Html")); + useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html")); Component[][] components = new Component[][]{ new Component[]{null ,null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text"), SwingConstants.LEFT), titleContent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"), SwingConstants.LEFT), titleContent}, new Component[]{null ,useHtml}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Content"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"), panel); } private JPanel createTitlePositionPane(double[] row, double[] col){ @@ -145,12 +145,12 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { Integer[] alignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; alignmentPane = new UIButtonGroup(alignmentIconArray, alignment); - customFloatPositionButton = new UIToggleButton(Inter.getLocText("Plugin-ChartF_CustomFloatPosition")); + customFloatPositionButton = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomFloatPosition")); customFloatPositionButton.setEventBannded(true); Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane}, new Component[]{null,customFloatPositionButton} }; @@ -159,20 +159,20 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); } private JPanel createTitleStylePane(){ textAttrPane = new ChartTextAttrPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), textAttrPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane); } private JPanel createDisplayStrategy(){ maxProportion = new UISpinner(0,100,1,30); - limitSize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); + limitSize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")}); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),limitSize); - maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize); + maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); panel.add(limitSizePane, BorderLayout.NORTH); @@ -185,7 +185,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel); } private void initPositionListener(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java index 03d41846f..beaf751e7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartAxisScrollPaneWithTypeSelect.java @@ -5,7 +5,7 @@ import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartTimeAxis; import com.fr.plugin.chart.attr.axis.VanChartValueAxis; @@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll protected void initLayout() { this.setLayout(new BorderLayout(0,6)); - JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_type"),jcb); + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type"),jcb); northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,0)); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java index c76f8b1dd..d3d47f9bd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java @@ -20,7 +20,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.base.VanChartConstants; import com.fr.plugin.chart.type.AxisTickLineType; @@ -122,7 +122,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { titleAlignPane = isXAxis ? getXAxisTitleAlignPane() : getYAxisTitleAlignPane(); titleAlignPane.setSelectedItem(Constants.CENTER); titleContent = new TinyFormulaPane(); - titleUseHtml = new UIToggleButton(Inter.getLocText("Plugin-ChartF_Html")); + titleUseHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Html")); titleTextAttrPane = new ChartTextAttrPane(); titleTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); if(isXAxis){ @@ -132,11 +132,11 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")),titleContent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),titleContent}, new Component[]{null,titleUseHtml}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Position")),titleAlignPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Position")),titleAlignPane}, new Component[]{titleTextAttrPane,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")),titleTextRotation}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TextRotation")),titleTextRotation}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); @@ -161,18 +161,18 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{Inter.getLocText("Chart-Use_Show"), Inter.getLocText("Plugin-ChartF_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); - labelGapStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"),Inter.getLocText("Plugin-ChartF_Fixed")}); + labelGapStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed")}); labelGapValue = new UITextField(); Component[][] gapComponents = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_TextRotation")), labelTextRotation}, - new Component[]{new UILabel(Inter.getLocText("ChartF-Label_Interval")), labelGapStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TextRotation")), labelTextRotation}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelGapStyle}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col); - labelGapValuePane= TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText(""),labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + labelGapValuePane= TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText(""),labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); JPanel gapPanel = new JPanel(new BorderLayout()); gapPanel.add(panel, BorderLayout.CENTER); gapPanel.add(labelGapValuePane, BorderLayout.SOUTH); @@ -182,7 +182,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{gapPanel,null}, }; - JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AxisLabel"),showLabel); + JPanel showLabelPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel"),showLabel); labelPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); labelPanel.setBorder(BorderFactory.createEmptyBorder(0,10,0,0)); showLabel.addActionListener(new ActionListener() { @@ -222,13 +222,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected JPanel createLineStylePane(double[] row, double[] col){ axisLineStyle = createLineComboBox(); axisLineColor = new ColorSelectBox(100); - String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"),Inter.getLocText("Plugin-ChartF_Close")}; + String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}; AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE}; mainTick = new UIButtonGroup(strings, values); secondTick = new UIButtonGroup(strings, values); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLineStylePaneComponents(), row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AxisLineStyle"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLineStyle"), panel); } protected LineComboBox createLineComboBox() { @@ -238,31 +238,31 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")),axisLineStyle} , - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MainGraduationLine")),mainTick}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_SecondGraduationLine")),secondTick}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")),mainTick}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecondGraduationLine")),secondTick}, }; } protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis){ position = new UIButtonGroup(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis)); - reversed = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); + reversed = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_AxisLabel_Position")),position}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_AxisReversed")),reversed}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel_Position")),position}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")),reversed}, } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Layout_Position"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position"), panel); } private String[] getAxisPositionNameArray(boolean isXAxis){ if(isXAxis){ - return new String[]{Inter.getLocText("Plugin-ChartF_AxisTop"), Inter.getLocText("Plugin-ChartF_AxisBottom"), Inter.getLocText("Plugin-ChartF_AxisVerticalZero")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisVerticalZero")}; } else { - return new String[]{Inter.getLocText("Chart-Layout_Left"), Inter.getLocText("Chart-Layout_Right"), Inter.getLocText("Plugin-ChartF_AxisVerticalZero")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisVerticalZero")}; } } @@ -276,10 +276,10 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected JPanel createDisplayStrategy(double[] row, double[] col){ maxProportion = new UISpinner(0,100,1,30); - axisLimitSize = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Limit"),Inter.getLocText("Plugin-ChartF_NotLimit")}); + axisLimitSize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")}); - JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AreaSize"),axisLimitSize); - maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),axisLimitSize); + maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); maxProportionPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); JPanel panel = new JPanel(new BorderLayout()); panel.add(limitSizePane, BorderLayout.NORTH); @@ -292,12 +292,12 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel); } protected JPanel createValueStylePane(){ - valueFormatStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Common"), - Inter.getLocText("Plugin-ChartF_Custom")}); + valueFormatStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); valueFormat = createFormatPane(); checkFormatType(); @@ -305,8 +305,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { htmlLabelPane = new VanChartHtmlLabelPane(); centerPane = new JPanel(new CardLayout()); - centerPane.add(valueFormat,Inter.getLocText("Plugin-ChartF_Common")); - centerPane.add(htmlLabelPane, Inter.getLocText("Plugin-ChartF_Custom")); + centerPane.add(valueFormat,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common")); + centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -314,7 +314,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_AxisLabel_Format"), SwingConstants.LEFT), valueFormatStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel_Format"), SwingConstants.LEFT), valueFormatStyle}, new Component[]{null, centerPane}, }; JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); @@ -327,7 +327,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Use_Format"), contentPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); } protected FormatPane createFormatPane(){ @@ -356,9 +356,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { if(centerPane != null && valueFormatStyle != null){ CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (valueFormatStyle.getSelectedIndex() == 1) { - cardLayout.show(centerPane,Inter.getLocText("Plugin-ChartF_Custom")); + cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")); } else { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_Common")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common")); } } } @@ -403,7 +403,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { */ @Override public String title4PopupWindow(){ - return Inter.getLocText("Plugin-ChartF_CategoryAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryAxis"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java index 7597ff860..95aac8034 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java @@ -17,7 +17,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.DateUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartTimeAxis; import com.fr.plugin.chart.base.VanChartConstants; @@ -82,7 +82,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private JPanel createValueDefinition(){ timeMinMaxValuePane = new TimeMinMaxValuePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ValueDefinition"), timeMinMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), timeMinMaxValuePane); } @Override @@ -120,7 +120,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_TimeAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TimeAxis"); } private class TimeMinMaxValuePane extends JPanel{ @@ -165,10 +165,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { secTickPane.add(secondUnitField); secTickPane.add(secondType); - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); minPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); maxPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); @@ -199,10 +199,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMin() { // 最小值. - minCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Min_Value"})); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"})); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, Inter.getLocText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(Inter.getLocText("Plugin-ChartF_Formula")); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minCheckBox.addActionListener(new ActionListener() { @@ -214,10 +214,10 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMax() { // 最大值 - maxCheckBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Max_Value"})); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"})); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, Inter.getLocText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(Inter.getLocText("Plugin-ChartF_Formula")); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxCheckBox.addActionListener(new ActionListener() { @@ -229,7 +229,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMain() { // 主要刻度单位 - mainTickBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Plugin-ChartF_MainType"})); + mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_MainType"})); mainUnitField = new UITextField(); mainUnitField.setPreferredSize(new Dimension(20, 20)); mainType = new UIComboBox(TYPES); @@ -245,7 +245,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initSecond() { // 次要刻度单位 - secondTickBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Plugin-ChartF_SecType"})); + secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_SecType"})); secondUnitField = new UITextField(); secondUnitField.setPreferredSize(new Dimension(20, 20)); secondType = new UIComboBox(TYPES); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java index c1932db6b..55cbf6dc8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartValueAxisPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartValueAxis; import com.fr.stable.StringUtils; @@ -63,12 +63,12 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { protected JPanel createMinMaxValuePane(double[] row, double[] col){ JPanel panel = createCommenValuePane(row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ValueDefinition"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), panel); } protected JPanel createCommenValuePane(double[] row, double[] col){ initMinMaxValuePane(); - logBox = new UICheckBox(Inter.getLocText(new String[]{"Custom", "Plugin-ChartF_LogBaseValue"})); + logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_LogBaseValue"})); logBaseField = new UITextField(); logBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -82,7 +82,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { // logPane.add(logBaseField); - logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_LogBaseValue"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + logPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LogBaseValue"), logBaseField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); logPane.setBorder(BorderFactory.createEmptyBorder(0, TableLayout4VanChartHelper.COMPONENT_INTERVAL, 0, 0)); @@ -120,7 +120,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_ValueAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueAxis"); } public void populateBean(VanChartAxis axis){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java index 08a2dcdf0..f6ac2a3d5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartAxisButtonPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.plot.VanChartAxisPlot; @@ -105,7 +105,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java index a53bf9ad0..93bf50f03 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/component/VanChartMinMaxValuePane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.style.axis.component; import com.fr.design.chart.ChartSwingUtils; import com.fr.design.chart.axis.MinMaxValuePane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.BorderFactory; @@ -60,10 +60,10 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane { @Override protected Component[][] getPanelComponents() { - minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_MainType"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); - secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); minPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); maxPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0)); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java index 03f4876a9..89a8b8db0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/gauge/VanChartGaugeDetailAxisPane.java @@ -6,7 +6,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartGaugeAxis; import com.fr.plugin.chart.gauge.VanChartGaugePlot; @@ -77,13 +77,13 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{Inter.getLocText("Chart-Use_Show"), Inter.getLocText("Plugin-ChartF_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelPanel = new JPanel(new BorderLayout()); labelPanel.add(labelTextAttrPane); labelPanel.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); JPanel panel = new JPanel(new BorderLayout(0, 6)); - panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_AxisLabel"), showLabel), BorderLayout.NORTH); + panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel"), showLabel), BorderLayout.NORTH); panel.add(labelPanel, BorderLayout.CENTER); showLabel.addActionListener(new ActionListener() { @Override @@ -108,18 +108,18 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { minMaxValuePane = new VanChartMinMaxValuePane(); break; } - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ValueDefinition"), minMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), minMaxValuePane); } private JPanel createTickColorPane(double[] row, double[] col){ mainTickColor = new ColorSelectBox(100); secTickColor = new ColorSelectBox(100); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MainGraduationLine")), mainTickColor}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_SecondGraduationLine")), secTickColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")), mainTickColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecondGraduationLine")), secTickColor}, }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col); - JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_TickColor"), panel); + JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TickColor"), panel); panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15)); return jPanel; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java index 367f5cb82..5d06ea539 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.radar.data.RadarYAxisTableDefinition; import javax.swing.JPanel; @@ -53,9 +53,9 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { double[] col = {p, f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Category") + ":", SwingConstants.RIGHT), categoryNameComboBox}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Category") + ":", SwingConstants.RIGHT), categoryNameComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} }; return TableLayoutHelper.createTableLayoutPane(components, row, col); @@ -121,7 +121,7 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { maxValueComboBox.setEnabled(hasUse); } public void addAutoItem(){ - Object autoItem = Inter.getLocText("Plugin-ChartF_Auto"); + Object autoItem = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"); minValueComboBox.addItem(autoItem); maxValueComboBox.addItem(autoItem); minValueComboBox.setSelectedItem(autoItem); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java index fd44101f4..face17141 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarXAxisPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.CoreConstants; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.axis.VanChartBaseAxisPane; @@ -40,8 +40,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")),axisLineStyle} , - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java index df5101c7d..bce014709 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/VanChartRadarYAxisPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.axis.VanChartAxis; import com.fr.plugin.chart.attr.axis.VanChartValueAxis; import com.fr.stable.CoreConstants; @@ -60,15 +60,15 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - valueStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_UnifiedComputing"), - Inter.getLocText("Plugin-ChartF_RespectivelySpecified")}); + valueStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified")}); JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize); tableDataPane = new RadarTableDataPane(); centerPane = new JPanel(new CardLayout()); - centerPane.add(commenPane, Inter.getLocText("Plugin-ChartF_UnifiedComputing")); - centerPane.add(tableDataPane, Inter.getLocText("Plugin-ChartF_RespectivelySpecified")); + centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing")); + centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified")); JPanel contentPane = new JPanel(new BorderLayout()); contentPane.add(valueStyle, BorderLayout.NORTH); @@ -80,7 +80,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { } }); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_ValueDefinition"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), contentPane); contentPane.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); return panel; } @@ -88,8 +88,8 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_type")), axisLineStyle}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), axisLineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), axisLineColor}, }; } @@ -101,9 +101,9 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { if (centerPane != null && valueStyle != null) { CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (valueStyle.getSelectedIndex() == 0) { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_UnifiedComputing")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing")); } else { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_RespectivelySpecified")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified")); } } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java index 2d09b5d89..85327a52f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; @@ -25,17 +25,17 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - return new ChartNameObjectCreator[]{new ChartNameObjectCreator(new String[]{Inter.getLocText("ChartF-X_Axis"), Inter.getLocText("ChartF-Y_Axis")}, - Inter.getLocText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; + return new ChartNameObjectCreator[]{new ChartNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")}, + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_AlertLine"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"); } protected String getAddItemText() { - return Inter.getLocText(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"}); + return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"}); } protected ShortCut4JControlPane[] createShortcuts() { @@ -53,7 +53,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { List yAxisList = rectanglePlot.getYAxisList(); String[] axisNames = DefaultAxisHelper.getAllAxisNames(rectanglePlot); - ChartNameObjectCreator[] creators = {new ChartNameObjectCreator(getAlertAxisName(axisNames), Inter.getLocText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, getAlertPaneClass())}; + ChartNameObjectCreator[] creators = {new ChartNameObjectCreator(getAlertAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), VanChartAlertValue.class, getAlertPaneClass())}; refreshNameableCreator(creators); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java index 31c020a05..cfd774af2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/BackgroundListControlPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; @@ -26,18 +26,18 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{Inter.getLocText("ChartF-X_Axis"), Inter.getLocText("ChartF-Y_Axis")}, - Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; + return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")}, + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"); } @Override public String getAddItemText() { - return Inter.getLocText("Plugin-ChartF_Add_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Add_Interval"); } protected ShortCut4JControlPane[] createShortcuts() { @@ -55,7 +55,7 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { List yAxisList = rectanglePlot.getYAxisList(); String[] axisNames = DefaultAxisHelper.getAllAxisNames(rectanglePlot); - BackgroundNameObjectCreator[] creators = {new BackgroundNameObjectCreator(getCustomIntervalBackgroundAxisName(axisNames), Inter.getLocText("Plugin-ChartF_CustomIntervalBackground"), VanChartCustomIntervalBackground.class, getIntervalPaneClass())}; + BackgroundNameObjectCreator[] creators = {new BackgroundNameObjectCreator(getCustomIntervalBackgroundAxisName(axisNames), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground"), VanChartCustomIntervalBackground.class, getIntervalPaneClass())}; refreshNameableCreator(creators); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index b5366bd3c..42fac2ce2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -16,7 +16,7 @@ import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; import com.fr.general.GeneralUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; import com.fr.plugin.chart.base.VanChartConstants; @@ -65,7 +65,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { alertLineStyle = new LineComboBox(VanChartConstants.ALERT_LINE_STYLE); alertLineColor = new ColorSelectBox(100); - alertTextPosition = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_AxisTop"),Inter.getLocText("Plugin-ChartF_AxisBottom")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom")}); alertText = new TinyFormulaPane(); //設置大小，防止文本過長導致界面“變形” alertText.setPreferredSize(new Dimension(TEXT_WD, HT)); @@ -82,12 +82,12 @@ public class VanChartAlertValuePane extends BasicBeanPane { //警戒线设置 JPanel top = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(top); - top.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Plugin-ChartF_AlertSet") + ":", null)); + top.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertSet") + ":", null)); top.add(createTopPane()); //提示文字 JPanel bottom = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(bottom); - bottom.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("Plugin-ChartF_AlertText") + ":", null)); + bottom.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertText") + ":", null)); bottom.add(createBottomPane()); } @@ -103,10 +103,10 @@ public class VanChartAlertValuePane extends BasicBeanPane { protected Component[][] getTopPaneComponents() { return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart-Layout_Position")),alertAxis}, - new Component[]{new UILabel(Inter.getLocText("Chart-Use_Value")),alertValue}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")),alertLineStyle}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),alertLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),alertLineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor}, }; } @@ -116,11 +116,11 @@ public class VanChartAlertValuePane extends BasicBeanPane { double[] columnSize = {p,p}; double[] rowSize = {p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart-Layout_Position")),alertTextPosition}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Content")),alertText}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font")),fontName}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer-FRFont_Size")),fontSize}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")),fontColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),alertText}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")),fontSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -129,15 +129,15 @@ public class VanChartAlertValuePane extends BasicBeanPane { private void checkPositionPane() { boolean selectXAxis = VanChartAttrHelper.isXAxis(alertAxis.getSelectedItem().toString()); if(selectXAxis){ - alertTextPosition = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_AxisTop"),Inter.getLocText("Plugin-ChartF_AxisBottom")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisTop"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisBottom")}); } else { - alertTextPosition = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_AlertLeft"),Inter.getLocText("Plugin-ChartF_AlertRight")}); + alertTextPosition = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLeft"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertRight")}); } doLayoutPane(); } protected String title4PopupWindow(){ - return Inter.getLocText("Plugin-ChartF_AlertLine"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"); } public void populateBean(VanChartAlertValue chartAlertValue){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java index 46fcea681..b8b539a3e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAreaBackgroundPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.PaneTitleConstants; -import com.fr.general.Inter; + import com.fr.van.chart.designer.AbstractVanChartScrollPane; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.background.VanChartBackgroundPane; @@ -48,8 +48,8 @@ public class VanChartAreaBackgroundPane extends AbstractVanChartScrollPane { verticalGridLine = new ColorSelectBox(100); Component[][] components = getGridLinePaneComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("ChartF-Grid_Line"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line"), panel); } protected Component[][] getGridLinePaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Direction_Horizontal")), horizontalGridLine}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Direction_Vertical")), verticalGridLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal")), horizontalGridLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")), verticalGridLine}, }; } protected JPanel createAlertLinePane() { alertLine = getAlertLinePane(); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_AlertLine"), alertLine); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AlertLine"), alertLine); alertLine.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); return panel; } @@ -89,7 +89,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } protected JPanel createIntervalPane(double[] row, double[] col) { - isDefaultIntervalBackground = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Default_Interval"), Inter.getLocText("Plugin-ChartF_CustomIntervalBackground")}); + isDefaultIntervalBackground = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground")}); horizontalColorBackground = new ColorSelectBox(100); verticalColorBackground = new ColorSelectBox(100); Component[][] components = getIntervalPaneComponents(); @@ -99,8 +99,8 @@ public class VanChartAxisAreaPane extends BasicBeanPane { cardLayout = new CardLayout(); centerPane = new JPanel(cardLayout); - centerPane.add(defaultPane, Inter.getLocText("Plugin-ChartF_Default_Interval")); - centerPane.add(customIntervalBackground, Inter.getLocText("Plugin-ChartF_CustomIntervalBackground")); + centerPane.add(defaultPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval")); + centerPane.add(customIntervalBackground, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground")); isDefaultIntervalBackground.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -108,10 +108,10 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } }); JPanel intervalPane = new JPanel(new BorderLayout(0, 6)); - JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Chart_Interval_Back"), isDefaultIntervalBackground); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back"), isDefaultIntervalBackground); intervalPane.add(panel1, BorderLayout.NORTH); intervalPane.add(centerPane, BorderLayout.CENTER); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_IntervalBackground"), intervalPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_IntervalBackground"), intervalPane); intervalPane.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); return panel; } @@ -123,16 +123,16 @@ public class VanChartAxisAreaPane extends BasicBeanPane { protected Component[][] getIntervalPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Direction_Horizontal")), horizontalColorBackground}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Direction_Vertical")), verticalColorBackground}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal")), horizontalColorBackground}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")), verticalColorBackground}, }; } private void checkCardPane() { if (isDefaultIntervalBackground.getSelectedIndex() == 0) { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_Default_Interval")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Default_Interval")); } else { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_CustomIntervalBackground")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomIntervalBackground")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index 0809dda19..9c9a0ab24 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -42,7 +42,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { } private void initComponents() { - isShowDataSheet = new UICheckBox(Inter.getLocText("Plugin-ChartF_Show_Data_Sheet")); + isShowDataSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Show_Data_Sheet")); dataSheetPane = createDataSheetPane(); double p = TableLayout.PREFERRED; @@ -94,9 +94,9 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { double[] columnSize = {d, e}; double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Base_Format"),formatPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"),textAttrPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"),formatPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java index ab3ff8e31..12912f648 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.type.GaugeStyle; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -88,7 +88,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe protected Component[][] getLabelStyleComponents(Plot plot) { initGaugeStyle(plot); if (gaugeStyle == GaugeStyle.RING || gaugeStyle == GaugeStyle.SLOT) { - UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{text,style}, new Component[]{textFontPane,null}, @@ -124,7 +124,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe } protected Component[][] getComponents(JPanel buttonPane) { - UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{text, fontNameComboBox}, new Component[]{null, buttonPane} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java index a5a4beb65..f2ed04c60 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -21,8 +21,8 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane { } protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) { - style = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"), - Inter.getLocText("Plugin-ChartF_Custom")}); + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); textFontPane = initTextFontPane(); initStyleListener(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java index 239c5456f..637122a47 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.designer.style.label; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrLabel; import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.plugin.chart.type.GaugeStyle; @@ -28,16 +28,16 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane { labelDetailPane = new VanChartGaugeCateOrPercentLabelDetailPane(this.plot, this.parent); gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(this.plot, this.parent); GaugeStyle gaugeStyle = ((VanChartGaugePlot)this.plot).getGaugeStyle(); - String cateTitle, valueTitle = Inter.getLocText("Plugin-ChartF_ValueLabel"); + String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueLabel"); switch (gaugeStyle){ case POINTER: - cateTitle = Inter.getLocText("Plugin-ChartF_CategoryLabel"); + cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel"); break; case POINTER_SEMI: - cateTitle = Inter.getLocText("Plugin-ChartF_CategoryLabel"); + cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel"); break; default: - cateTitle = Inter.getLocText("Plugin-ChartF_PercentLabel"); + cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PercentLabel"); break; } JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, labelDetailPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java index f83d10bab..4bb13cab6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartLabelPositionPlot; import com.fr.plugin.chart.base.AttrLabelDetail; import com.fr.plugin.chart.base.AttrTooltipContent; @@ -118,23 +118,23 @@ public class VanChartPlotLabelDetailPane extends BasicPane { } position = new UIButtonGroup(names, values); - autoAdjust = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); + autoAdjust = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); Component[][] comps = new Component[2][2]; comps[0] = new Component[]{null,null}; - comps[1] = new Component[]{new UILabel(Inter.getLocText("Chart-Layout_Position"), SwingConstants.LEFT), position}; + comps[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position"), SwingConstants.LEFT), position}; JPanel panel =new JPanel(new BorderLayout()); panel.add(getLabelPositionPane(comps,row,col),BorderLayout.CENTER); if(plot.isSupportLeadLine()){ - tractionLine = new UIToggleButton(Inter.getLocText("ChartF-Show_GuidLine")); + tractionLine = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine")); tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("",tractionLine); panel.add(tractionLinePane, BorderLayout.SOUTH); initPositionListener(); } else if(PlotFactory.plotAutoAdjustLabelPosition(plot)){ - panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH); + panel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto_Adjust"),autoAdjust), BorderLayout.SOUTH); } return panel; } @@ -143,7 +143,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { protected JPanel getLabelPositionPane (Component[][] comps, double[] row, double[] col){ JPanel panel = TableLayoutHelper.createTableLayoutPane(comps,row,col); - return createTableLayoutPaneWithTitle(Inter.getLocText("FR-Chart_Layout"), panel); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); } @@ -157,14 +157,14 @@ public class VanChartPlotLabelDetailPane extends BasicPane { } protected JPanel createLabelStylePane(double[] row, double[] col, Plot plot) { - style = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"), - Inter.getLocText("Plugin-ChartF_Custom")}); + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); textFontPane =initTextFontPane(); initStyleListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot),row,col); - return createTableLayoutPaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); } protected ChartTextAttrPane initTextFontPane () { @@ -180,7 +180,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { } protected Component[][] getLabelStyleComponents(Plot plot) { - UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{null,null}, new Component[]{text,style}, @@ -199,7 +199,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { protected JPanel createBackgroundColorPane() { backgroundColor = new ColorSelectBox(100); - return createTableLayoutPaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundColor); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundColor); } protected String title4PopupWindow() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java index 6b70d9923..8a6aa9fcd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java @@ -5,7 +5,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.AttrLabel; import com.fr.van.chart.designer.PlotFactory; @@ -31,7 +31,7 @@ public class VanChartPlotLabelPane extends BasicPane { public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) { this.parent = parent; this.plot = plot; - isLabelShow = new UICheckBox(Inter.getLocText("Plugin-ChartF_UseLabel")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseLabel")); labelPane = new JPanel(new BorderLayout(0, 4)); createLabelPane(); addComponents(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java index c580b0da3..d0a88859a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartAbstractPlotSeriesPane.java @@ -14,7 +14,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; import com.fr.design.mainframe.chart.gui.style.series.AbstractPlotSeriesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; @@ -114,7 +114,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP JPanel panel = new JPanel(new BorderLayout()); stylePane = createStylePane(); setColorPaneContent(panel); - JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Color"), panel); + JPanel colorPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Color"), panel); panel.setBorder(BorderFactory.createEmptyBorder(10,5,0,0)); return panel.getComponentCount() == 0 ? null : colorPane; } @@ -129,13 +129,13 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //趋势线 protected JPanel createTrendLinePane() { trendLinePane = new VanChartTrendLinePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Trend_Line"), trendLinePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"), trendLinePane); } //线 protected JPanel createLineTypePane() { lineTypePane = getLineTypePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Line"), lineTypePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line"), lineTypePane); } protected VanChartLineTypePane getLineTypePane() { @@ -145,26 +145,26 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //标记点类型 protected JPanel createMarkerPane() { markerPane = new VanChartMarkerPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Marker"), markerPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"), markerPane); } //填充颜色 protected JPanel createAreaFillColorPane() { areaSeriesFillColorPane = new VanChartAreaSeriesFillColorPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart_Area"), areaSeriesFillColorPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart_Area"), areaSeriesFillColorPane); } //边框（默认没有圆角） protected JPanel createBorderPane() { borderPane = createDiffBorderPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"), borderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"), borderPane); } //半径界面 protected JPanel createRadiusPane() { radiusPane = initRadiusPane(); - radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Radius_Set"), radiusPane); + radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius_Set"), radiusPane); return ((VanChartPlot)plot).isInCustom() ? null : radiusPaneWithTitle; } @@ -176,7 +176,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP checkLarge(); } }); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Large_Model"), largeDataModelGroup); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Model"), largeDataModelGroup); return createLargeDataModelPane(panel); } @@ -230,12 +230,12 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP } protected JPanel createLargeDataModelPane(JPanel jPanel) { - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Large_Data"), jPanel); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Data"), jPanel); return panel; } protected UIButtonGroup createLargeDataModelGroup() { - String[] strings = new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}; + String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}; DataProcessor[] values = new DataProcessor[]{new LargeDataModel(), new NormalDataModel()}; return new UIButtonGroup(strings, values); } @@ -252,7 +252,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //不透明度 protected JPanel createAlphaPane() { transparent = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Alpha"), transparent); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), transparent); } //堆积和坐标轴设置(自定义柱形图等用到) diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java index 82cf817f6..66dd89d81 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartEffectPane.java @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrEffect; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -28,7 +28,7 @@ public class VanChartEffectPane extends BasicBeanPane { } public VanChartEffectPane(boolean hasEnabledChoose){ - enabledButton = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + enabledButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); enabledButton.addChangeListener(new ChangeListener() { @Override @@ -40,7 +40,7 @@ public class VanChartEffectPane extends BasicBeanPane { period = new UISpinner(0, Double.MAX_VALUE, 0.1, 0); content = createContentPane(); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Flash_Animation"),enabledButton); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Animation"),enabledButton); this.setLayout(new BorderLayout(0, 5)); if(hasEnabledChoose) { this.add(panel, BorderLayout.NORTH); @@ -61,11 +61,11 @@ public class VanChartEffectPane extends BasicBeanPane { protected JPanel createPeriodPane(){ JPanel periodPane = new JPanel(); periodPane.setLayout(new BorderLayout(5, 0)); - UILabel label1= new UILabel(Inter.getLocText("Plugin-ChartF_Flash_Period")); + UILabel label1= new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Period")); label1.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); periodPane.add(label1, BorderLayout.WEST); periodPane.add(period, BorderLayout.CENTER); - periodPane.add(new UILabel(Inter.getLocText("FR-Base-Time_Second")), BorderLayout.EAST); + periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second")), BorderLayout.EAST); return periodPane; } @@ -90,6 +90,6 @@ public class VanChartEffectPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Flash_Animation"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flash_Animation"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java index 520a71782..2361965c0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/series/VanChartStackedAndAxisListControlPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartglyph.ConditionCollection; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ShortCut4JControlPane; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAxis; @@ -32,11 +32,11 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); } protected String getAddItemText() { - return Inter.getLocText("Plugin-ChartF_Add"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Add"); } protected ShortCut4JControlPane[] createShortcuts() { @@ -97,6 +97,6 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl } public String getPaneTitle() { - return Inter.getLocText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java index c0cbf2ade..4e3e852de 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.PlotFactory; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -73,8 +73,8 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa new Component[]{refreshTooltipContentPane,null}, new Component[]{initDurationPane(),null}, new Component[]{createLabelStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, }; return components; @@ -96,11 +96,11 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Duration_Time")), duration}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Duration_Time")), duration}, }; JPanel temp = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Time"), temp); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time"), temp); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java index 4ad73155c..77db5f0da 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.designer.style.tooltip; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -18,7 +18,7 @@ public class VanChartPlotTooltipNoCheckPane extends VanChartPlotTooltipPane { } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(Inter.getLocText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); tooltipPane = createTooltipPane(plot); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java index 454dda11c..8eaf298ee 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.PlotFactory; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -50,7 +50,7 @@ public class VanChartPlotTooltipPane extends BasicPane { } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(Inter.getLocText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); tooltipPane = createTooltipPane(plot); double p = TableLayout.PREFERRED; @@ -94,8 +94,8 @@ public class VanChartPlotTooltipPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{tooltipContentPane,null}, new Component[]{createLabelStylePane(),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"),borderPane),null}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Background"), backgroundPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"),borderPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane),null}, new Component[]{createDisplayStrategy(plot),null}, }; return components; @@ -107,7 +107,7 @@ public class VanChartPlotTooltipPane extends BasicPane { } protected JPanel createLabelStylePane() { - style = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"),Inter.getLocText("Plugin-ChartF_Custom")}); + style = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); textFontPane = new ChartTextAttrPane() { protected Component[][] getComponents(JPanel buttonPane) { return new Component[][]{ @@ -118,14 +118,14 @@ public class VanChartPlotTooltipPane extends BasicPane { } }; - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-Chart_Character"), style); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), style); JPanel panel1 = new JPanel(new BorderLayout()); panel1.add(panel, BorderLayout.CENTER); panel1.add(textFontPane, BorderLayout.SOUTH); initStyleListener(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel1); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel1); } @@ -140,8 +140,8 @@ public class VanChartPlotTooltipPane extends BasicPane { protected JPanel createDisplayStrategy(Plot plot) { showAllSeries = new UICheckBox(getShowAllSeriesLabelText()); - followMouse = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_FollowMouse"), - Inter.getLocText("Plugin-ChartF_NotFollowMouse")}); + followMouse = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FollowMouse"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotFollowMouse")}); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; @@ -149,17 +149,17 @@ public class VanChartPlotTooltipPane extends BasicPane { double[] rowSize = { p,p,p}; Component[][] components = new Component[3][2]; components[0] = new Component[]{null,null}; - components[1] = new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Prompt_Box")),followMouse}; + components[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Prompt_Box")),followMouse}; if(plot.isSupportTooltipSeriesType() && hasTooltipSeriesType()){ components[2] = new Component[]{showAllSeries,null}; } JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_DisplayStrategy"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayStrategy"), panel); } protected String getShowAllSeriesLabelText() { - return Inter.getLocText("Plugin-ChartF_ShowAllSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ShowAllSeries"); }; protected boolean hasTooltipSeriesType() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java index 94c17319a..644d3205b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java @@ -4,7 +4,7 @@ import com.fr.chart.base.DataSeriesCondition; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.AbstractVanChartScrollPane; @@ -71,7 +71,7 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); } protected VanChartPlotTooltipPane getTooltipPane(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java index 32a7fca7a..c1ce66503 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java @@ -13,7 +13,7 @@ import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.general.Background; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.js.NameJavaScriptGroup; import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.base.VanChartTools; @@ -43,8 +43,8 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{ } protected Component[][] getComponentsWithLargeData(JPanel typePane){ - largeModelCheckBox = new UICheckBox(Inter.getLocText("Plugin-ChartF_OpenLargeDataModel")); - MultilineLabel prompt = new MultilineLabel(Inter.getLocText("Plugin-ChartF_LargeDataModelPrompt")); + largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OpenLargeDataModel")); + MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LargeDataModelPrompt")); prompt.setForeground(Color.red); JPanel largeDataPane = new JPanel(new BorderLayout()); largeDataPane.add(largeModelCheckBox, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java index 44c314df5..66607f883 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapDataPane.java @@ -7,7 +7,7 @@ import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.drillmap.data.DrillMapDefinition; import com.fr.plugin.chart.type.MapType; import com.fr.van.chart.map.designer.data.MapDataPaneHelper; @@ -112,6 +112,6 @@ public class DrillMapDataPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Chart-Use_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Data"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java index aa525db68..77b74e034 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.drillmap.DrillMapHelper; import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot; import com.fr.plugin.chart.map.server.CompatibleGeoJSONTreeHelper; @@ -71,8 +71,8 @@ public class DrillMapLayerPane extends BasicScrollPane { double[] columnSize = {f}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Layer_Tree"), mapDataTreePanel)}, - new Component[]{createTitlePane(Inter.getLocText("Plugin-ChartF_Layer_Detail"), createLayerDetailPane())} + new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Tree"), mapDataTreePanel)}, + new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Detail"), createLayerDetailPane())} }; JPanel contentPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -96,14 +96,14 @@ public class DrillMapLayerPane extends BasicScrollPane { detailComps = new Component[depth + 1][3]; rowSize[0] = p; detailComps[0] = new Component[]{ - new UILabel(Inter.getLocText("Plugin-Chart_Descriptor")), - new UILabel(Inter.getLocText("Plugin-ChartF_Zoom_Layer")), - new UILabel(Inter.getLocText("Plugin-ChartF_Layer_Map_Type")) + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Zoom_Layer")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Map_Type")) }; for (int i = 0; i < depth; i++) { rowSize[i + 1] = p; int d = i + 1; - UILabel label = new UILabel(String.format("%s%d%s", Inter.getLocText("Plugin-ChartF_Index1"), d, Inter.getLocText("Plugin-ChartF_Index3"))); + UILabel label = new UILabel(String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index1"), d, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index3"))); UIComboBox level = new UIComboBox(VanChartMapSourceChoosePane.ZOOM_LEVELS); level.setEnabled(i != 0); UIComboBox type = new UIComboBox(TEMP.get(oldMapType)); @@ -198,6 +198,6 @@ public class DrillMapLayerPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java index 4c3c44329..4b5d92879 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/EachLayerDataDefinitionPane.java @@ -8,7 +8,7 @@ import com.fr.design.dialog.MultiTabPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.drillmap.DrillMapHelper; import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot; import com.fr.plugin.chart.drillmap.data.DrillMapDefinition; @@ -57,7 +57,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane { List paneList = new ArrayList(); for(int i = 1; i < depth + 1; i++){ - String tile = String.format("%s%d%s", Inter.getLocText("Plugin-ChartF_Index1"), i, Inter.getLocText("Plugin-ChartF_Index3")); + String tile = String.format("%s%d%s", com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index1"), i, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Index3")); SingleLayerDataDefinitionPane pane = new SingleLayerDataDefinitionPane(tile, this.listener, this.parent); pane.setSupportCellData(parent.isSupportCellData()); @@ -141,7 +141,7 @@ public class EachLayerDataDefinitionPane extends MultiTabPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Each_Layer_Data_Special"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Each_Layer_Data_Special"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java index 6dd9b3fc3..6c8401249 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/SingleLayerDataDefinitionPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane; -import com.fr.general.Inter; + import java.awt.BorderLayout; @@ -19,7 +19,7 @@ public class SingleLayerDataDefinitionPane extends FurtherBasicBeanPane dataPane = new NormalChartDataPane(listener, parent){ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_GanttChart"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart"); } }; linkPane = new NormalChartDataPane(listener, parent){ @@ -50,7 +50,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Task_Link"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_Link"); } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java index 859b758f3..eedc09439 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttReportDefinition; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; @@ -40,17 +40,17 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{ } private void initAllComponent() { - seriesName = createTinyFormulaPaneWithTitle(Inter.getLocText("Chart-Series_Name")); + seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")); - startTime = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Start_Time")); + startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")); - endTime = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_End_Time")); + endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")); - markerTime = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Marker_Time")); + markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker_Time")); - progress = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Process")); + progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")); - linkID = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Task_ID")); + linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")); } private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java index 9de5dbeae..85227cd4a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataProjectPane.java @@ -5,7 +5,7 @@ import com.fr.chart.chartdata.TopDefinition; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttReportDefinition; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; @@ -25,7 +25,7 @@ public class GanttReportDataProjectPane extends AbstractReportDataContentPane im private List processPaneList = new ArrayList(); public GanttReportDataProjectPane() { - firstProcessPane = new TinyFormulaWithButtonPane(Inter.getLocText("Plugin-ChartF_Project_Name"), "/com/fr/design/images/buttonicon/add.png") { + firstProcessPane = new TinyFormulaWithButtonPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"), "/com/fr/design/images/buttonicon/add.png") { @Override protected void buttonEvent(TinyFormulaWithButtonPane pane) { addProcessPane(); @@ -69,7 +69,7 @@ public class GanttReportDataProjectPane extends AbstractReportDataContentPane im private void addProcessPane() { int index = processPaneList.size(); - String content = Inter.getLocText("Chart-Use_Items") + (index + 1); + String content = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items") + (index + 1); TinyFormulaWithButtonPane stepPane = createTinyFormulaWithButtonPane(content); stepPane.registerChangeListener(listener); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java index 27bde130e..846a75e3a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java @@ -8,7 +8,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttTableDefinition; import com.fr.stable.StringUtils; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; @@ -24,7 +24,7 @@ import java.util.List; * Created by hufan on 2017/1/10. */ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ - private static final String NONE = Inter.getLocText("Chart-Use_None"); + private static final String NONE = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"); private UIComboBox seriesComboBox; private UIComboBox startTimeComboBox; @@ -58,7 +58,7 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ taskIDComboBox = new UIComboBox(); taskIDComboBox.addItem(NONE); - taskIDComboBox.setToolTipText(Inter.getLocText("Plugin-ChartF_Task_ID_Tooltip")); + taskIDComboBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID_Tooltip")); } private JPanel getContentPane(){ @@ -68,12 +68,12 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ double[] col = {p,f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Chart-Series_Name")), seriesComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Start_Time")), startTimeComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_End_Time")), endTimeComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Marker_Time")), markerTimeComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Process")), processComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Task_ID")), taskIDComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")), startTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")), endTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker_Time")), markerTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")), processComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")), taskIDComboBox} }; return TableLayoutHelper.createGapTableLayoutPane(components, row, col,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java index 35416bc45..d49883b43 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java @@ -7,7 +7,7 @@ import com.fr.chart.chartdata.TopDefinition; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttTableDefinition; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; @@ -40,7 +40,7 @@ public class GanttTableDataProjectPane extends AbstractTableDataContentPane impl projectName = new ComboBoxWithButtonPane(){ @Override protected String getTitleText() { - return Inter.getLocText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java index 58e79f227..a30a2af5b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkReportDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttLinkReportDefinition; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; @@ -33,11 +33,11 @@ public class GanttLinkReportDataContentPane extends AbstractReportDataContentPan this.add(panel, BorderLayout.CENTER); } private void initAllComponent() { - startTaskID = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Start_Task_ID")); + startTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Task_ID")); - endTaskID = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_End_Task_ID")); + endTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID")); - linkType = createTinyFormulaPaneWithTitle(Inter.getLocText("Plugin-ChartF_Link_Type")); + linkType = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Type")); } private TinyFormulaPane createTinyFormulaPaneWithTitle(final String title) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java index 3628cacf1..0b854a994 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.data.VanGanttLinkTableDefinition; import com.fr.stable.StringUtils; import com.fr.van.chart.gantt.designer.data.data.GanttDataPaneHelper; @@ -53,9 +53,9 @@ public class GanttLinkTableDataContentPane extends AbstractTableDataContentPane double[] col = {p,f}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Start_Task_ID")), startTaskIDComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_End_Task_ID")), endTaskIDComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Link_Type")), linkTypeComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Task_ID")), startTaskIDComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID")), endTaskIDComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Type")), linkTypeComboBox} }; return TableLayoutHelper.createGapTableLayoutPane(components, row, col,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java index 600cdd541..c46c91458 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttAxisStylePane.java @@ -7,7 +7,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; import com.fr.design.mainframe.chart.gui.style.ChartTextAttrPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.attr.GanttAxisStyleAttr; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -36,8 +36,8 @@ public class GanttAxisStylePane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{textAttrPane, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelectBox4button}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelectBox4button}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent} }; JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java index 95fd6fbd3..4251fdbca 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttProcessAxisPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.plugin.chart.gantt.attr.GanttProcessAxis; import com.fr.plugin.chart.vanchart.VanChart; @@ -56,23 +56,23 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { private Component createBodyPane() { bodyPane = new GanttAxisStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Content"), bodyPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content"), bodyPane); } private Component createHorizontalHeaderPane() { horizontalHeaderPane = new GanttAxisStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Horizontal_Table"), horizontalHeaderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Table"), horizontalHeaderPane); } private Component createVerticalHeaderPane() { verticalHeaderPane = new GanttAxisStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Vertical_Table"), verticalHeaderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Vertical_Table"), verticalHeaderPane); } private Component createHorizontalProportionPane() { - typeButton = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Auto"), Inter.getLocText("Plugin-ChartF_Custom")}); + typeButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); horizontalProportion = new UISpinner(0, 100, 1, 30); JPanel proportionPane = new JPanel(new BorderLayout(5, 0)); @@ -91,9 +91,9 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { } }); - JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Horizontal_Proportion"), panel); + JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Proportion"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-DataFunction_Percent"), jPanel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-DataFunction_Percent"), jPanel); } private void checkoutPaneVisible() { @@ -134,6 +134,6 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Project_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Axis"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java index cadb9cb85..ef2e29c4c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/axis/GanttTimeAxisPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.plugin.chart.gantt.attr.GanttTimeAxis; import com.fr.plugin.chart.type.ZoomLevel; @@ -57,19 +57,19 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane { private Component createDownHeadPane() { downHeadPane = new GanttAxisStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Down_Head_Table"),downHeadPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Down_Head_Table"),downHeadPane); } private Component createUpHeadPane() { upHeadPane = new GanttAxisStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Up_Head_Table"),upHeadPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Up_Head_Table"),upHeadPane); } private Component createConditionConfigPane() { - timeZoom = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + timeZoom = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); initialLevel = new UIComboBox(ZOOM_LEVELS); - weekendTooltip = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); + weekendTooltip = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -79,14 +79,14 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane { Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Time_Zoom")), timeZoom}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Initial_Level")), initialLevel}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Weekend_Tooltip")), weekendTooltip} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Zoom")), timeZoom}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Initial_Level")), initialLevel}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Weekend_Tooltip")), weekendTooltip} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Condition_Config"),panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Condition_Config"),panel); } @Override @@ -118,6 +118,6 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Time_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Axis"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java index eb2a2afd9..b5d27114f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java @@ -4,7 +4,7 @@ import com.fr.base.background.ColorBackground; import com.fr.chart.chartglyph.Marker; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; @@ -27,8 +27,8 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane { colorSelect = new ColorSelectBoxWithOutTransparent(100); return new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Shape")), getMarkerPane()}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape")), getMarkerPane()}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java index 290a248b2..5caea0284 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.stable.CoreConstants; @@ -51,9 +51,9 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createGanntStylePane(){ - seriesNewLine = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), Inter.getLocText("Plugin-ChartF_Close")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Series_New_Line"),seriesNewLine); - JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Style"), panel); + seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Series_New_Line"),seriesNewLine); + JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Style"), panel); return ganntStylePane; } @@ -69,12 +69,12 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - JPanel linkLinePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Link_Line"), panel); + JPanel linkLinePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Line"), panel); return linkLinePane; } @@ -91,7 +91,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { return new VanChartImageMarkerWithoutWidthAndHeightPane(); } }; - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Gannt_Marker"), markerPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gannt_Marker"), markerPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java index 149bcbbc8..ff2580794 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/tooltip/VanChartGanttTooltipContentPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.gantt.designer.style.tooltip; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.style.FormatPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.format.AttrTooltipDurationFormat; import com.fr.plugin.chart.base.format.AttrTooltipFormat; @@ -40,27 +40,27 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Start_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time"); } }; endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_End_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time"); } }; durationFormatPane = new VanChartFormatComBoxWithCheckBox(); progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Process"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process"); } }; } @@ -146,7 +146,7 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane private VanChartFormatComBoxWithCheckBox() { this.setLayout(new BorderLayout()); - isSelectedBox = new UICheckBox(Inter.getLocText("Plugin-ChartF_Duration_Time")); + isSelectedBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Duration_Time")); formatComBox = new UIComboBox(IntervalTimeFormat.getFormats()); isSelectedBox.addMouseListener(new MouseListener() { @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java index 79afbc79e..cb792743d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.gantt.designer.type; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.gantt.GanttIndependentVanChart; import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by hufan on 2017/1/9. */ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewGantt"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); @Override protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/gantt/images/gantt.png" @@ -22,7 +22,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_GanttChart") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart") }; } @@ -36,7 +36,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewGantt"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); } public Chart getDefaultChart() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java index 803f8ae4c..e4df563c6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugePlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.gauge; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.gauge.GaugeIndependentVanChart; import com.fr.plugin.chart.gauge.VanChartGaugePlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/27. */ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewGauge"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); private static final long serialVersionUID = -4599483879031804911L; @@ -28,11 +28,11 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - return new String[]{Inter.getLocText("Plugin-ChartF_Gauge_Pointer"), - Inter.getLocText("Plugin-ChartF_Gauge_Pointer180"), - Inter.getLocText("Plugin-ChartF_Gauge_Ring"), - Inter.getLocText("Plugin-ChartF_Gauge_Slot"), - Inter.getLocText("Plugin-ChartF_Gauge_Cuvette") + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Pointer"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Pointer180"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Ring"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Slot"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gauge_Cuvette") }; } @@ -41,7 +41,7 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewGauge"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java index 6b0000025..0331a59b5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java @@ -11,7 +11,7 @@ import com.fr.design.mainframe.chart.gui.style.series.ColorPickerPaneWithFormula import com.fr.design.mainframe.chart.gui.style.series.UIColorPickerPane; import com.fr.design.style.color.ColorSelectBox; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.GaugeDetailStyle; import com.fr.plugin.chart.base.AttrLabel; import com.fr.plugin.chart.gauge.VanChartGaugePlot; @@ -66,15 +66,15 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createGaugeLayoutPane() { - gaugeLayout = new UIButtonGroup(new String[]{Inter.getLocText("FR-Chart-Direction_Horizontal"), Inter.getLocText("FR-Chart-Direction_Vertical")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("PageSetup-Orientation"),gaugeLayout); + gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")}); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { changeLabelPosition(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); } private void changeLabelPosition() { @@ -104,10 +104,10 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { JPanel centerPanel = TableLayoutHelper.createTableLayoutPane(getDiffComponentsWithGaugeStyle(), row, col); panel.add(centerPanel, BorderLayout.CENTER); if(rotate != null){ - JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Rotation_Direction"), rotate); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation_Direction"), rotate); panel.add(panel1, BorderLayout.NORTH); } - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); } private Component[][] getDiffComponentsWithGaugeStyle() { @@ -149,41 +149,41 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { private Component[] getHingeColor() { hingeColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Hinge")),hingeColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Hinge")),hingeColor}; } private Component[] getHingeBackgroundColor() { hingeBackgroundColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_HingeBackground")),hingeBackgroundColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HingeBackground")),hingeBackgroundColor}; } private Component[] getNeedleColor() { needleColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Needle")),needleColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Needle")),needleColor}; } private Component[] getPaneBackgroundColor() { paneBackgroundColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_PaneBackground")),paneBackgroundColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PaneBackground")),paneBackgroundColor}; } private Component[] getSlotBackgroundColor() { slotBackgroundColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_SlotBackground")),slotBackgroundColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SlotBackground")),slotBackgroundColor}; } private void initRotate() { - rotate = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_AntiClockWise"), Inter.getLocText("Plugin-ChartF_ClockWise")}); + rotate = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AntiClockWise"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ClockWise")}); } private Component[] getInnerPaneBackgroundColor() { innerPaneBackgroundColor = new ColorSelectBox(120); - return new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_InnerPaneBackground")),innerPaneBackgroundColor}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerPaneBackground")),innerPaneBackgroundColor}; } private JPanel createGaugeBandsPane() { colorPickerPane = new ColorPickerPaneWithFormula(parentPane, "meterString"); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Range"), colorPickerPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Range"), colorPickerPane); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java index ab0e7d716..274b2b33c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.style.ChartFillStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.map.VanChartMapSeriesPane; @@ -56,7 +56,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { */ @Override protected JPanel getContentInPlotType() { - final UIButtonGroup group = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_HeatPoint"), Inter.getLocText("Plugin-ChartF_Background_Area")}); + final UIButtonGroup group = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HeatPoint"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background_Area")}); group.setSelectedIndex(0); JPanel backgroundAreaPane = createAreaPane(); @@ -111,13 +111,13 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { Component[][] components = new Component[][]{ new Component[]{null, null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Radius")), radius, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Heat_Map_Blur")), blur, new UILabel("%")} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Heat_Map_Radius")), radius, null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Heat_Map_Blur")), blur, new UILabel("%")} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); } @@ -134,13 +134,13 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Min")), minOpacity}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Max")), maxOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Min")), minOpacity}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Max")), maxOpacity} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Alpha"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), panel); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java index 265a58f27..79c385cd7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapSourceChoosePane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.heatmap.designer.type; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane; /** @@ -10,6 +10,6 @@ import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane; public class VanChartHeatMapSourceChoosePane extends VanChartMapSourceChoosePane { @Override protected UILabel createSourceTitleLabel() { - return new UILabel(Inter.getLocText("Plugin-ChartF_Map_Area_And_Point")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area_And_Point")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java index 307490500..8f717c221 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/type/VanChartHeatMapTypePane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.heatmap.HeatMapIndependentVanChart; import com.fr.plugin.chart.heatmap.VanChartHeatMapPlot; @@ -16,7 +16,7 @@ import com.fr.van.chart.map.designer.type.VanChartMapSourceChoosePane; * Created by Mitisky on 16/10/20. */ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewHeatMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); @Override protected String[] getTypeIconPath() { @@ -27,7 +27,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_HeatMap") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HeatMap") }; } @@ -48,7 +48,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewHeatMap"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java index b9a093672..7c462d135 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLineCustomStackAndAxisConditionPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.line; import com.fr.design.gui.ilable.UILabel; -import com.fr.general.Inter; + import com.fr.van.chart.column.VanChartCustomStackAndAxisConditionPane; import java.awt.Component; @@ -12,9 +12,9 @@ import java.awt.Component; public class VanChartLineCustomStackAndAxisConditionPane extends VanChartCustomStackAndAxisConditionPane { protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("ChartF-X_Axis")),XAxis}, - new Component[]{new UILabel(Inter.getLocText("ChartF-Y_Axis")),YAxis}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Type_Stacked")),isStacked}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")),YAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked")),isStacked}, }; return components; diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java index 214236be7..e70f8178d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.line; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.line.LineIndependentVanChart; import com.fr.plugin.chart.line.VanChartLinePlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/11/5. */ public class VanChartLinePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewLine"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -26,9 +26,9 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Type_Line"), - Inter.getLocText(new String[]{"FR-Chart-Type_Stacked","FR-Chart-Type_Line"}), - Inter.getLocText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Line"), + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Type_Stacked","FR-Chart-Type_Line"}), + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") }; } @@ -37,7 +37,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewLine"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java index e40a4ac39..89d4de64c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.VanChartAttrHelper; import com.fr.plugin.chart.base.AttrBorderWithAlpha; import com.fr.plugin.chart.base.AttrEffect; @@ -51,9 +51,9 @@ import java.awt.event.ItemListener; * 地图-系列界面 */ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { - private static final String AREA_STRING = Inter.getLocText("Plugin-ChartF_Area"); - private static final String POINT_STRING = Inter.getLocText("Plugin-ChartF_Point"); - private static final String LINE_STRING = Inter.getLocText("Plugin-ChartF_Flow"); + private static final String AREA_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Area"); + private static final String POINT_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point"); + private static final String LINE_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Flow"); private static final String[] MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(), MapMarkerType.COMMON.toLocalString(), MapMarkerType.BUBBLE.toLocalString(), MapMarkerType.IMAGE.toLocalString()}; @@ -173,7 +173,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{getColorPane()}, - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Border"), borderWithAlphaPane)}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"), borderWithAlphaPane)}, }; return TableLayoutHelper.createTableLayoutPane(components, row, col); @@ -182,7 +182,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { protected JPanel createNullValueColorPane() { nullValueColorBox = new ColorSelectBox(80); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_NULL_Value_Color"), nullValueColorBox); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NULL_Value_Color"), nullValueColorBox); } private JPanel createPointPane() { @@ -193,7 +193,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { double[] col = {f}; Component[][] components = new Component[][]{ - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((Inter.getLocText("Plugin-ChartF_Color")), createPointAlphaPane())}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle((com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Color")), createPointAlphaPane())}, new Component[]{createMarkerComPane()}, new Component[]{createLargeDataModelPane()}, new Component[]{createPointEffectPane()}, @@ -227,29 +227,29 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { checkLineMapLarge(); } }); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Large_Model"), lineMapLargeDataModelGroup); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Large_Model"), lineMapLargeDataModelGroup); return createLargeDataModelPane(panel); } private Component createCurvePane() { curvePane = new VanChartCurvePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Curve"), curvePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Curve"), curvePane); } private Component createAnimationPane() { lineMapEffectPane = new VanChartLineMapEffectPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Animation"), lineMapEffectPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), lineMapEffectPane); } //不透明度 private JPanel createPointAlphaPane() { pointAlphaPane = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Alpha"), pointAlphaPane); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha"), pointAlphaPane); } private JPanel createPointEffectPane() { pointEffectPane = new VanChartEffectPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Animation"), pointEffectPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), pointEffectPane); } private JPanel createMarkerComPane() { @@ -292,11 +292,11 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { } }); - JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Point_Style"), markerTypeCom); + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point_Style"), markerTypeCom); JPanel markerPane = new JPanel(new BorderLayout(0, 6)); markerPane.add(northPane, BorderLayout.NORTH); markerPane.add(cardPane, BorderLayout.CENTER); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Marker"), markerPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"), markerPane); } private JPanel createCustomPane(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java index fd26e2203..95f692239 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaAndPointGroupPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.map.designer; -import com.fr.general.Inter; + import javax.swing.JPanel; @@ -10,8 +10,8 @@ import javax.swing.JPanel; * 点地图和区域地图的各种配置 */ public class VanMapAreaAndPointGroupPane extends VanChartGroupPane { - private static final String AREA_MAP_STRING = Inter.getLocText("Plugin-ChartF_AreaMap"); - private static final String POINT_MAP_STRING = Inter.getLocText("Plugin-ChartF_PointMap"); + private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"); public VanMapAreaAndPointGroupPane(JPanel areaPane, JPanel pointPane) { super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING}, new JPanel[]{areaPane, pointPane}); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java index 69e3f90a2..bd9a50292 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/VanMapAreaPointAndLineGroupPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.map.designer; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -12,9 +12,9 @@ import javax.swing.border.Border; * 点地图和区域地图的各种配置 */ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane { - private static final String AREA_MAP_STRING = Inter.getLocText("Plugin-ChartF_AreaMap"); - private static final String POINT_MAP_STRING = Inter.getLocText("Plugin-ChartF_PointMap"); - private static final String LINE_MAP_STRING = Inter.getLocText("Plugin-ChartF_LineMap"); + private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"); + private static final String LINE_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineMap"); public VanMapAreaPointAndLineGroupPane(final JPanel areaPane, final JPanel pointPane, final JPanel linePane){ super(new String[]{AREA_MAP_STRING, POINT_MAP_STRING, LINE_MAP_STRING}, new JPanel[]{areaPane, pointPane, linePane}); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java index e30264431..845de7d64 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; import javax.swing.JPanel; @@ -37,7 +37,7 @@ public class AreaPane extends AbstractReportDataContentPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java index a3f921526..986b7de49 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.map.designer.data.component.report; import com.fr.design.gui.ilable.BoldFontTextLabel; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.data.VanMapReportDefinition; import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; @@ -30,7 +30,7 @@ public class LineMapAreaPane extends PointMapAreaPane { endAreaPane = new AreaPane(){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName} }; } }; @@ -40,7 +40,7 @@ public class LineMapAreaPane extends PointMapAreaPane { areaPane =new AreaPane(){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName} }; } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java index 0e5a6f093..82599b31c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.map.designer.data.component.report; import com.fr.design.gui.ilable.BoldFontTextLabel; -import com.fr.general.Inter; + import java.awt.Component; @@ -15,9 +15,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { endAreaPane = new LongLatAreaPane(){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaName} }; } }; @@ -27,9 +27,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { areaPane = new LongLatAreaPane(){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName} }; } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java index ae598ff54..1cd5ab273 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java @@ -5,7 +5,7 @@ import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; import javax.swing.JPanel; @@ -40,9 +40,9 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitude}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java index 0ab45f52c..fb5b955c2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; import com.fr.van.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; @@ -52,7 +52,7 @@ public class AreaPane extends AbstractTableDataContentPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java index 7f82bdbc6..ff8b7e552 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.map.designer.data.component.table; import com.fr.design.gui.ilable.BoldFontTextLabel; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider; import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; import com.fr.van.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; @@ -35,7 +35,7 @@ public class LineMapAreaPane extends PointMapAreaPane { areaPane = new AreaPane(parentPane){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom} }; } }; @@ -45,7 +45,7 @@ public class LineMapAreaPane extends PointMapAreaPane { endAreaPane = new AreaPane(parentPane){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom} }; } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java index a18b68168..adcb9d0d1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.map.designer.data.component.table; import com.fr.design.gui.ilable.BoldFontTextLabel; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; import java.awt.Component; @@ -20,9 +20,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { endAreaPane = new LongLatAreaPane(parentPane){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Longitude"})), longitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "Plugin-ChartF_Latitude"})), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_End", "FR-Chart-Area_Name"})), areaNameCom} }; } }; @@ -32,9 +32,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { areaPane = new LongLatAreaPane(parentPane){ protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom} }; } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java index 82ecb81a3..b1ee95d6a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.van.chart.map.designer.data.component.LongitudeLatitudeAndArea; import com.fr.van.chart.map.designer.data.contentpane.table.VanPointMapPlotTableDataContentPane; @@ -42,9 +42,9 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitudeCom}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java index 2729db89c..133f19ae2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java @@ -7,7 +7,7 @@ import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.data.VanMapReportDefinition; import javax.swing.BorderFactory; @@ -36,7 +36,7 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte protected void initLayout() { this.setLayout(new BorderLayout(4, 0)); - UILabel label = new UILabel(Inter.getLocText("FR-Chart-Area_Name")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")); label.setPreferredSize(new Dimension(75, 20)); this.add(label, BorderLayout.WEST); @@ -58,8 +58,8 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte @Override protected String[] columnNames() { return new String[]{ - Inter.getLocText("FR-Chart-Series_Name"), - Inter.getLocText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java index 0e4a74fc6..fd18f53ee 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanPointMapPlotReportDataContentPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.data.VanMapReportDefinition; import com.fr.van.chart.map.designer.data.component.report.AbstractLongLatAreaPane; import com.fr.van.chart.map.designer.data.component.report.PointMapAreaPane; @@ -78,8 +78,8 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa } }; - locationType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Location_With_AreaName"), - Inter.getLocText("Plugin-ChartF_Location_With_LongAndLat")}); + locationType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_AreaName"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_LongAndLat")}); locationType.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -99,7 +99,7 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,12,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java index 5ace37619..fd95479be 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java @@ -9,7 +9,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider; import com.fr.van.chart.map.designer.data.component.SeriesTypeUseComboxPaneWithOutFilter; @@ -63,7 +63,7 @@ public class VanAreaMapPlotTableDataContentPane extends AbstractTableDataContent } protected JPanel createAreaNamePane() { - UILabel label = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Area_Name")); + UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")); label.setPreferredSize(new Dimension(80, 20)); areaNameCom.setPreferredSize(new Dimension(100, 20)); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java index bf82f6b5f..ddbf05de5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanPointMapPlotTableDataContentPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.data.VanMapTableDefinitionProvider; import com.fr.van.chart.map.designer.data.component.table.AbstractLongLatAreaPane; import com.fr.van.chart.map.designer.data.component.table.PointMapAreaPane; @@ -103,8 +103,8 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData } }; - locationType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Location_With_AreaName"), - Inter.getLocText("Plugin-ChartF_Location_With_LongAndLat")}); + locationType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_AreaName"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Location_With_LongAndLat")}); locationType.addChangeListener(new ChangeListener() { @Override @@ -124,7 +124,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,30,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java index 38a3685e4..5ef8e8a8f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.map.designer.other; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.plot.VanChartPlot; import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.type.MapType; @@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo @Override protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartMapHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); } @Override protected void populateHyperlink(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java index 8f9479f8c..0a830a41e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBorderWithAlphaConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.map.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrBorderWithAlpha; import com.fr.van.chart.designer.component.border.VanChartBorderWithAlphaPane; import com.fr.van.chart.designer.other.condition.item.AbstractNormalMultiLineConditionPane; @@ -21,7 +21,7 @@ public class VanChartBorderWithAlphaConditionPane extends AbstractNormalMultiLin @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Border"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"); } @Override @@ -37,7 +37,7 @@ public class VanChartBorderWithAlphaConditionPane extends AbstractNormalMultiLin */ @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Border"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java index b3947bdcc..8098b2e01 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartBubbleMarkerConditionPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.map.designer.other.condition.item; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.van.chart.designer.other.condition.item.VanChartBubbleSetConditionPane; /** @@ -13,11 +13,11 @@ public class VanChartBubbleMarkerConditionPane extends VanChartBubbleSetConditio } protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java index 4ba7f7c73..5223f09db 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.map.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.van.chart.designer.other.condition.item.AbstractNormalMultiLineConditionPane; import com.fr.van.chart.map.designer.style.series.VanChartMapScatterMarkerPane; @@ -21,7 +21,7 @@ public class VanChartCommonMarkerConditionPane extends AbstractNormalMultiLineCo @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override @@ -37,7 +37,7 @@ public class VanChartCommonMarkerConditionPane extends AbstractNormalMultiLineCo */ @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java index 4d78ae254..b2746cd4c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartImageMarkerConditionPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.map.designer.other.condition.item; import com.fr.chart.base.DataSeriesCondition; import com.fr.design.condition.ConditionAttributesPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrMarker; import com.fr.van.chart.designer.component.marker.VanChartImageMarkerPane; import com.fr.van.chart.designer.other.condition.item.AbstractNormalMultiLineConditionPane; @@ -21,7 +21,7 @@ public class VanChartImageMarkerConditionPane extends AbstractNormalMultiLineCon @Override protected String getItemLabelString() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override @@ -37,7 +37,7 @@ public class VanChartImageMarkerConditionPane extends AbstractNormalMultiLineCon */ @Override public String nameForPopupMenuItem() { - return Inter.getLocText("Plugin-ChartF_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Marker"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java index d20f61f40..b7508410d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.map.designer.style.tooltip; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.VanChartMapPlot; import com.fr.plugin.chart.map.attr.AttrMapTooltip; import com.fr.van.chart.designer.AbstractVanChartScrollPane; @@ -123,7 +123,7 @@ public class VanChartMapTooltipPane extends AbstractVanChartScrollPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java index 78de970b6..2b8ea1ac8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.design.mainframe.chart.gui.type.ChartImagePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.map.MapIndependentVanChart; import com.fr.plugin.chart.map.VanChartMapPlot; @@ -20,7 +20,7 @@ import java.awt.Component; * Created by Mitisky on 16/5/4. */ public class VanChartMapPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap"); private VanChartMapSourceChoosePane sourceChoosePane; @@ -36,10 +36,10 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_AreaMap"), - Inter.getLocText("Plugin-ChartF_PointMap"), - Inter.getLocText("Plugin-ChartF_LineMap"), - Inter.getLocText("Plugin-ChartF_CustomMap") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaMap"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PointMap"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineMap"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CustomMap") }; } @@ -60,7 +60,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewMap"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap"); } protected Component[][] getPaneComponents(JPanel typePane){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java index 05a5f02a8..01c54de50 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -18,7 +18,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.http.HttpClient; import com.fr.plugin.chart.base.GisLayer; import com.fr.plugin.chart.base.ViewCenter; @@ -90,8 +90,8 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { //深蓝和高德地图下拉框层级 private static final ZoomLevel[] BLUE_ZOOM_LEVELS =(ZoomLevel[]) ArrayUtils.subarray(ZOOM_LEVELS, 0, 34); private static final ZoomLevel[] GAODE_ZOOM_LEVELS =ArrayUtils.addAll(new ZoomLevel[]{ZoomLevel.AUTO}, (ZoomLevel[])ArrayUtils.subarray(ZOOM_LEVELS, 7, 38)); - private static final String AUTO_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Automatic"); - private static final String CUSTOM_CENTER_STRING = Inter.getLocText("Plugin-ChartF_Custom"); + private static final String AUTO_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"); + private static final String CUSTOM_CENTER_STRING = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"); private UILabel sourceTitleLabel; private FRTreeComboBox sourceComboBox; @@ -152,7 +152,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { panel.add(createMapSourcesPane(), BorderLayout.NORTH); panel.add(createGISLayerPane(), BorderLayout.CENTER); - JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer_Basic"), panel); + JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), panel); Component[][] comps = new Component[][]{ new Component[]{BasePane}, @@ -172,7 +172,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { } protected UILabel createSourceTitleLabel() { - return new UILabel(Inter.getLocText("Plugin-ChartF_Map_Area")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area")); } private JPanel createMapSourcesPane() { @@ -306,7 +306,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { layerCardPane.add(pane, itemName); } - JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Gis_Layer"), gisLayer); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gis_Layer"), gisLayer); panel.add(panel1, BorderLayout.CENTER); panel.add(layerCardPane, BorderLayout.SOUTH); @@ -317,9 +317,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private void refreshZoomLevel(){ //gis图层不同，对应的缩放等级不同。 ZoomLevel[] levels; - if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Inter.getLocText("Plugin-ChartF_Layer_Blue"))) { + if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Blue"))) { levels = BLUE_ZOOM_LEVELS; - } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), Inter.getLocText("Plugin-ChartF_Layer_GaoDe"))) { + } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_GaoDe"))) { levels = GAODE_ZOOM_LEVELS; } else { levels = ZOOM_LEVELS; @@ -355,7 +355,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { wmsUrl = new UITextArea(); - connectButton = new UIButton(Inter.getLocText("Plugin-ChartF_Connect_WMP")); + connectButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connect_WMP")); Component[][] comps = new Component[][]{ new Component[]{new UILabel("url"), wmsUrl, connectButton} @@ -398,11 +398,11 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { @Override protected void done() { - connectButton.setText(Inter.getLocText("Plugin-ChartF_Connect_WMP")); + connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connect_WMP")); if(list != null && list.size() > 0) { resetWMSLayerPane(list); } else { - JOptionPane.showMessageDialog(null, Inter.getLocText("Plugin-ChartF_Invalid_WMS")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Invalid_WMS")); } } }.execute(); @@ -418,7 +418,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { @Override public void mousePressed(MouseEvent e) { - connectButton.setText(Inter.getLocText("Plugin-ChartF_Connecting_WMP")); + connectButton.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Connecting_WMP")); } @Override @@ -447,7 +447,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { wmsLayerPane.removeAll(); for(int i =0; i < size; i++){ rowSize[i] = TableLayout.PREFERRED; - comps[i][0] = i == 0 ? new UILabel(Inter.getLocText("Plugin-ChartF_WMS_Layers"), SwingConstants.RIGHT) : null; + comps[i][0] = i == 0 ? new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WMS_Layers"), SwingConstants.RIGHT) : null; WMSLayer layer = wmsLayers.get(i); UICheckBox checkBox = new UICheckBox(layer.getLayer()); checkBox.registerChangeListener(listener); @@ -479,14 +479,14 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { Component[][] comps = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Zoom_Layer")), zoomLevel}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_View_Center")), viewCenterCom}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Zoom_Layer")), zoomLevel}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_View_Center")), viewCenterCom}, }; final JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps,rowSize,columnSize); Component[][] longAndLatComps = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Longitude")), longitude}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Latitude")), latitude} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude} }; longAndLatPane =TableLayout4VanChartHelper.createGapTableLayoutPane(longAndLatComps,rowSize,column); longAndLatPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); @@ -512,7 +512,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { longAndLatPane.setVisible(!isAutoViewCenter()); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Map_Init_Status"), contentPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Init_Status"), contentPane); } private boolean isAutoViewCenter() { @@ -579,16 +579,16 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { } switch (mapType){ case CUSTOM: - sourceTitleLabel.setText(Inter.getLocText("Plugin-ChartF_Map_Area_And_Point")); + sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area_And_Point")); break; case POINT: - sourceTitleLabel.setText(Inter.getLocText("Plugin-ChartF_Map_Point")); + sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Point")); break; case LINE: - sourceTitleLabel.setText(Inter.getLocText("Plugin-ChartF_Map_Point")); + sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Point")); break; default: - sourceTitleLabel.setText(Inter.getLocText("Plugin-ChartF_Map_Area")); + sourceTitleLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Area")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithCheckBox.java index ab6337b12..22141b0e4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.map.line; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -16,7 +16,7 @@ public class StartAndEndNameFormatPaneWithCheckBox extends CategoryNameFormatPan @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Start_And_End"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_And_End"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java index 047508bda..5b5ed39b9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.map.line.condition.AttrCurve; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -47,9 +47,9 @@ public class VanChartCurvePane extends BasicBeanPane{ private Component[][] getUseComponent() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Line_Width")), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Bedding")),bending}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), lineAlphaPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Width")), lineWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Bedding")),bending}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), lineAlphaPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java index 73eae6f0e..5c5a0aa7d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartLineMapEffectPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.map.line; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrEffect; import com.fr.plugin.chart.map.line.condition.AttrLineEffect; import com.fr.plugin.chart.type.LineMapAnimationType; @@ -32,7 +32,7 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane { public VanChartLineMapEffectPane() { super(true); - this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Line_Map_Animation"), enabledButton), BorderLayout.NORTH); + this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Map_Animation"), enabledButton), BorderLayout.NORTH); } protected JPanel createContentPane() { @@ -60,7 +60,7 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane { private Component createAnimationSelectPane() { JPanel panel = new JPanel(new BorderLayout(5, 0)); - UILabel label1 = new UILabel(Inter.getLocText("Plugin-ChartF_Animation_Type")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation_Type")); label1.setPreferredSize(new Dimension((int) TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); panel.add(label1, BorderLayout.WEST); panel.add(animationType, BorderLayout.CENTER); @@ -125,6 +125,6 @@ public class VanChartLineMapEffectPane extends VanChartEffectPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_Line_Map_Animation"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Line_Map_Animation"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java index 1da75fbbe..78844cfef 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java @@ -5,7 +5,7 @@ import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.start.ServerStarter; import com.fr.workspace.WorkContext; @@ -18,7 +18,7 @@ public class ChartMapEditorAction extends UpdateAction { public ChartMapEditorAction(){ this.setSmallIcon(IOUtils.readIcon("/com/fr/van/chart/map/images/mapData.png")); - this.setName(Inter.getLocText("Plugin-ChartF_Map_Data")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Map_Data")); } public void actionPerformed(ActionEvent evt) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java index bbc02df10..59724280b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/VanChartMultiPiePlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.multilayer; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.multilayer.MultiPieIndependentVanChart; import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot; @@ -14,7 +14,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Fangjie on 2016/6/15. */ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewMultiPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); @Override protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/multilayer/image/multiPie.png" @@ -24,7 +24,7 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_MultiPieChart") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPieChart") }; } @@ -35,7 +35,7 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { @Deprecated public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewMultiPie"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java index 46020d0bf..b4d99e53e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotReportDataContentPane.java @@ -12,7 +12,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.multilayer.data.MultiPieReportDataDefinition; import javax.swing.BorderFactory; @@ -92,9 +92,9 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent nameField.setPreferredSize(new Dimension(WD, HT)); Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, }; return TableLayoutHelper.createTableLayoutPane(components_north, rowSize_north, columnSize_north); @@ -131,13 +131,13 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent Component[][] components_center = new Component[levelNum + 2][]; for (int i = 0; i < levelNum; i++){ - components_center[i] = new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)}; + components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)}; } value = new TinyFormulaPane(); components_center[levelNum] = new Component[]{new JSeparator(), null}; - components_center[levelNum+1] = new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), value}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), value}; registerListener4Center(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java index dab9ba2c0..3f451c532 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/data/MultiPiePlotTableDataContentPane.java @@ -15,7 +15,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.multilayer.data.MultiPieValueDefinition; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -71,7 +71,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa for (int i = 0; i < levelNum; i++){ levelNameList.add(new UIComboBox()); levelNameList.get(i).setPreferredSize(new Dimension(WD, HT)); - levelNameList.get(i).addItem(Inter.getLocText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } } @@ -102,7 +102,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa Component[][] components_center = new Component[levelNum + 3][]; for (int i = 0; i < levelNum; i++){ - components_center[i] = new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)}; + components_center[i] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level") + String.valueOf(i+1)), levelNameList.get(i)}; } value = new UIComboBox(); @@ -112,8 +112,8 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa calculateCombox.setPreferredSize(new Dimension(WD, HT)); components_center[levelNum] = new Component[]{getJSeparator(), null}; - components_center[levelNum+1] = new Component[]{new UILabel(Inter.getLocText("FR-Chart_Bubble_Size")), value}; - components_center[levelNum+2] = new Component[]{new UILabel(Inter.getLocText("Chart-Summary_Method")), calculateCombox}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), value}; + components_center[levelNum+2] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox}; initCenterItemListener(); @@ -180,9 +180,9 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa nameField = new UITextField(); Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, new Component[]{getJSeparator(),null }, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north, rowSize_north, columnSize_north); @@ -242,7 +242,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa columnNameList = list; for (int i = 0; i < levelNum; i++) { refreshBoxItems(levelNameList.get(i), list); - levelNameList.get(i).addItem(Inter.getLocText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } refreshBoxItems(value, list); } @@ -326,7 +326,7 @@ public class MultiPiePlotTableDataContentPane extends AbstractTableDataContentPa for (int i = 0; i < levelNameList.size(); i++){ if(!definition.hasLevelIndex(i) || ComparatorUtils.equals(levelColumnNameList.get(i), StringUtils.EMPTY)) { - levelNameList.get(i).setSelectedItem(Inter.getLocText("Chart-Use_None")); + levelNameList.get(i).setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } else if(definition.hasLevelIndex(i) && !this.boxItemsContainsObject(levelNameList.get(i),levelColumnNameList.get(i))){ levelNameList.get(i).setSelectedItem(null); }else { diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPieConditionSelectionPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPieConditionSelectionPane.java index 92d3c6ad6..822ac03d4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPieConditionSelectionPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPieConditionSelectionPane.java @@ -2,15 +2,15 @@ package com.fr.van.chart.multilayer.other; import com.fr.chart.base.ChartConstants; import com.fr.design.chart.series.SeriesCondition.ChartConditionPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.multilayer.VanChartMultiPieDataPoint; /** * Created by Fangjie on 2016/6/16. */ public class VanChartMultiPieConditionSelectionPane extends ChartConditionPane { - public static final String LEVEL_NAME = Inter.getLocText("Plugin-ChartF_Level_Name"); - public static final String LEVEL_ORDER = Inter.getLocText("Plugin-ChartF_Level_Order"); + public static final String LEVEL_NAME = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Name"); + public static final String LEVEL_ORDER = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Order"); public String[] columns2Populate() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java index adb860419..3c377276c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.multilayer.other; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.style.VanChartStylePane; import com.fr.van.chart.multilayer.style.VanChartMultiPiePlotTooltipPane; @@ -18,7 +18,7 @@ public class VanChartMultiPiePlotTooltipNoCheckPane extends VanChartMultiPiePlot } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(Inter.getLocText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); tooltipPane = createTooltipPane(plot); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java index f3d015ca5..0008114a0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieLevelNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.multilayer.style; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.format.CategoryNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -16,6 +16,6 @@ public class MultiPieLevelNameFormatPaneWithCheckBox extends CategoryNameFormatP @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Level_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java index c70a8aa60..0925836b4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/MultiPieSeriesNameFormatPaneWithCheckBox.java @@ -1,6 +1,6 @@ package com.fr.van.chart.multilayer.style; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.format.SeriesNameFormatPaneWithCheckBox; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -18,6 +18,6 @@ public class MultiPieSeriesNameFormatPaneWithCheckBox extends SeriesNameFormatPa @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java index 07058b6af..59d7e9db4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java @@ -1,7 +1,7 @@ package com.fr.van.chart.multilayer.style; import com.fr.chart.chartattr.Plot; -import com.fr.general.Inter; + import com.fr.van.chart.designer.style.VanChartStylePane; import com.fr.van.chart.designer.style.tooltip.VanChartPlotTooltipPane; @@ -17,6 +17,6 @@ public class VanChartMultiPiePlotTooltipPane extends VanChartPlotTooltipPane { @Override protected String getShowAllSeriesLabelText() { - return Inter.getLocText("Plugin-ChartF_ShowAllLevel"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ShowAllLevel"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java index a0819201f..08347a984 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.pie.VanChartPieSeriesPane; @@ -42,28 +42,28 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane { } protected JPanel createSeriesStylePane(double[] row, double[] col) { - gradualLevel = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Gradual_Light"), - Inter.getLocText("Plugin-ChartF_Gradual_Deep")}); + gradualLevel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Light"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Deep")}); startAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0); endAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0); innerRadius = new UISpinner(0, 100, 1, 0); - supportRotation = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); - supportDrill = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); + supportRotation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + supportDrill = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Gradual_Level") ),gradualLevel}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_StartAngle") ),startAngle}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_EndAngle")),endAngle}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_InnerRadius")),innerRadius}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Drill")),supportDrill}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Rotation")),supportRotation} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Level") ),gradualLevel}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StartAngle") ),startAngle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill")),supportDrill}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation")),supportRotation} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); } protected void populatePieAttr() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java index b2201006c..123ca8aaa 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/RadiusCardLayoutPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.attr.radius.VanChartRadiusPlot; import com.fr.plugin.chart.base.VanChartRadius; import com.fr.plugin.chart.type.RadiusType; @@ -40,7 +40,7 @@ public class RadiusCardLayoutPane extends BasicBeanPane { Map paneList = new HashMap(); - radiusType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Auto"), Inter.getLocText("Plugin-ChartF_Fixed")}); + radiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed")}); radius = new UISpinner(MIN_RADIUS, MAX_RADIUS, 1, 100); radiusContent = new JPanel(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java index 47022c6d2..94652696f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java @@ -4,7 +4,7 @@ package com.fr.van.chart.pie; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.plugin.chart.pie.PieIndependentVanChart; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * 饼图(新特性) 属性表 选择类型 布局界面. */ public class VanChartPiePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); private static final long serialVersionUID = 6163246902689597259L; @@ -28,9 +28,9 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("I-PieStyle_Normal"), - Inter.getLocText("Plugin-ChartF_SameArcPie"), - Inter.getLocText("Plugin-ChartF_DifferentArcPie") + com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SameArcPie"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DifferentArcPie") }; } @@ -39,7 +39,7 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewPie"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java index b8ec056b1..9981f5e4d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.PiePlot4VanChart; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane; @@ -53,21 +53,21 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane { startAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0); endAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0); innerRadius = new UISpinner(0, 100, 1, 0); - supportRotation = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_On"), Inter.getLocText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); + supportRotation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false}); Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_StartAngle")),startAngle}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_EndAngle")),endAngle}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_InnerRadius")),innerRadius}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StartAngle")),startAngle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius}, new Component[]{createRadiusPane(),null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Rotation")),supportRotation} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation")),supportRotation} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); } public void populateBean(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java index 89410133a..5f081a3bb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.radar; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.radar.RadarIndependentVanChart; import com.fr.plugin.chart.radar.VanChartRadarPlot; import com.fr.van.chart.designer.type.AbstractVanChartTypePane; @@ -12,7 +12,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 15/12/28. */ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewRadar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); private static final long serialVersionUID = -4599483879031804911L; @@ -26,8 +26,8 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_Radar"), - Inter.getLocText("Plugin-ChartF_StackColumnTypeRadar") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radar"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackColumnTypeRadar") }; } @@ -36,7 +36,7 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewRadar"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java index 4f088fa52..854be20c8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.radar.VanChartRadarPlot; import com.fr.plugin.chart.type.RadarType; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -63,10 +63,10 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createRadarTypePane() { - radarType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Circle"), Inter.getLocText("Plugin-ChartF_Polygonal")}, + radarType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Circle"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Polygonal")}, new String[]{RadarType.CIRCLE.getType(), RadarType.POLYGON.getType()}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Shape"), radarType); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Chart-Style_Present"), panel); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape"), radarType); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"), panel); } protected VanChartLineTypePane getLineTypePane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java index 3ce50d693..f90139948 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.frpane.UINumberDragPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.ColorSelectBoxWithOutTransparent; -import com.fr.general.Inter; + import com.fr.plugin.chart.range.GradualIntervalConfig; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.axis.component.MinMaxValuePaneWithOutTick; @@ -73,8 +73,8 @@ public class GradualIntervalConfigPane extends JPanel{ protected Component[][] getPaneComponents(){ return new Component[][]{ new Component[]{minMaxValuePane, null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), colorSelectBox}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), numberDragPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), colorSelectBox}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, new Component[]{null, legendGradientBar}, }; } @@ -82,7 +82,7 @@ public class GradualIntervalConfigPane extends JPanel{ protected Component[][] getPaneComponentsWithOutTheme(){ return new Component[][]{ new Component[]{minMaxValuePane, null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), numberDragPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, new Component[]{null, legendGradientBar}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualLegendPane.java index 9336d7ff4..de9222534 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualLegendPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.range.component; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.range.GradualLegend; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -27,7 +27,7 @@ public class GradualLegendPane extends JPanel{ } private void initComponents() { intervalConfigPane = createGradualIntervalConfigPane(); - JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Section_Config"),intervalConfigPane); + JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Section_Config"),intervalConfigPane); labelFormPane = new LegendLabelFormatPane(); double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java index 980c3f82b..e41b11e99 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/LegendLabelFormatPane.java @@ -5,7 +5,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.style.FormatPane; import com.fr.design.layout.TableLayout; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.VanChartHtmlLabelPaneWithOutWidthAndHeight; import com.fr.van.chart.designer.component.format.FormatPaneWithOutFont; @@ -34,8 +34,8 @@ public class LegendLabelFormatPane extends JPanel{ } public LegendLabelFormatPane(){ - labelFormatStyle = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Common"), - Inter.getLocText("Plugin-ChartF_Custom")}); + labelFormatStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); labelFormat = new FormatPaneWithOutFont(); htmlLabelPane = new VanChartHtmlLabelPaneWithOutWidthAndHeight(); htmlLabelPane.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); @@ -51,8 +51,8 @@ public class LegendLabelFormatPane extends JPanel{ } } }; - centerPane.add(labelFormat,Inter.getLocText("Plugin-ChartF_Common")); - centerPane.add(htmlLabelPane, Inter.getLocText("Plugin-ChartF_Custom")); + centerPane.add(labelFormat,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common")); + centerPane.add(htmlLabelPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")); double p = TableLayout.PREFERRED; @@ -62,7 +62,7 @@ public class LegendLabelFormatPane extends JPanel{ double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Label_Format"), SwingConstants.LEFT), labelFormatStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Label_Format"), SwingConstants.LEFT), labelFormatStyle}, new Component[]{centerPane,null}, }; JPanel contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); @@ -74,7 +74,7 @@ public class LegendLabelFormatPane extends JPanel{ }); labelFormatStyle.setSelectedIndex(0); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Use_Format"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } @@ -86,9 +86,9 @@ public class LegendLabelFormatPane extends JPanel{ if(!populate) { checkCustomLabelText(); } - cardLayout.show(centerPane,Inter.getLocText("Plugin-ChartF_Custom")); + cardLayout.show(centerPane,com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")); } else { - cardLayout.show(centerPane, Inter.getLocText("Plugin-ChartF_Common")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Common")); } } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java index 4daab494b..365697fa4 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula; -import com.fr.general.Inter; + import java.awt.Component; @@ -28,9 +28,9 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula { protected Component[][] createComponents(){ return new Component[][]{ new Component[]{null,null}, - new Component[]{new BoldFontTextLabel(Inter.getLocText(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")), getRegionNumPane()}, - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java index eb2f89679..ba131547b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java @@ -3,7 +3,7 @@ package com.fr.van.chart.range.component; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ilable.BoldFontTextLabel; import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula; -import com.fr.general.Inter; + import com.fr.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -48,12 +48,12 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF @Override protected Component[][] createComponents() { - numLabel = new BoldFontTextLabel(Inter.getLocText("FR-Chart-Value_Divided_stage")); + numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")); setRegionVisible(false); return new Component[][]{ - new Component[]{new BoldFontTextLabel(Inter.getLocText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()}, new Component[]{numLabel, getRegionNumPane()}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java index 2af2d6b97..5c958eca3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java @@ -4,7 +4,7 @@ import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.style.series.MapColorPickerPaneWithFormula; -import com.fr.general.Inter; + import com.fr.plugin.chart.range.SectionLegend; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -26,7 +26,7 @@ public class SectionLegendPane extends JPanel{ private void initComponents() { intervalConfigPane = createSectionIntervalConfigPane(this.parent); - JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Section_Config"), intervalConfigPane); + JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Section_Config"), intervalConfigPane); labelFormPane = new LegendLabelFormatPane(){ @Override protected void checkCustomLabelText() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java index 3994e9e27..15879ff14 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterPlotPane.java @@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionCollection; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrLine; import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.scatter.ScatterIndependentVanChart; @@ -17,7 +17,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/2/16. */ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewScatter"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); private static final long serialVersionUID = -3481633368542654247L; @@ -30,7 +30,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("FR-Chart-Type_XYScatter") + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_XYScatter") }; } @@ -39,7 +39,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewScatter"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); } /** diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterSeriesPane.java index f42688735..350a764bb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/VanChartScatterSeriesPane.java @@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.van.chart.custom.component.VanChartCustomAxisConditionPane; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.VanChartLineTypePane; @@ -64,7 +64,7 @@ public class VanChartScatterSeriesPane extends VanChartAbstractPlotSeriesPane{ @Override public String getPaneTitle(){ - return Inter.getLocText("Plugin-ChartF_Custom_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom_Axis"); } }; stackAndAxisEditExpandablePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(stackAndAxisEditPane.getPaneTitle(), stackAndAxisEditPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java index 7dcd135f2..9b92bdd45 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.scatter.component; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartAttrLine; import com.fr.plugin.chart.type.LineStyle; import com.fr.stable.Constants; @@ -20,8 +20,8 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane { @Override protected void createLineStyle() { - String[] textArray = new String[]{Inter.getLocText("Plugin-ChartF_NormalLine"), - Inter.getLocText("Plugin-ChartF_CurveLine")}; + String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NormalLine"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")}; lineStyle = new UIButtonGroup(textArray, new LineStyle[]{LineStyle.NORMAL, LineStyle.CURVE}); } @@ -32,8 +32,8 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane { double[] col = {f, e}; Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_LineStyle")), lineWidth}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Style_Present")), lineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")), lineStyle}, }; return TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java index e84e3b161..b69bd8af1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java @@ -2,7 +2,7 @@ package com.fr.van.chart.scatter.component.tooltip; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltip; import com.fr.van.chart.designer.style.VanChartStylePane; import com.fr.van.chart.scatter.VanChartScatterPlotTooltipPane; @@ -19,7 +19,7 @@ public class VanChartScatterPlotTooltipNoCheckPane extends VanChartScatterPlotTo } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(Inter.getLocText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); tooltipPane = createTooltipPane(plot); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java index 9016a2903..584605745 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/scatter/data/VanChartScatterPlotTableDataContentPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartdata.BubbleTableDefinition; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.van.chart.bubble.data.VanChartBubblePlotTableDataContentPane; import java.awt.Dimension; @@ -19,17 +19,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT protected void initBubbleSize() { bubbleSize = new UIComboBox(); bubbleSize.setPreferredSize(new Dimension(100, 20)); - bubbleSize.addItem(Inter.getLocText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } @Override protected void refreshBoxListWithSelectTableData(java.util.List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); - bubbleSize.addItem(Inter.getLocText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } @Override @@ -38,17 +38,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(Inter.getLocText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); - bubbleSize.addItem(Inter.getLocText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); } @Override protected void populateBubbleSize(BubbleTableDefinition definition) { - if (ComparatorUtils.equals(definition.getBubbleSize(), Inter.getLocText("Chart-Use_None"))){ - bubbleSize.setSelectedItem(Inter.getLocText("Chart-Use_None")); + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"))){ + bubbleSize.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); }else { combineCustomEditValue(bubbleSize, definition.getBubbleSize()); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java index a8fbb7f79..a7d84c3d6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/StructureIndependentVanChartInterface.java @@ -11,7 +11,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartConstants; import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort; import com.fr.van.chart.designer.other.VanChartOtherPane; @@ -62,7 +62,7 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"), Inter.getLocText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java index 5d69d367c..a49e410b6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotReportDataContentPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.structure.data.StructureReportDefinition; import javax.swing.BorderFactory; @@ -40,11 +40,11 @@ public class StructurePlotReportDataContentPane extends AbstractReportDataConten nodeValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeID}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Parent_ID")), parentID}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, - new Component[]{new UILabel(Inter.getLocText("Chart-Series_Value")), nodeValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Parent_ID")), parentID}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value")), nodeValue}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java index e577ac6f4..d31319e22 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.structure.data.StructureTableDefinition; import javax.swing.BorderFactory; @@ -45,12 +45,12 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP calculateCombox = new CalculateComboBox(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeId}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Parent_ID")), parenrId}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, - new Component[]{new UILabel(Inter.getLocText("Chart-Series_Value")), nodeValue}, - new Component[]{new UILabel(Inter.getLocText("Chart-Summary_Method")), calculateCombox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Parent_ID")), parenrId}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value")), nodeValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index c65f72811..a4283f718 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrNode; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.background.VanChartMarkerBackgroundPane; @@ -42,34 +42,34 @@ public class StructureNodeStylePane extends BasicBeanPane { double[] columnSize = {f, e}; double[] rowSize = {p, p, p, p, p}; - nodeRadiusType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"), - Inter.getLocText("Plugin-ChartF_Custom")}); + nodeRadiusType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); nodeRadius = new UISpinner(0,Double.MAX_VALUE,0.5,0); nodeBorderWidth = new UISpinner(0,Double.MAX_VALUE,0.5,0); nodeBorderColor = new VanChartMarkerBackgroundPane(); nodeOpacity = new UINumberDragPane(0,100); JPanel jPanel = new JPanel(new BorderLayout()); - jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Node_Radius"), nodeRadiusType), BorderLayout.NORTH); + jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Radius"), nodeRadiusType), BorderLayout.NORTH); nodeRadiusPane = TableLayout4VanChartHelper.createGapTableLayoutPane("", nodeRadius); jPanel.add(nodeRadiusPane, BorderLayout.CENTER); Component[][] components1 = new Component[][]{ new Component[]{null, null}, new Component[]{jPanel, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Border_Width")), nodeBorderWidth}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), nodeOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Border_Width")), nodeBorderWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), nodeOpacity} }; JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize); - useImage = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_YES"), - Inter.getLocText("Plugin-ChartF_NO")}); + useImage = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")}); imagePane = new ImageBackgroundQuickPane(false); imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0)); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Filled_With_Image")),useImage}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Filled_With_Image")),useImage}, }; JPanel useImagePane = TableLayoutHelper.createTableLayoutPane(components, new double[]{p}, columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java index 308b8ccdc..824c8d63d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.structure.desinger.style; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; import com.fr.van.chart.designer.component.VanChartLabelContentPane; @@ -35,13 +35,13 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java index d9e86433a..10d4deb0b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.style.color.ColorSelectBox; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrNode; import com.fr.plugin.chart.structure.VanChartStructurePlot; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -57,8 +57,8 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane private JPanel createLinkPane() { linkColor = new ColorSelectBox(100); - linkWidthType = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Automatic"), - Inter.getLocText("Plugin-ChartF_Custom")}); + linkWidthType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")}); linkWidth = new UISpinner(0,Double.MAX_VALUE,0.5,0); linkOpacity = new UINumberDragPane(0,100); @@ -76,25 +76,25 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane double[] rowSize = {p,p,p,p}; JPanel jPanel = new JPanel(new BorderLayout()); - jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("FR-Designer-Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); + jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); linkWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(" ", linkWidth); jPanel.add(linkWidthPane, BorderLayout.CENTER); Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Chart-Color_Color")), linkColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, new Component[]{jPanel, null}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Alpha")), linkOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), linkOpacity} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Link"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link"), panel); } private JPanel createNodePane() { nodeStylePane = new StructureNodeStylePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Plugin-ChartF_Node"), nodeStylePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node"), nodeStylePane); } private void checkWidth() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java index 8e4f10d8b..dcfb74ad8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureTooltipContentPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.structure.desinger.style; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.multilayer.style.AttrTooltipMultiLevelNameFormat; import com.fr.van.chart.designer.component.VanChartTooltipContentPane; @@ -35,13 +35,13 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java index 0ca2a1421..6631db4d8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/type/VanChartStructureTypePane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.structure.desinger.type; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.structure.StructureIndependentVanChart; import com.fr.plugin.chart.structure.VanChartStructurePlot; @@ -26,9 +26,9 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_Vertical_Structure"), - Inter.getLocText("Plugin-ChartF_Horizontal_Structure"), - Inter.getLocText("Plugin-ChartF_Radial_Structure") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Vertical_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Horizontal_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radial_Structure") }; } @@ -44,7 +44,7 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewStructure"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewStructure"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java index e74e1f001..abe843eee 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/treemap/VanChartTreeMapPlotPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.treemap; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.treemap.TreeMapIndependentVanChart; import com.fr.plugin.chart.treemap.VanChartTreeMapPlot; import com.fr.van.chart.multilayer.VanChartMultiPiePlotPane; @@ -12,7 +12,7 @@ import com.fr.van.chart.multilayer.VanChartMultiPiePlotPane; * Created by Fangjie on 2016/7/11. */ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewTreeMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); protected String[] getTypeIconPath() { return new String[]{"/com/fr/van/chart/treemap/images/treeMap.png" }; @@ -21,7 +21,7 @@ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_TreeMapChart") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TreeMapChart") }; } @@ -32,7 +32,7 @@ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewTreeMap"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java index 2ffe907b3..c63cf52be 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.treemap.style; import com.fr.chart.chartattr.Plot; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.mainframe.chart.gui.ChartStylePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.treemap.VanChartTreeMapPlot; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.multilayer.style.VanChartMultiPieSeriesPane; @@ -20,10 +20,10 @@ public class VanChartTreeMapSeriesPane extends VanChartMultiPieSeriesPane { } protected JPanel createSeriesStylePane(double[] row, double[] col) { - supportDrill = new UIButtonGroup(new String[]{Inter.getLocText("Plugin-ChartF_Open"), - Inter.getLocText("Plugin-ChartF_Close")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Drill"), supportDrill); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("FR-Designer-Widget_Style"), panel); + supportDrill = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")}); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill"), supportDrill); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); } protected void populatePieAttr() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java index 5b90e7673..a225ecea3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/WordCloudIndependentVanChartInterface.java @@ -12,7 +12,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartConstants; import com.fr.van.chart.designer.other.VanChartInteractivePaneWithOutSort; import com.fr.van.chart.designer.other.VanChartOtherPane; @@ -87,7 +87,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{Inter.getLocText("Plugin-ChartF_XYAxis"),Inter.getLocText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"),com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java index 836ff8459..493c4ca0d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotReportDataContentPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.wordcloud.data.WordCloudReportDefinition; import javax.swing.BorderFactory; @@ -36,9 +36,9 @@ public class WordCloudPlotReportDataContentPane extends AbstractReportDataConten wordValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), name}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Word_Name")), wordName}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Word_Value")), wordValue} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value")), wordValue} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java index 6352f3f53..9d220de44 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/data/WordCloudPlotTableDataContentPane.java @@ -9,7 +9,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.mainframe.chart.gui.data.CalculateComboBox; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; -import com.fr.general.Inter; + import com.fr.plugin.chart.wordcloud.data.WordCloudTableDefinition; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -43,10 +43,10 @@ public class WordCloudPlotTableDataContentPane extends AbstractTableDataContentP Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name")), name}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Word_Name")), wordName}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Word_Value")), wordValue}, - new Component[]{new UILabel(Inter.getLocText("Chart-Summary_Method")), calculateCombox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value")), wordValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Summary_Method")), calculateCombox} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java index e49f1f31b..daaeef047 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudRefreshTootipContentPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.wordcloud.designer.style; -import com.fr.general.Inter; + import com.fr.van.chart.designer.component.format.ChangedPercentFormatPaneWithCheckBox; import com.fr.van.chart.designer.component.format.ChangedValueFormatPaneWithCheckBox; import com.fr.van.chart.designer.style.VanChartStylePane; @@ -23,7 +23,7 @@ public class VanChartWordCloudRefreshTootipContentPane extends VanChartWordCloud changedValueFormatPane = new ChangedValueFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Change_Word_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change_Word_Value"); } }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java index 5ae559f0d..522bcbbfa 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java @@ -15,7 +15,7 @@ import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.plugin.chart.wordcloud.CloudShapeType; import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -35,8 +35,8 @@ import java.awt.event.ItemListener; * Created by Mitisky on 16/11/29. */ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane { - private static final String AUTO_FONT_SIZE = Inter.getLocText("Plugin-ChartF_Auto"); - private static final String CUSTOM_FONT_SIZE = Inter.getLocText("Plugin-ChartF_Define_Size"); + private static final String AUTO_FONT_SIZE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Auto"); + private static final String CUSTOM_FONT_SIZE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Define_Size"); private static final double MAX_ROTATION = 90; private static final double LABEL_SIZE = 65; private UIComboBox fontNameComboBox; @@ -86,7 +86,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane maxRotation = new UISpinner(-MAX_ROTATION,MAX_ROTATION,1,0); Component[][] centerComps = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Rotation_Angle")), minRotation, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation_Angle")), minRotation, new UILabel("-"), maxRotation}, }; JPanel centerPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(centerComps,centerR,centerC); @@ -96,8 +96,8 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); defineFontSize = new UIButtonGroup(new String[]{AUTO_FONT_SIZE, CUSTOM_FONT_SIZE}); Component[][] northComps = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font")), fontNameComboBox}, - new Component[]{new UILabel(Inter.getLocText("Plugin-ChartF_Custom")), defineFontSize } + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")), fontNameComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")), defineFontSize } }; JPanel northPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(northComps,northR,northC); @@ -128,7 +128,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(Inter.getLocText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); } private JPanel createCloudShapePane() { @@ -163,7 +163,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane } }); - return TableLayout4VanChartHelper.createGapTableLayoutPane(Inter.getLocText("Plugin-ChartF_Shape"), panel); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape"), panel); } private void checkImagePane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java index cc84ccfbb..f5213816d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudTooltipContentPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.wordcloud.designer.style; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.AttrTooltipContent; import com.fr.plugin.chart.base.format.AttrTooltipNameFormat; import com.fr.van.chart.designer.component.VanChartTooltipContentPane; @@ -25,19 +25,19 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Word_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return Inter.getLocText("Plugin-ChartF_Word_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value"); } }; percentFormatPane = new PercentFormatPaneWithCheckBox(parent, showOnPane); diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java index 8b1c8955f..bf10c1b74 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/type/VanChartWordCloudTypePane.java @@ -3,7 +3,7 @@ package com.fr.van.chart.wordcloud.designer.type; import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.Plot; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.plugin.chart.base.VanChartTools; import com.fr.plugin.chart.wordcloud.VanChartWordCloudPlot; import com.fr.plugin.chart.wordcloud.WordCloudIndependentVanChart; @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/11/29. */ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { - public static final String TITLE = Inter.getLocText("Plugin-ChartF_NewWordCloud"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); @Override protected String[] getTypeIconPath() { return new String[]{ @@ -24,7 +24,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - Inter.getLocText("Plugin-ChartF_WordCloud") + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WordCloud") }; } @@ -45,7 +45,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return Inter.getLocText("Plugin-ChartF_NewWordCloud"); + return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java index 06ae1cca1..6d288cc5b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java @@ -4,7 +4,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; -import com.fr.general.Inter; + import com.fr.design.mainframe.FormDesigner; import com.fr.design.designer.creator.XWidgetCreator; @@ -17,7 +17,7 @@ public class ChangeNameAction extends FormUndoableAction { public ChangeNameAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("Form-Change_Widget_Name")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name")); this.setMnemonic('G'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java index 5a138fe6c..55ceb7ccf 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java @@ -7,7 +7,7 @@ import com.fr.design.actions.ToggleButtonUpdateAction; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.mainframe.FormDesigner; -import com.fr.general.Inter; + import com.fr.design.utils.gui.GUICoreUtils; //marro : 连接线按钮，目前用不到，但是类先留着。2012-3-26 @@ -16,7 +16,7 @@ public class ConnectionAction extends UpdateAction implements ToggleButtonUpdate public ConnectionAction(FormDesigner fd) { this.fd = fd; - this.setName(Inter.getLocText("Connectionline")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Connectionline")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/toolbarbtn/connector.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java index 96d397042..1becf8be3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java @@ -3,7 +3,7 @@ package com.fr.design.designer.beans.actions; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.actions.behavior.ComponentEnable; import com.fr.design.mainframe.FormDesigner; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.InputEvent; @@ -15,7 +15,7 @@ public class CopyAction extends FormWidgetEditAction { public CopyAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java index b1a5ec428..3951cd9fc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java @@ -7,7 +7,7 @@ import javax.swing.KeyStroke; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.actions.behavior.ComponentEnable; -import com.fr.general.Inter; + import com.fr.design.mainframe.FormDesigner; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -16,7 +16,7 @@ public class CutAction extends FormWidgetEditAction { public CutAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java index 2e9912f1e..8b9bcb83e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java @@ -9,7 +9,7 @@ import javax.swing.*; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.actions.behavior.ComponentEnable; -import com.fr.general.Inter; + import com.fr.design.designer.creator.XCreator; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; @@ -23,7 +23,7 @@ public class FormDeleteAction extends FormWidgetEditAction { public FormDeleteAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("M_Edit-Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Delete")); this.setMnemonic('D'); // Richie:删除菜单图标 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png")); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java index 0b14dc48b..047a18216 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java @@ -7,7 +7,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -25,7 +25,7 @@ public class MoveDownAction extends FormWidgetEditAction { public MoveDownAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("FR-Designer_Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Down")); this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java index 28b1aeb03..1f9141ca6 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java @@ -7,7 +7,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -25,7 +25,7 @@ public class MoveToBottomAction extends FormWidgetEditAction { public MoveToBottomAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("FR-Designer_Move_To_Bottom")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Bottom")); this.setMnemonic('K'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java index 3f4b5ed8d..d3a0c09bf 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java @@ -7,7 +7,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -25,7 +25,7 @@ public class MoveToTopAction extends FormWidgetEditAction { public MoveToTopAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("FR-Designer_Move_To_Top")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Top")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java index 41d91981d..0821f2324 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java @@ -7,7 +7,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -24,7 +24,7 @@ public class MoveUpAction extends FormWidgetEditAction { public MoveUpAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("FR-Designer_Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Up")); this.setMnemonic('F'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java index 6fc5458fe..46b2a92fb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java @@ -6,7 +6,7 @@ import java.awt.event.KeyEvent; import javax.swing.KeyStroke; import com.fr.base.BaseUtils; -import com.fr.general.Inter; + import com.fr.design.mainframe.FormDesigner; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -15,7 +15,7 @@ public class PasteAction extends FormWidgetEditAction { public PasteAction(FormDesigner t) { super(t); - this.setName(Inter.getLocText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); this.setMnemonic('P'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java index 4b17ffaed..123130fc4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java @@ -5,7 +5,7 @@ import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; import com.fr.design.form.layout.FRBorderLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import javax.swing.JOptionPane; import java.awt.BorderLayout; @@ -47,13 +47,13 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter { if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) { int containerHeight = container.getHeight(); if (rectangle.height > containerHeight) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); return true; } } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) { int containerWidth = container.getWidth(); if (rectangle.width > containerWidth) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); return true; } } diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java b/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java index fca5197ae..ab2e4ded9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java @@ -11,7 +11,7 @@ import com.fr.design.designer.beans.HoverPainter; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + public abstract class AbstractPainter implements HoverPainter { @@ -82,7 +82,7 @@ public abstract class AbstractPainter implements HoverPainter { g2d.setStroke(XCreatorConstants.STROKE); g2d.setColor(bColor); if (!accept) { - g2d.drawString(Inter.getLocText("Cannot-Add_To_This_Area") + "!", x + width / 3, y + height / 2); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Cannot-Add_To_This_Area") + "!", x + width / 3, y + height / 2); } else if (drawBackground) { g2d.fillRect(x, y, width, height); } else { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java index 2b5a17dc5..ad33aefd5 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java @@ -18,7 +18,7 @@ import com.fr.form.parameter.FormSubmitButton; import com.fr.form.ui.Button; import com.fr.form.ui.FreeButton; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -90,27 +90,27 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( - Inter.getLocText(new String[] {"Form-Button", "Name"})).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Form-Button", "Style"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Initial")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Over")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Click")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_FRFont")) + new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont")) .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_Icon")) + new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("hotkeys", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_Button-Hotkeys")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setEditorClass(ShortCutTextEditor.class) @@ -162,7 +162,7 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("text", this.data.getClass()) - .setI18NName(Inter.getLocText(new String[] {"Form-Button", "Name"})) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -172,7 +172,7 @@ public class XButton extends XWidgetCreator { } }), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Form-Button", "Style"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -181,11 +181,11 @@ public class XButton extends XWidgetCreator { checkButonType(); } }), - new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_Icon")) + new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Button-Hotkeys")) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setEditorClass(ShortCutTextEditor.class) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index bb730122a..86777b91f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -16,6 +16,7 @@ import com.fr.design.designer.properties.mobile.ElementCasePropertyUI; import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.gui.chart.BaseChartPropertyPane; import com.fr.design.gui.chart.MiddleChartComponent; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.*; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.module.DesignModuleFactory; @@ -23,7 +24,7 @@ import com.fr.design.designer.beans.events.DesignerEditor; import com.fr.form.ui.BaseChartEditor; import com.fr.form.ui.Widget; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.stable.GraphDrawHelper; import com.fr.stable.core.PropertyChangeAdapter; @@ -97,10 +98,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -108,7 +108,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - Inter.getLocText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java index a16416c33..b81e03bde 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java @@ -15,7 +15,7 @@ import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.CheckBox; import com.fr.form.ui.WidgetValue; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -31,7 +31,7 @@ public class XCheckBox extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(Inter.getLocText("Text")) + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -41,7 +41,7 @@ public class XCheckBox extends XWidgetCreator { } }), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -54,7 +54,7 @@ public class XCheckBox extends XWidgetCreator { } }), new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"})) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index a14c9330a..8e9240068 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -18,7 +18,7 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.CheckBoxGroup; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; @@ -36,10 +36,10 @@ public class XCheckBoxGroup extends XFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - Inter.getLocText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; @@ -47,26 +47,26 @@ public class XCheckBoxGroup extends XFieldEditor { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive")) + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class), new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Provide", "Choose_All"})).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Choose_Type_All")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; if (((CheckBoxGroup) this.toData()).isReturnString()) { crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - Inter.getLocText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - Inter.getLocText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); + com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } if (!((CheckBoxGroup) this.toData()).isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(Inter.getLocText("Button-Group-Display-Columns")).putKeyValue( + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); } return crp; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java index 64d379c5a..f89894128 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java @@ -17,7 +17,7 @@ import com.fr.design.mainframe.widget.editors.DictionaryEditor; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.ComboBox; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -40,8 +40,8 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) + new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }, super.supportedDescriptor()); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java index 84869a2c0..6ec877ad9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java @@ -6,7 +6,7 @@ package com.fr.design.designer.creator; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; import com.fr.form.ui.ComboCheckBox; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import java.awt.*; @@ -26,25 +26,25 @@ public class XComboCheckBox extends XComboBox { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), !((ComboCheckBox) this.toData()) .isReturnString() ? new CRPropertyDescriptor[] { new CRPropertyDescriptor("supportTag", this.data.getClass()).setI18NName( - Inter.getLocText("Form-SupportTag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass( - InChangeBooleanEditor.class).setI18NName(Inter.getLocText("Return-String")) + InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Return-String")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - Inter.getLocText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - Inter.getLocText("Return-String")).setEditorClass(InChangeBooleanEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - Inter.getLocText("ComboCheckBox-Start_Symbol")) + com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - Inter.getLocText("ComboCheckBox-End_Symbol")) + com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java index 141ceba08..b8a707f7c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java @@ -1 +1 @@ -package com.fr.design.designer.creator; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; import java.awt.*; import java.beans.IntrospectionException; /** * Author : Shockway * Date: 13-9-22 * Time: 上午10:40 */ public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor { public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) { super(widget, initSize); } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData", this.data.getClass()).setI18NName(Inter.getLocText("Form-Allow_CustomData")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")}); } } \ No newline at end of file +package com.fr.design.designer.creator; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.stable.ArrayUtils; import java.awt.*; import java.beans.IntrospectionException; /** * Author : Shockway * Date: 13-9-22 * Time: 上午10:40 */ public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor { public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) { super(widget, initSize); } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")}); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java index 3546c9342..9e6b022ba 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java @@ -13,7 +13,7 @@ import com.fr.design.designer.beans.events.DesignerEditor; import com.fr.form.data.DataTableConfig; import com.fr.form.ui.DataTable; import com.fr.form.ui.WidgetValue; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.design.utils.gui.LayoutUtils; @@ -34,7 +34,7 @@ public class XDataTable extends XWidgetCreator{ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java index 769a6adb1..35010962e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java @@ -21,7 +21,7 @@ import com.fr.design.mainframe.widget.renderer.DateCellRenderer; import com.fr.form.ui.DateEditor; import com.fr.form.ui.WidgetValue; import com.fr.general.DateUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -50,7 +50,7 @@ public class XDateEditor extends XDirectWriteEditor { CRPropertyDescriptor[] tempt = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setPropertyChangeListener(new PropertyChangeAdapter() { @@ -62,19 +62,19 @@ public class XDateEditor extends XDirectWriteEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt, new CRPropertyDescriptor[]{ new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass( DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java index e1690e506..316b38779 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java @@ -8,7 +8,7 @@ import java.beans.IntrospectionException; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.DirectWriteEditor; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -25,7 +25,7 @@ public abstract class XDirectWriteEditor extends XFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass()) - .setI18NName(Inter.getLocText("Form-Allow_Edit")).putKeyValue( + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java index 05f301159..029cb1b74 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java @@ -18,7 +18,7 @@ import com.fr.form.FormElementCaseProvider; import com.fr.form.FormProvider; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditorProvider; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.CoreGraphHelper; import com.fr.stable.core.PropertyChangeAdapter; @@ -79,9 +79,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()) - .setI18NName(Inter.getLocText("Form-Widget_Name")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -90,7 +90,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - Inter.getLocText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -99,10 +99,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(Inter.getLocText("FR-Layout_Padding")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Layout_Padding")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class) - .setI18NName(Inter.getLocText("Form-EC_toolbar")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_toolbar")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor(); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java index 3041d95fb..fb16892b8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java @@ -15,7 +15,7 @@ import com.fr.form.ui.FieldEditor; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.TextEditor; import com.fr.form.ui.reg.RegExp; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -40,13 +40,13 @@ public abstract class XFieldEditor extends XWidgetCreator { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Allow-Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow-Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Verify-Message")) + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(Inter.getLocText("FR-Designer_Font-Size")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); return !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java index 6966c8371..75769d653 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java @@ -14,7 +14,7 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.FileEditor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -33,7 +33,7 @@ public class XFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("allowTypes", this.data.getClass()) - .setI18NName(Inter.getLocText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java index 61ad25def..06c56f70d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java @@ -18,7 +18,7 @@ import com.fr.design.mainframe.widget.editors.ParameterEditor; import com.fr.design.mainframe.widget.renderer.ParameterRenderer; import com.fr.form.ui.IframeEditor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; @@ -35,7 +35,7 @@ public class XIframeEditor extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(Inter.getLocText("Form-Url")) + new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Url")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -44,13 +44,13 @@ public class XIframeEditor extends XWidgetCreator { } }), new CRPropertyDescriptor("overflowx", this.data.getClass()).setI18NName( - Inter.getLocText("Preference-Horizontal_Scroll_Bar_Visible")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Preference-Horizontal_Scroll_Bar_Visible")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("overflowy", this.data.getClass()).setI18NName( - Inter.getLocText("Preference-Vertical_Scroll_Bar_Visible")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Preference-Vertical_Scroll_Bar_Visible")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("parameters", this.data.getClass()) - .setI18NName(Inter.getLocText("Parameters")).setEditorClass(ParameterEditor.class) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Parameters")).setEditorClass(ParameterEditor.class) .setRendererClass(ParameterRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java index 80dcca3b1..a59c6a304 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java @@ -16,7 +16,7 @@ import com.fr.design.mainframe.widget.renderer.FontCellRenderer; import com.fr.design.mainframe.widget.renderer.LabelHorizontalAlignmentRenderer; import com.fr.form.ui.Label; import com.fr.form.ui.container.WParameterLayout; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; import com.fr.stable.core.PropertyChangeAdapter; @@ -58,7 +58,7 @@ public class XLabel extends XWidgetCreator { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -69,16 +69,16 @@ public class XLabel extends XWidgetCreator { } }), new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_PageSetup-Vertically")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-Vertically")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Alignment-Style")).setEditorClass(ItemCellEditor.class) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")).setEditorClass(ItemCellEditor.class) .setRendererClass(LabelHorizontalAlignmentRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_Font")) + new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")) .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java index 4f0476388..89f04c13e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java @@ -7,6 +7,7 @@ import com.fr.base.FRContext; import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.form.layout.FRLayoutManager; import com.fr.design.form.util.XCreatorConstants; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.widget.editors.PaddingMarginEditor; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; @@ -14,7 +15,6 @@ import com.fr.design.parameter.ParameterBridge; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WLayout; import com.fr.general.Background; -import com.fr.general.Inter; import com.fr.stable.ArrayUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -63,11 +63,10 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -76,7 +75,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }; } @@ -88,8 +87,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme * @throws IntrospectionException */ public CRPropertyDescriptor createWidgetNameDescriptor() throws IntrospectionException { - return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("FR-Designer_Form-Widget_Name")); + return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")); } /** @@ -100,7 +98,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException { return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_Layout-Padding")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java index 01ed9d486..549229224 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java @@ -16,7 +16,7 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.ListEditor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -34,13 +34,13 @@ public class XListEditor extends XFieldEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( WidgetValueEditor.class), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - Inter.getLocText("DS-Dictionary")).setEditorClass(DictionaryEditor.class) + com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class) .setRendererClass(DictionaryRenderer.class), new CRPropertyDescriptor("needHead", this.data.getClass()).setI18NName( - Inter.getLocText("List-Need_Head")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("List-Need_Head")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java index d370f43f1..f4cf8715c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java @@ -12,7 +12,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.MultiFileEditor; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import javax.swing.JComponent; @@ -37,13 +37,13 @@ public class XMultiFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("singleFile", this.data.getClass()) - .setI18NName(Inter.getLocText("SINGLE_FILE_UPLOAD")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("accept", this.data.getClass()) - .setI18NName(Inter.getLocText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("maxSize", this.data.getClass()) - .setI18NName(Inter.getLocText("File-File_Size_Limit")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java index 57911a64c..70b4955a7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java @@ -3,11 +3,14 @@ package com.fr.design.designer.creator; import com.fr.base.BaseUtils; import com.fr.base.ScreenResolution; import com.fr.base.Style; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.editors.NameWidgetComboboxEditor; -import com.fr.form.ui.*; +import com.fr.form.ui.NameWidget; +import com.fr.form.ui.Widget; +import com.fr.form.ui.WidgetConfig; +import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.FRFont; -import com.fr.general.Inter; import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; @@ -33,7 +36,7 @@ public class XNameWidget extends XWidgetCreator { super.paintComponent(g); if (editor == null) { Graphics2D g2d = (Graphics2D) g.create(); - BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), Inter.getLocText("FR-Engine_NameWidget-Invalid"), Style.getInstance() + BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_NameWidget-Invalid"), Style.getInstance() .deriveHorizontalAlignment(SwingConstants.CENTER).deriveVerticalAlignment(SwingConstants.CENTER) .deriveFRFont(FRFont.getInstance().applyForeground(Color.RED)), ScreenResolution .getScreenResolution()); @@ -43,14 +46,12 @@ public class XNameWidget extends XWidgetCreator { /** * 返回控件支持的属性表 * @return 属性表 - * @throws 内省异常 */ @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("Form-Widget_Name")), - new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(Inter.getLocText("FR-Engine_NameWidget-Name")).setEditorClass( + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), + new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_NameWidget-Name")).setEditorClass( NameWidgetComboboxEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 3340f4bf6..6bbcf1503 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -20,7 +20,7 @@ import com.fr.design.mainframe.widget.editors.SpinnerMinNumberEditor; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.NumberEditor; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; @@ -44,38 +44,38 @@ public class XNumberEditor extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup =(CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()) - .setI18NName(Inter.getLocText(new String[]{"Widget", "Value"})) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")) .setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")} ,super.supportedDescriptor()); CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass()) .setEditorClass(InChangeBooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_Allow_Decimals")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass()) - .setI18NName(Inter.getLocText(new String[]{"Double", "Numbers"})) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ? new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal}); return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[] { new CRPropertyDescriptor("allowNegative", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_Allow_Negative")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Negative")) .setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("minValue", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_Min_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value")) .setEditorClass(SpinnerMinNumberEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("maxValue", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_Max_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value")) .setEditorClass(SpinnerMaxNumberEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("waterMark", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_WaterMark")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) - .setI18NName(Inter.getLocText("Verify-Message")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Verify-Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java index c72808d5c..d106c13bb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java @@ -14,7 +14,7 @@ import com.fr.design.mainframe.widget.editors.RegexEditor; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.RegexCellRencerer; import com.fr.form.ui.Password; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -51,18 +51,18 @@ public class XPassword extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")} , super.supportedDescriptor()); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_Input_Rule")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")) .setEditorClass(RegexEditor.RegexEditor4TextArea.class) .putKeyValue("renderer", RegexCellRencerer.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()) - .setI18NName(Inter.getLocText("FR-Designer_WaterMark")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java index 56dbd3c0b..4c78c527b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java @@ -11,7 +11,7 @@ import javax.swing.JRadioButton; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.Radio; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -32,9 +32,9 @@ public class XRadio extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(Inter.getLocText("Text")), + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class)}); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java index 487e0c730..8720f2811 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java @@ -19,7 +19,7 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.RadioGroup; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -41,10 +41,10 @@ public class XRadioGroup extends XFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - Inter.getLocText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; @@ -52,11 +52,11 @@ public class XRadioGroup extends XFieldEditor { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(Inter.getLocText("Adaptive")) + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; if (!toData().isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(Inter.getLocText("Button-Group-Display-Columns")).putKeyValue( + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); } return crp; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java index bd5feab0d..3b5f765b7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java @@ -34,7 +34,7 @@ public class XTableEditor extends XWidgetCreator { // .setRendererClass(GridWidgetRenderer.class), // new CRPropertyDescriptor("dataURL", this.data.getClass()), // new CRPropertyDescriptor("databinding", this.data.getClass()) -// .setI18NName(Inter.getLocText("DataBinding")) +// .setI18NName(com.fr.design.i18n.Toolkit.i18nText("DataBinding")) // .setEditorClass(DataBindingEditor.class) // .setRendererClass(DataBindingCellRenderer.class) // .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java index 3d6849a27..da906dc97 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java @@ -10,7 +10,7 @@ import javax.swing.JList; import com.fr.design.mainframe.widget.editors.DictionaryEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.TableTree; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; public class XTableTree extends XWidgetCreator { @@ -25,7 +25,7 @@ public class XTableTree extends XWidgetCreator { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("dictionary", this.data.getClass()) - .setI18NName(Inter.getLocText("DS-Dictionary")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")) .setEditorClass(DictionaryEditor.class) .setRendererClass(DictionaryRenderer.class), new CRPropertyDescriptor("dataUrl", this.data.getClass()), diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index 0a1005647..cb21759e2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java @@ -20,7 +20,7 @@ import com.fr.design.mainframe.widget.renderer.RegexCellRencerer; import com.fr.form.ui.TextArea; import com.fr.design.form.util.XCreatorConstants; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; @@ -39,15 +39,15 @@ public class XTextArea extends XFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor()); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java index a123e9e24..85ae88f29 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java @@ -19,7 +19,7 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.RegexCellRencerer; import com.fr.form.ui.TextEditor; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; @@ -42,15 +42,15 @@ public class XTextEditor extends XWrapperedFieldEditor { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor()); boolean displayRegField = true; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java index 2023215ee..1cd334a7c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java @@ -14,7 +14,7 @@ import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.TreeComboBoxEditor; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -46,19 +46,19 @@ public class XTreeComboBoxEditor extends XTreeEditor { protected CRPropertyDescriptor[] addWaterMark(CRPropertyDescriptor[] crp) throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_WaterMark")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); } protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{ return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass()) - .setI18NName(Inter.getLocText("Form-Allow_Edit")).putKeyValue( + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); } protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{ return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass()) - .setI18NName(Inter.getLocText("Form-Allow_CustomData")).putKeyValue( + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData")).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java index 683843cae..4e532822d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java @@ -18,7 +18,7 @@ import com.fr.design.mainframe.widget.renderer.TreeModelRenderer; import com.fr.form.ui.FieldEditor; import com.fr.form.ui.TreeEditor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -41,49 +41,49 @@ public class XTreeEditor extends XWidgetCreator { CRPropertyDescriptor[] crp = !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Verify-Message")) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Verify-Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), } : new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - Inter.getLocText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),}; crp = this.addWaterMark(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(Inter.getLocText(new String[]{"FR-Designer_Font", "FRFont-Size"})) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName( - Inter.getLocText("Tree-Mutiple_Selection_Or_Not")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName( - Inter.getLocText("Widget-Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = this.addAllowEdit(crp); crp = this.addCustomData(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("selectLeafOnly", this.data - .getClass()).setI18NName(Inter.getLocText("Tree-Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("returnFullPath", this.data - .getClass()).setI18NName(Inter.getLocText("Tree-Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), crp); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java index 473e8a2b3..fe67fef17 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java @@ -5,9 +5,10 @@ import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter; import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.fun.WidgetPropertyUIProvider; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.form.ui.container.WAbsoluteBodyLayout; -import com.fr.general.Inter; + import com.fr.stable.core.PropertyChangeAdapter; import java.awt.Component; @@ -70,11 +71,10 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java index b66add8e6..4b20fe5b9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -29,7 +29,7 @@ import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; import com.fr.form.ui.container.WLayout; import com.fr.general.FRScreen; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.share.ShareConstants; import com.fr.stable.Constants; @@ -446,7 +446,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Form-Widget_Name")) + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Widget_Name")) }; } @@ -486,7 +486,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { g2d.setColor(Color.WHITE); //画编辑文字 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); g.setColor(XCreatorConstants.FORM_BORDER_COLOR); GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM); paintExtro(g); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java index 30aed94f2..9aa0598b4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java @@ -13,10 +13,11 @@ import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.designer.beans.adapters.layout.FRBorderLayoutAdapter; import com.fr.design.designer.beans.location.Direction; import com.fr.design.form.layout.FRBorderLayout; +import com.fr.design.i18n.Toolkit; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBorderLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + /** * @author richer @@ -72,8 +73,7 @@ public class XWBorderLayout extends XLayoutContainer { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("Form-Widget_Name")) + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")) }; } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java index a5d4537ef..d2d8daad8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWFitLayout.java @@ -25,7 +25,7 @@ import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.FRScreen; import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import javax.swing.JOptionPane; @@ -986,7 +986,7 @@ public class XWFitLayout extends XLayoutContainer { Rectangle bound = dealBound(rec, d, val, 0); if (bound.width < minWidth || bound.height< minHeight) { String widgetName = comp.toData().getWidgetName(); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Engine_Invalid_Setting_Cause_Reach_Min_Widget_Size", widgetName)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Invalid_Setting_Cause_Reach_Min_Widget_Size", widgetName)); return false; } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java index bd92dfe71..1e4da367b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java @@ -9,6 +9,7 @@ import com.fr.design.designer.beans.adapters.layout.FRParameterLayoutAdapter; import com.fr.design.designer.properties.mobile.ParaMobilePropertyUI; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.fun.WidgetPropertyUIProvider; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.widget.editors.BackgroundEditor; import com.fr.design.mainframe.widget.editors.BooleanEditor; import com.fr.design.mainframe.widget.editors.WidgetDisplayPosition; @@ -18,7 +19,7 @@ import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.design.fun.ParameterWindowEditorProcessor; import com.fr.stable.ArrayUtils; @@ -58,19 +59,18 @@ public class XWParameterLayout extends XWAbsoluteLayout { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class) - .setRendererClass(BackgroundRenderer.class).setI18NName(Inter.getLocText("Background")) + .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Background")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class) - .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(Inter.getLocText("FR-Designer_WidgetDisplyPosition")) + .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("useParamsTemplate", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_Use_Params_Template")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_Params_Template")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java index c1d9d950a..99ae2f721 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java @@ -6,9 +6,10 @@ package com.fr.design.designer.creator; import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.design.form.util.XCreatorConstants; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.FormDesigner; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; @@ -37,9 +38,8 @@ public abstract class XWidgetCreator extends XCreator { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("Form-Widget_Name")), - new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(Inter.getLocText("FR-Designer_Enabled")) + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), + new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Enabled")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -48,7 +48,7 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - Inter.getLocText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -56,7 +56,7 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("labelName", this.data.getClass(), "getLabelName", "setLabelName") - .setI18NName(Inter.getLocText("FR-Designer_Label_Name")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; @@ -172,7 +172,7 @@ public abstract class XWidgetCreator extends XCreator { */ public void ChangeCreatorName(FormDesigner designer, XCreator creator) { String oldName = creator.toData().getWidgetName(); - String value = JOptionPane.showInputDialog(designer, Inter.getLocText("Form-Change_Widget_Name_Discription"), oldName); + String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name_Discription"), oldName); if (value != null) { designer.renameCreator(creator, value); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java index 7e3dcdb07..cd5c40c3b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java @@ -8,7 +8,7 @@ import java.beans.IntrospectionException; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -26,8 +26,8 @@ public abstract class XWriteAbleRepeatEditor extends XDirectWriteEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll( super.supportedDescriptor(), new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(Inter.getLocText("Form-Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java index e8c7c04b0..db2a96f9b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java @@ -4,7 +4,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.IOUtils; -import com.fr.general.Inter; + /** * Created by zhouping on 2017/2/9. @@ -13,7 +13,7 @@ public class TabMoveEndAction extends TabMoveAction { public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(Inter.getLocText("FR-Designer-Move_Tab_End")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_End")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java index a2483c01e..f19326722 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java @@ -4,7 +4,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.IOUtils; -import com.fr.general.Inter; + /** * Created by zhouping on 2017/2/9. @@ -13,7 +13,7 @@ public class TabMoveFirstAction extends TabMoveAction { public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(Inter.getLocText("FR-Designer-Move_Tab_First")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_First")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java index f3e34208c..67f378455 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java @@ -4,7 +4,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.IOUtils; -import com.fr.general.Inter; + /** * Created by zhouping on 2017/2/9. @@ -13,7 +13,7 @@ public class TabMoveNextAction extends TabMoveAction { public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(Inter.getLocText("FR-Designer-Move_Tab_Next")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Next")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java index 94f501c57..1ddcb9b2c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java @@ -4,7 +4,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.IOUtils; -import com.fr.general.Inter; + /** * Created by zhouping on 2017/2/9. @@ -13,7 +13,7 @@ public class TabMovePrevAction extends TabMoveAction { public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(Inter.getLocText("FR-Designer-Move_Tab_Prev")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Prev")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java index 1c8828bb0..b3277945d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java @@ -15,7 +15,7 @@ import com.fr.form.ui.CardAddButton; import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.general.cardtag.DefaultTemplateStyle; import javax.swing.Icon; @@ -180,7 +180,7 @@ public class XCardAddButton extends XButton { //新增时去tabFitLayout名字中最大的Index+1，防止重名 private String getTabTitleName(WCardTagLayout layout){ int size = layout.getWidgetCount(); - String prefix = Inter.getLocText("FR-Designer_Title"); + String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title"); String newTextName = prefix + size; for (int i = 0; i < size; i++) { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java index feaa9e055..29f96dea6 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java @@ -30,7 +30,7 @@ import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.Background; import com.fr.general.ComparatorUtils; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.general.cardtag.TemplateStyle; import com.fr.stable.unit.PT; @@ -220,8 +220,8 @@ public class XCardSwitchButton extends XButton { //删除card，同时修改其他switchbutton和tabfit的index private void deleteCard(XCardSwitchButton button, int index){ String titleName = button.getContentLabel().getText(); - int value = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", - Inter.getLocText("FR-Designer_ConfirmDialog_Title"), JOptionPane.YES_NO_OPTION); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Title"), JOptionPane.YES_NO_OPTION); if (value != JOptionPane.OK_OPTION) { return; } @@ -362,8 +362,8 @@ public class XCardSwitchButton extends XButton { //删除tab布局 private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){ String titleName = this.getContentLabel().getText(); - int value = JOptionPane.showConfirmDialog(null, Inter.getLocText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", - Inter.getLocText("FR-Designer_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); if (value != JOptionPane.OK_OPTION) { return; } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java index adc203129..207c93691 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java @@ -15,6 +15,7 @@ import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWidgetCreator; import com.fr.design.form.layout.FRCardLayout; import com.fr.design.form.util.XCreatorConstants; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.editors.BooleanEditor; @@ -33,7 +34,6 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.general.cardtag.DefaultTemplateStyle; import com.fr.general.cardtag.TemplateStyle; import com.fr.stable.ArrayUtils; @@ -41,10 +41,7 @@ import com.fr.stable.Constants; import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.border.Border; -import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; +import java.awt.*; import java.awt.event.ContainerEvent; import java.beans.IntrospectionException; import java.util.List; @@ -54,19 +51,19 @@ import java.util.List; * @since 6.5.3 */ public class XWCardLayout extends XLayoutContainer { - - private CardLayout cardLayout; - private boolean initFlag = true; - private static final int NORTH = 0; - private FormDesigner designer; - private static final int LAYOUT_INDEX = 0; + private CardLayout cardLayout; + private boolean initFlag = true; + private static final int NORTH = 0; + private FormDesigner designer; - public static final String DEFAULT_NAME = "cardlayout"; + private static final int LAYOUT_INDEX = 0; + public static final String DEFAULT_NAME = "cardlayout"; - //默认蓝色标题背景 - private static final Color TITLE_COLOR = new Color(51, 132, 240); + + //默认蓝色标题背景 + private static final Color TITLE_COLOR = new Color(51, 132, 240); public XWCardLayout(WCardLayout widget, Dimension initSize) { super(widget, initSize); @@ -76,215 +73,194 @@ public class XWCardLayout extends XLayoutContainer { protected String getIconName() { return "card_layout_16.png"; } - + /** - * 获取默认名字 - * - * @return 默认名 - * - * - * @date 2014-11-25-下午6:22:40 - * - */ - @Override - public String createDefaultName() { - return DEFAULT_NAME; + * 获取默认名字 + * + * @return 默认名 + * @date 2014-11-25-下午6:22:40 + */ + @Override + public String createDefaultName() { + return DEFAULT_NAME; } /** - * 获取当前封装的布局对象 - * - * @return 布局 - * - * - * @date 2014-11-25-下午6:22:17 - * - */ + * 获取当前封装的布局对象 + * + * @return 布局 + * @date 2014-11-25-下午6:22:17 + */ @Override - public WCardLayout toData() { + public WCardLayout toData() { return (WCardLayout) data; } - /** - * 初始化时默认的组件大小 - * @return 默认Dimension - */ - @Override - public Dimension initEditorSize() { - return new Dimension(500, 300); - } + /** + * 初始化时默认的组件大小 + * + * @return 默认Dimension + */ + @Override + public Dimension initEditorSize() { + return new Dimension(500, 300); + } @Override - protected void initLayoutManager() { - cardLayout = new FRCardLayout(toData().getHgap(), toData().getVgap()); + protected void initLayoutManager() { + cardLayout = new FRCardLayout(toData().getHgap(), toData().getVgap()); this.setLayout(cardLayout); } /** - * 将WLayout转换为XLayoutContainer - * - * - * @date 2014-11-25-下午6:21:48 - * - */ - - @Override - protected void addWidgetToSwingComponent(WLayout layout) { - for (int i = 0; i < layout.getWidgetCount(); i++) { - Widget w = layout.getWidget(i); - XWidgetCreator creator = (XWidgetCreator) XCreatorUtils.createXCreator(layout.getWidget(i)); - this.add(creator, w.getWidgetName(), i); - creator.setBackupParent(this); - } - } - - /** - * 展示当前选中的card - * - * - * @date 2014-11-25-下午6:21:23 - * - */ - public void showCard() { - WCardLayout layout = this.toData(); - if (layout.getWidgetCount() > 0) { - cardLayout.show(this, layout.getShowIndex2Name()); - } - } - - /** - * 获取当前XCreator的一个封装父容器 - * - * @param widgetName 当前组件名 - * - * @return 封装的父容器 - * - * - * @date 2014-11-25-下午4:47:23 - * - */ - @Override - protected XLayoutContainer getCreatorWrapper(String widgetName) { - initStyle(); - Dimension dimension = new Dimension(); - //主结构是一个borderlayout, 标签部分是north, card部分为center - WCardMainBorderLayout border = new WCardMainBorderLayout(); - XWCardMainBorderLayout xMainBorder = new XWCardMainBorderLayout(border, dimension); - //将子WCardBorder的style设置到父容器上 - LayoutBorderStyle style = (this.toData()).getBorderStyle(); - border.setBorderStyle(style); - this.setBackupParent(xMainBorder); - XWCardTitleLayout titlePart = this.initTitlePart(widgetName, xMainBorder); - xMainBorder.addTitlePart(titlePart, WBorderLayout.NORTH); - - return xMainBorder; - } - - //标题栏 - private XWCardTitleLayout initTitlePart(String widgetName, XWCardMainBorderLayout xMainBorder){ - Dimension dimension = new Dimension(); - //标题部分本身也是一个borderlayout布局, tag部分放center, 添加按钮放east - WCardTitleLayout titleLayout = new WCardTitleLayout(this.toData().getWidgetName()); - XWCardTitleLayout xTitle = new XWCardTitleLayout(titleLayout,dimension); - xTitle.setBackupParent(xMainBorder); - - //切换card的按钮部分 - XWCardTagLayout tagPart = initTagPart(widgetName, xTitle); - //添加按钮 - XCardAddButton addBtn = initAddButton(widgetName, xTitle, tagPart); - - //添加顺序很重要，先addBtn再tagPart，后面用到 - xTitle.addNewButton(addBtn); - xTitle.addTagPart(tagPart); - - return xTitle; - } - - //添加tab按钮 - private XCardAddButton initAddButton(String widgetName, XWCardTitleLayout xTitle, XWCardTagLayout tagPart){ - Dimension dimension = new Dimension(); - CardAddButton addButton = new CardAddButton(widgetName); - XCardAddButton xAddBtn = new XCardAddButton(addButton, dimension, tagPart, this); - xAddBtn.setBackupParent(xTitle); - - return xAddBtn; - } - - //所有的tab所在的区域 - private XWCardTagLayout initTagPart(String widgetName, XWCardTitleLayout xTitle){ - Dimension dimension = new Dimension(); - //放置标题的tab流式布局 - WCardTagLayout tagLayout = new WCardTagLayout("tabpane" + widgetName.replaceAll(createDefaultName(), "")); - tagLayout.setNewTab(true); - XWCardTagLayout xTag = new XWCardTagLayout(tagLayout, dimension, this); - xTag.setBackupParent(xTitle); - - XCardSwitchButton xFirstBtn = initFirstButton(widgetName, xTag); - xTag.add(xFirstBtn); - - return xTag; - } - - //第一个tab - private XCardSwitchButton initFirstButton(String widgetName, XWCardTagLayout xTag){ - CardSwitchButton firstBtn = new CardSwitchButton(widgetName); - firstBtn.setText(Inter.getLocText("FR-Designer_Title") + 0); - xTag.setCurrentCard(firstBtn); - XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag); - xFirstBtn.setBackupParent(xTag); - return xFirstBtn; - } - - /** - * 控件树不显示此组件 - * @param path 控件树list - */ - @Override - public void notShowInComponentTree(List path) { - path.remove(LAYOUT_INDEX); - } - - - /** - * 设置父容器的名字 - * - * @param parentPanel 当前父容器 - * @param widgetName 当前控件名 - * - * - * @date 2014-11-27-上午9:47:00 - * - */ - @Override - protected void setWrapperName(XLayoutContainer parentPanel, String widgetName) { - parentPanel.toData().setWidgetName("tablayout" + widgetName.replaceAll(createDefaultName(),"")); - } - - /** - * 将当前对象添加到父容器中 - * - * @param parentPanel 父容器组件 - * - * - * @date 2014-11-25-下午4:57:55 - * - */ - @Override - protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight){ - parentPanel.add(this, WBorderLayout.CENTER); - } - - /** - * 添加组件的监听事件 - * - * @param e 事件 - * - * - * @date 2014-11-25-下午6:20:10 - * - */ + * 将WLayout转换为XLayoutContainer + * + * @date 2014-11-25-下午6:21:48 + */ + + @Override + protected void addWidgetToSwingComponent(WLayout layout) { + for (int i = 0; i < layout.getWidgetCount(); i++) { + Widget w = layout.getWidget(i); + XWidgetCreator creator = (XWidgetCreator) XCreatorUtils.createXCreator(layout.getWidget(i)); + this.add(creator, w.getWidgetName(), i); + creator.setBackupParent(this); + } + } + + /** + * 展示当前选中的card + * + * @date 2014-11-25-下午6:21:23 + */ + public void showCard() { + WCardLayout layout = this.toData(); + if (layout.getWidgetCount() > 0) { + cardLayout.show(this, layout.getShowIndex2Name()); + } + } + + /** + * 获取当前XCreator的一个封装父容器 + * + * @param widgetName 当前组件名 + * @return 封装的父容器 + * @date 2014-11-25-下午4:47:23 + */ @Override - public void componentAdded(ContainerEvent e) { + protected XLayoutContainer getCreatorWrapper(String widgetName) { + initStyle(); + Dimension dimension = new Dimension(); + //主结构是一个borderlayout, 标签部分是north, card部分为center + WCardMainBorderLayout border = new WCardMainBorderLayout(); + XWCardMainBorderLayout xMainBorder = new XWCardMainBorderLayout(border, dimension); + //将子WCardBorder的style设置到父容器上 + LayoutBorderStyle style = (this.toData()).getBorderStyle(); + border.setBorderStyle(style); + this.setBackupParent(xMainBorder); + XWCardTitleLayout titlePart = this.initTitlePart(widgetName, xMainBorder); + xMainBorder.addTitlePart(titlePart, WBorderLayout.NORTH); + + return xMainBorder; + } + + //标题栏 + private XWCardTitleLayout initTitlePart(String widgetName, XWCardMainBorderLayout xMainBorder) { + Dimension dimension = new Dimension(); + //标题部分本身也是一个borderlayout布局, tag部分放center, 添加按钮放east + WCardTitleLayout titleLayout = new WCardTitleLayout(this.toData().getWidgetName()); + XWCardTitleLayout xTitle = new XWCardTitleLayout(titleLayout, dimension); + xTitle.setBackupParent(xMainBorder); + + //切换card的按钮部分 + XWCardTagLayout tagPart = initTagPart(widgetName, xTitle); + //添加按钮 + XCardAddButton addBtn = initAddButton(widgetName, xTitle, tagPart); + + //添加顺序很重要，先addBtn再tagPart，后面用到 + xTitle.addNewButton(addBtn); + xTitle.addTagPart(tagPart); + + return xTitle; + } + + //添加tab按钮 + private XCardAddButton initAddButton(String widgetName, XWCardTitleLayout xTitle, XWCardTagLayout tagPart) { + Dimension dimension = new Dimension(); + CardAddButton addButton = new CardAddButton(widgetName); + XCardAddButton xAddBtn = new XCardAddButton(addButton, dimension, tagPart, this); + xAddBtn.setBackupParent(xTitle); + + return xAddBtn; + } + + //所有的tab所在的区域 + private XWCardTagLayout initTagPart(String widgetName, XWCardTitleLayout xTitle) { + Dimension dimension = new Dimension(); + //放置标题的tab流式布局 + WCardTagLayout tagLayout = new WCardTagLayout("tabpane" + widgetName.replaceAll(createDefaultName(), "")); + tagLayout.setNewTab(true); + XWCardTagLayout xTag = new XWCardTagLayout(tagLayout, dimension, this); + xTag.setBackupParent(xTitle); + + XCardSwitchButton xFirstBtn = initFirstButton(widgetName, xTag); + xTag.add(xFirstBtn); + + return xTag; + } + + //第一个tab + private XCardSwitchButton initFirstButton(String widgetName, XWCardTagLayout xTag) { + CardSwitchButton firstBtn = new CardSwitchButton(widgetName); + firstBtn.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title") + 0); + xTag.setCurrentCard(firstBtn); + XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag); + xFirstBtn.setBackupParent(xTag); + return xFirstBtn; + } + + /** + * 控件树不显示此组件 + * + * @param path 控件树list + */ + @Override + public void notShowInComponentTree(List path) { + path.remove(LAYOUT_INDEX); + } + + + /** + * 设置父容器的名字 + * + * @param parentPanel 当前父容器 + * @param widgetName 当前控件名 + * @date 2014-11-27-上午9:47:00 + */ + @Override + protected void setWrapperName(XLayoutContainer parentPanel, String widgetName) { + parentPanel.toData().setWidgetName("tablayout" + widgetName.replaceAll(createDefaultName(), "")); + } + + /** + * 将当前对象添加到父容器中 + * + * @param parentPanel 父容器组件 + * @date 2014-11-25-下午4:57:55 + */ + @Override + protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight) { + parentPanel.add(this, WBorderLayout.CENTER); + } + + /** + * 添加组件的监听事件 + * + * @param e 事件 + * @date 2014-11-25-下午6:20:10 + */ + @Override + public void componentAdded(ContainerEvent e) { if (isRefreshing) { return; } @@ -293,220 +269,221 @@ public class XWCardLayout extends XLayoutContainer { WCardLayout layout = this.toData(); Widget w = creator.toData(); - for (int i = 0, count = this.getComponentCount(); i < count; i++) { - if (creator == this.getComponent(i)) { - layout.addWidget(w, i); - } - } - } - - @Override - public LayoutAdapter getLayoutAdapter() { - return new FRCardLayoutAdapter(this); - } - - /** - * 是否支持标题样式 - * @return 默认false - */ - @Override - public boolean hasTitleStyle() { - return true; - } - - /** - * 得到属性名 - * @return 属性名 - * @throws IntrospectionException - */ - @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - //嵌套的tab组件，内层的不支持轮播属性，屏蔽属性表 - if(!isNested()) { - CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel(); - return ArrayUtils.addAll(getDefaultDescriptor(), crp); - }else{ - return getDefaultDescriptor(); - } - } - - /** - * 判断当前tab组件是不是嵌套的 - * @return 嵌套与否 - */ - private boolean isNested() { - XCreator xCreator = (XCreator)this.getBackupParent().getParent(); - while (xCreator != null) { - if (xCreator.acceptType(XWCardMainBorderLayout.class)) { - return true; - } - xCreator = (XCreator) xCreator.getParent(); - } - return false; - } - - public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException { - return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("carousel", this.data.getClass()) - .setEditorClass(BooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_setCarousel")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") - .setPropertyChangeListener(new PropertyChangeAdapter() { - @Override - public void propertyChange() { - designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); - designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); - } - }), - new CRPropertyDescriptor("carouselInterval", this.data.getClass()) - .setEditorClass(DoubleEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_carouselInterval")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") - }; - } - - public CRPropertyDescriptor[] getisnotCarousel() throws IntrospectionException { - return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("carousel", this.data.getClass()) - .setEditorClass(BooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer_setCarousel")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") - .setPropertyChangeListener(new PropertyChangeAdapter() { - @Override - public void propertyChange() { - designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); - designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); - } - }) - }; - } - - public CRPropertyDescriptor[] getDefaultDescriptor() throws IntrospectionException { - return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Inter - .getLocText("FR-Designer_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter(){ - - @Override - public void propertyChange(){ - WCardLayout cardLayout = toData(); - changeRelateSwitchCardName(cardLayout.getWidgetName()); - } - }), - new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( - CardTagWLayoutBorderStyleEditor.class).setI18NName( - Inter.getLocText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") - .setPropertyChangeListener(new PropertyChangeAdapter() { - - @Override - public void propertyChange() { - initStyle(); - } - }) - }; - } - - //初始化样式 + for (int i = 0, count = this.getComponentCount(); i < count; i++) { + if (creator == this.getComponent(i)) { + layout.addWidget(w, i); + } + } + } + + @Override + public LayoutAdapter getLayoutAdapter() { + return new FRCardLayoutAdapter(this); + } + + /** + * 是否支持标题样式 + * + * @return 默认false + */ @Override - protected void initStyle() { - LayoutBorderStyle style = toData().getBorderStyle(); - initBorderTitleStyle(style); - initBorderStyle(); - clearOrShowTitleLayout(ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE)); - } - - private void initBorderTitleStyle(LayoutBorderStyle style){ - //初始化默认标题样式 - if(!initFlag){ - return; - } - - style.setType(LayoutBorderStyle.TITLE); - style.setBorder(Constants.LINE_THIN); - WidgetTitle widgetTitle = style.getTitle(); - widgetTitle.setBackground(ColorBackground.getInstance(TITLE_COLOR)); - initFlag = false; + public boolean hasTitleStyle() { + return true; + } + + /** + * 得到属性名 + * + * @return 属性名 + * @throws IntrospectionException + */ + @Override + public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { + //嵌套的tab组件，内层的不支持轮播属性，屏蔽属性表 + if (!isNested()) { + CRPropertyDescriptor[] crp = ((WCardLayout) data).isCarousel() ? getisCarousel() : getisnotCarousel(); + return ArrayUtils.addAll(getDefaultDescriptor(), crp); + } else { + return getDefaultDescriptor(); + } + } + + /** + * 判断当前tab组件是不是嵌套的 + * + * @return 嵌套与否 + */ + private boolean isNested() { + XCreator xCreator = (XCreator) this.getBackupParent().getParent(); + while (xCreator != null) { + if (xCreator.acceptType(XWCardMainBorderLayout.class)) { + return true; + } + xCreator = (XCreator) xCreator.getParent(); + } + return false; + } + + public CRPropertyDescriptor[] getisCarousel() throws IntrospectionException { + return new CRPropertyDescriptor[]{ + new CRPropertyDescriptor("carousel", this.data.getClass()) + .setEditorClass(BooleanEditor.class) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_setCarousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + .setPropertyChangeListener(new PropertyChangeAdapter() { + @Override + public void propertyChange() { + designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); + } + }), + new CRPropertyDescriptor("carouselInterval", this.data.getClass()) + .setEditorClass(DoubleEditor.class) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_carouselInterval")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + }; + } + + public CRPropertyDescriptor[] getisnotCarousel() throws IntrospectionException { + return new CRPropertyDescriptor[]{ + new CRPropertyDescriptor("carousel", this.data.getClass()) + .setEditorClass(BooleanEditor.class) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_setCarousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + .setPropertyChangeListener(new PropertyChangeAdapter() { + @Override + public void propertyChange() { + designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); + } + }) + }; + } + + public CRPropertyDescriptor[] getDefaultDescriptor() throws IntrospectionException { + return new CRPropertyDescriptor[]{ + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName( + Toolkit.i18nText("FR-Designer_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter() { + + @Override + public void propertyChange() { + WCardLayout cardLayout = toData(); + changeRelateSwitchCardName(cardLayout.getWidgetName()); + } + }), + new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( + CardTagWLayoutBorderStyleEditor.class).setI18NName( + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .setPropertyChangeListener(new PropertyChangeAdapter() { + + @Override + public void propertyChange() { + initStyle(); + } + }) + }; + } + + //初始化样式 + @Override + protected void initStyle() { + LayoutBorderStyle style = toData().getBorderStyle(); + initBorderTitleStyle(style); + initBorderStyle(); + clearOrShowTitleLayout(ComparatorUtils.equals(style.getType(), LayoutBorderStyle.TITLE)); + } + + private void initBorderTitleStyle(LayoutBorderStyle style) { + //初始化默认标题样式 + if (!initFlag) { + return; + } + + style.setType(LayoutBorderStyle.TITLE); + style.setBorder(Constants.LINE_THIN); + WidgetTitle widgetTitle = style.getTitle(); + widgetTitle.setBackground(ColorBackground.getInstance(TITLE_COLOR)); + initFlag = false; } //隐藏或显示标题部分 protected void clearOrShowTitleLayout(boolean isTitleStyle) { - XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout)this.getBackupParent(); - if(mainLayout != null){ - XWCardTitleLayout titleLayout = (XWCardTitleLayout) mainLayout.getComponent(NORTH); - if(titleLayout != null){ - WCardTitleLayout layout = (WCardTitleLayout) titleLayout.toData(); - titleLayout.setVisible(isTitleStyle); - layout.setVisible(isTitleStyle); - } - } - } - + XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) this.getBackupParent(); + if (mainLayout != null) { + XWCardTitleLayout titleLayout = (XWCardTitleLayout) mainLayout.getComponent(NORTH); + if (titleLayout != null) { + WCardTitleLayout layout = (WCardTitleLayout) titleLayout.toData(); + titleLayout.setVisible(isTitleStyle); + layout.setVisible(isTitleStyle); + } + } + } + //修改相关SwitchButton所绑定的cardLayout控件名 - private void changeRelateSwitchCardName(String cardLayoutName) { - XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) this.getBackupParent(); - WCardMainBorderLayout border = borderLayout.toData(); - WCardTitleLayout titleLayout = border.getTitlePart(); - titleLayout.setCardName(cardLayoutName); - WCardTagLayout tagLayout = titleLayout.getTagPart(); - for (int i = 0, len = tagLayout.getWidgetCount(); i < len; i++) { - CardSwitchButton button = tagLayout.getSwitchButton(i); - button.setCardLayoutName(cardLayoutName); - } - } - + private void changeRelateSwitchCardName(String cardLayoutName) { + XWCardMainBorderLayout borderLayout = (XWCardMainBorderLayout) this.getBackupParent(); + WCardMainBorderLayout border = borderLayout.toData(); + WCardTitleLayout titleLayout = border.getTitlePart(); + titleLayout.setCardName(cardLayoutName); + WCardTagLayout tagLayout = titleLayout.getTagPart(); + for (int i = 0, len = tagLayout.getWidgetCount(); i < len; i++) { + CardSwitchButton button = tagLayout.getSwitchButton(i); + button.setCardLayoutName(cardLayoutName); + } + } + /** * 删除相关组件 - * - * @param creator 当前组件 + * + * @param creator 当前组件 * @param designer 表单设计器 - * */ - @Override - public void deleteRelatedComponent(XCreator creator, FormDesigner designer){ - XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) creator.getBackupParent(); - SelectionModel selectionModel = designer.getSelectionModel(); - selectionModel.setSelectedCreator(mainLayout); - selectionModel.deleteSelection(); - } - - @Override - public void setBorder(Border border) { - super.setBorder(border); - XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) this.getBackupParent(); - if(mainLayout != null){ - mainLayout.setBorder(border); - } - } - - @Override - public XLayoutContainer getTopLayout() { - return this.getBackupParent().getTopLayout(); - } - - @Override - public boolean supportRenameInWidgetTree() { - return false; - } - - /** - * data属性改变触发其他操作 - * - */ - @Override - public void firePropertyChange(){ - initStyle(); - } - - public void resetTabBackground(TemplateStyle templateStyle){ - for (int i = 0; i < this.getXCreatorCount(); i++) { - XWTabFitLayout xCreator = (XWTabFitLayout)this.getXCreator(i); - WTabFitLayout wTabFitLayout = (WTabFitLayout)xCreator.toData(); - boolean defaultStyle = ComparatorUtils.equals(templateStyle.getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE); - wTabFitLayout.setInitialBackground(defaultStyle ? null : templateStyle.getTabDefaultBackground()); - wTabFitLayout.setOverBackground(null); - wTabFitLayout.setClickBackground(null); - wTabFitLayout.setCustomStyle(!defaultStyle); - xCreator.checkButonType(); - } - } + @Override + public void deleteRelatedComponent(XCreator creator, FormDesigner designer) { + XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) creator.getBackupParent(); + SelectionModel selectionModel = designer.getSelectionModel(); + selectionModel.setSelectedCreator(mainLayout); + selectionModel.deleteSelection(); + } + + @Override + public void setBorder(Border border) { + super.setBorder(border); + XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) this.getBackupParent(); + if (mainLayout != null) { + mainLayout.setBorder(border); + } + } + + @Override + public XLayoutContainer getTopLayout() { + return this.getBackupParent().getTopLayout(); + } + + @Override + public boolean supportRenameInWidgetTree() { + return false; + } + + /** + * data属性改变触发其他操作 + */ + @Override + public void firePropertyChange() { + initStyle(); + } + + public void resetTabBackground(TemplateStyle templateStyle) { + for (int i = 0; i < this.getXCreatorCount(); i++) { + XWTabFitLayout xCreator = (XWTabFitLayout) this.getXCreator(i); + WTabFitLayout wTabFitLayout = (WTabFitLayout) xCreator.toData(); + boolean defaultStyle = ComparatorUtils.equals(templateStyle.getStyle(), DefaultTemplateStyle.DEFAULT_TEMPLATE_STYLE); + wTabFitLayout.setInitialBackground(defaultStyle ? null : templateStyle.getTabDefaultBackground()); + wTabFitLayout.setOverBackground(null); + wTabFitLayout.setClickBackground(null); + wTabFitLayout.setCustomStyle(!defaultStyle); + xCreator.checkButonType(); + } + } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index fa43b57fe..4635b22f6 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -36,7 +36,7 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.general.ComparatorUtils; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.share.ShareConstants; import com.fr.stable.Constants; @@ -383,7 +383,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout { g2d.setColor(Color.WHITE); //画编辑文字 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); g.setColor(XCreatorConstants.FORM_BORDER_COLOR); GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM); paintExtro(g); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java index 0e500bc84..42bb0f565 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java @@ -21,7 +21,7 @@ import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.core.PropertyChangeAdapter; @@ -176,7 +176,7 @@ public class XWTabFitLayout extends XWFitLayout { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Title", "Style"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Title_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -191,16 +191,16 @@ public class XWTabFitLayout extends XWFitLayout { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Title", "Style"})).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Title_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Initial")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Over")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(Inter.getLocText("FR-Designer_Background-Click")).putKeyValue( + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; return crPropertyDescriptors[i]; diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java index 0816d8c7e..df54fd031 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java @@ -7,7 +7,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; @@ -36,7 +36,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); } @Override @@ -59,13 +59,13 @@ public class BoundsGroupModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("FR-Designer_X_Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"); case 1: - return Inter.getLocText("FR-Designer_Y_Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"); case 2: - return Inter.getLocText("FR-Designer_Widget_Width"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Width"); default: - return Inter.getLocText("FR-Designer_Widget_Height"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Height"); } } else { switch (row) { @@ -107,7 +107,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { break; case 3: if(v < MINHEIGHT){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Min_Height") + "21"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Height") + "21"); v = component.getHeight(); } if (bounds.height == v){ diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java index e7e44ea8f..0359cd902 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java @@ -11,7 +11,7 @@ import com.fr.design.designer.creator.XWidgetCreator; import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WCardLayout; -import com.fr.general.Inter; + public class CardLayoutConstraints implements ConstraintsGroupModel { @@ -31,7 +31,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("FR-Designer_Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Constraints"); } @Override @@ -52,7 +52,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return Inter.getLocText("FR-Designer_Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Index"); } else { return layout.getWidgetIndex(widget) + 1; } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java index 67188521d..e653db126 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java @@ -4,7 +4,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -32,7 +32,7 @@ public class CardLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("FR-Engine-Tab_Layout_Widget_Size"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Widget_Size"); } @Override @@ -69,9 +69,9 @@ public class CardLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("FR-Engine-Tab_Layout_Width"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Width"); default: - return Inter.getLocText("FR-Engine-Tab_Layout_Height"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Height"); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java index d36c974d0..bbff5e1bb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java @@ -13,7 +13,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.form.event.Listener; import com.fr.design.form.javascript.FormEmailPane; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import com.fr.general.NameObject; import com.fr.stable.Nameable; @@ -32,7 +32,7 @@ public class EventPropertyTable extends UIListControlPane { @Override public String getAddItemText() { - return Inter.getLocText("FR-Designer_Add_Event"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Event"); } public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane { @@ -47,7 +47,7 @@ public class EventPropertyTable extends UIListControlPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Set_Callback_Function"); } @Override protected EmailPane initEmaiPane() { @@ -72,7 +72,7 @@ public class EventPropertyTable extends UIListControlPane { } private String switchLang(String eventName) { - return Inter.getLocText("FR-Engine_Event_" + eventName); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Event_" + eventName); } /** diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index 8e0b76bec..e6516a486 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -12,7 +12,7 @@ import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBodyLayoutType; import com.fr.log.FineLoggerFactory; import com.fr.general.FRScreen; -import com.fr.general.Inter; + import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; @@ -48,7 +48,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr */ @Override public String getGroupName() { - return Inter.getLocText("FR-Designer_Attr_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout"); } @Override @@ -71,9 +71,9 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr if (column == 0) { switch (row) { case 0: - return Inter.getLocText("FR-Designer_Attr_Layout_Type"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); default: - return Inter.getLocText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java index 66540fe06..df5e47c61 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java @@ -6,7 +6,7 @@ import com.fr.design.mainframe.widget.editors.AbsoluteLayoutDirectionEditor; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WAbsoluteLayout; -import com.fr.general.Inter; + import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return Inter.getLocText("FR-Designer-Widget_Area_Scaling"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Area_Scaling"); } @Override @@ -59,7 +59,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return Inter.getLocText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); } else { return layout.getCompState(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java index dfa633c23..cb8c3e918 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java @@ -11,7 +11,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -47,7 +47,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); } @Override @@ -84,9 +84,9 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("BorderLayout-Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"); case 1: - return Inter.getLocText("Title"); + return com.fr.design.i18n.Toolkit.i18nText("Title"); default: return getSizeDisplayName(); } @@ -128,9 +128,9 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { private String getSizeDisplayName() { Object obj = layout.getConstraints(widget); if (BorderLayout.NORTH.equals(obj) || BorderLayout.SOUTH.equals(obj)) { - return Inter.getLocText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); } else if (BorderLayout.WEST.equals(obj) || BorderLayout.EAST.equals(obj)) { - return Inter.getLocText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); } else { return StringUtils.EMPTY; } @@ -138,7 +138,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { private String getChildPositionDisplayName() { Object obj = layout.getConstraints(widget); - //return Inter.getLocText("BorderLayout-" + obj); + //return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-" + obj); return obj.toString(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraintsRenderer.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraintsRenderer.java index cca2a068f..ebfc582c3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraintsRenderer.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraintsRenderer.java @@ -9,7 +9,7 @@ import com.fr.design.gui.ilable.UILabel; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + /** * @author richer @@ -20,7 +20,7 @@ public class FRBorderLayoutConstraintsRenderer extends UILabel implements TableC @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { if (value != null) { - this.setText(Inter.getLocText("BorderLayout-" + value)); + this.setText(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-" + value)); } return this; } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java index b6bd87905..d9dbd5c57 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java @@ -4,7 +4,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.BorderLayoutDirectionEditor; import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor; @@ -54,7 +54,7 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("BorderLayout"); + return com.fr.design.i18n.Toolkit.i18nText("BorderLayout"); } @Override @@ -83,11 +83,11 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Hgap"); case 1: - return Inter.getLocText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Vgap"); default: - return Inter.getLocText(new String[]{"Form-Layout", "Style"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Style"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java index ebdee649c..4235035bd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java @@ -13,7 +13,7 @@ import com.fr.design.utils.ComponentUtils; import com.fr.form.ui.PaddingMargin; import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WLayout; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; @@ -47,7 +47,7 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("FR-Designer-Widget_Size"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size"); } @Override @@ -70,9 +70,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("FR-Designer-Tree_Width"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"); default: - return Inter.getLocText("FR-Designer-Tree_Height"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"); } } else { switch (row) { @@ -101,9 +101,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.width == rec.width - margin.getLeft() - margin.getRight()){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); }else if(v < minWidth){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Min_Width") + Integer.toString(minWidth)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Width") + Integer.toString(minWidth)); v = xCreator.getWidth(); } difference = bounds.width - v; @@ -114,9 +114,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.height == rec.height - margin.getTop() - margin.getBottom()){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); }else if(v < minHeight){ - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Min_Height") + Integer.toString(minHeight)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Height") + Integer.toString(minHeight)); v = xCreator.getHeight(); } difference = bounds.height - v; diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java index 9414d1bdc..6bc1d2a6b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java @@ -18,7 +18,7 @@ import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBodyLayoutType; import com.fr.form.ui.container.WFitLayout; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; @@ -59,7 +59,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return Inter.getLocText("FR-Designer_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout"); } @Override @@ -111,11 +111,11 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("FR-Designer_Attr_Layout_Type"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); case 1: - return Inter.getLocText("FR-Designer_Component_Scale"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Scale"); default: - return Inter.getLocText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java index a100da540..c444c4506 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java @@ -9,7 +9,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -30,7 +30,7 @@ public class FRFormLayoutPropertiesGroupModel implements GroupModel{ @Override public String getGroupName() { - return Inter.getLocText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java index c47de3fc5..c96596302 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java @@ -7,7 +7,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -33,7 +33,7 @@ public class FRGridLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("GridLayout"); + return com.fr.design.i18n.Toolkit.i18nText("GridLayout"); } @Override @@ -56,13 +56,13 @@ public class FRGridLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Hgap"); case 1: - return Inter.getLocText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Vgap"); case 2: - return Inter.getLocText("Edit-Row_Count"); + return com.fr.design.i18n.Toolkit.i18nText("Edit-Row_Count"); case 3: - return Inter.getLocText("Edit-Column_Count"); + return com.fr.design.i18n.Toolkit.i18nText("Edit-Column_Count"); default: return null; } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java index 7fba5efa2..7ec9e222a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java @@ -18,7 +18,7 @@ import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; -import com.fr.general.Inter; + /** * tab布局tabFit属性表 @@ -51,7 +51,7 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro */ @Override public String getGroupName() { - return Inter.getLocText("FR-Designer_Current_tab"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_tab"); } @Override @@ -79,9 +79,9 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro if (column == PROPERTY_NAME_COLUMN) { switch (row) { case 0: - return Inter.getLocText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); default : - return Inter.getLocText("FR-Engine_Tab_Layout_Title"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Tab_Layout_Title"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java index 3927ac267..39cb00d19 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java @@ -24,7 +24,7 @@ import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; import com.fr.form.ui.Widget; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + /** * Author : daisy @@ -34,8 +34,8 @@ import com.fr.general.Inter; public class FormWidgetAuthorityEditPane extends AuthorityEditPane { private FormDesigner designer; private Widget[] widgets = null; - private UICheckBox widgetVisible = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Visible")); - private UICheckBox widgetAvailable = new UICheckBox(Inter.getLocText("FR-Designer_Widget_Enabled")); + private UICheckBox widgetVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Visible")); + private UICheckBox widgetAvailable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Enabled")); private ItemListener visibleItemListener = new ItemListener() { public void itemStateChanged(ItemEvent e) { String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); @@ -55,7 +55,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane { private ItemListener usableItemListener = new ItemListener() { public void itemStateChanged(ItemEvent e) { String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); - if (ComparatorUtils.equals(selectedRoles, Inter.getLocText("FR-Engine_Role"))) { + if (ComparatorUtils.equals(selectedRoles, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Role"))) { return; } if (selectedRoles == null) { @@ -93,7 +93,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane { * @date 2014-12-21-下午6:19:43 */ public void populateType() { - type.setText(Inter.getLocText("Widget-Form_Widget_Config")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config")); } /** diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java index 138b46ec3..bef5811c7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java @@ -6,7 +6,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; @@ -33,7 +33,7 @@ public abstract class HVLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java index 05688f6c5..b9be5326e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java @@ -5,7 +5,7 @@ package com.fr.design.designer.properties; import java.awt.Component; -import com.fr.general.Inter; + import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWHorizontalBoxLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; @@ -28,9 +28,9 @@ public class HorizontalLayoutConstraints extends HVLayoutConstraints{ if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); default: - return Inter.getLocText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java index 5da6026d6..c2a20d6c8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java @@ -4,7 +4,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -37,7 +37,7 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("Layout-HBox"); + return com.fr.design.i18n.Toolkit.i18nText("Layout-HBox"); } @Override @@ -74,11 +74,11 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Hgap"); case 1: - return Inter.getLocText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Vgap"); default: - return Inter.getLocText("Alignment"); + return com.fr.design.i18n.Toolkit.i18nText("Alignment"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java index 26a557e8f..9666f348d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java @@ -1,6 +1,6 @@ package com.fr.design.designer.properties; -import com.fr.general.Inter; + import com.fr.form.ui.container.WSplitLayout; public class HorizontalSplitProperties extends VerticalSplitProperties { @@ -10,6 +10,6 @@ public class HorizontalSplitProperties extends VerticalSplitProperties { @Override public String getGroupName() { - return Inter.getLocText("Horizontal-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Horizontal-Split_Layout"); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java index 8089d6f4d..b9ae47ebf 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java @@ -6,7 +6,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; @@ -36,7 +36,7 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return Inter.getLocText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); } @Override @@ -54,13 +54,13 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("X-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("X-Coordinate"); case 1: - return Inter.getLocText("Y-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); case 2: - return Inter.getLocText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); default: - return Inter.getLocText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); } } else { Rectangle rec = designer.getSelectionModel().getSelection().getSelctionBounds(); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java index 35b73c15d..efd9f9a50 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java @@ -5,7 +5,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -29,7 +29,7 @@ public class VerticalBoxProperties implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("VerticalBoxLayout"); + return com.fr.design.i18n.Toolkit.i18nText("VerticalBoxLayout"); } @Override @@ -52,9 +52,9 @@ public class VerticalBoxProperties implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Hgap"); case 1: - return Inter.getLocText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Vgap"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java index f0ed8e731..15e26438a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java @@ -5,7 +5,7 @@ package com.fr.design.designer.properties; import java.awt.Component; -import com.fr.general.Inter; + import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWVerticalBoxLayout; import com.fr.form.ui.container.WVerticalBoxLayout; @@ -28,9 +28,9 @@ public class VerticalLayoutConstraints extends HVLayoutConstraints { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); default: - return Inter.getLocText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java index fefa289ce..a6f0e6af3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java @@ -4,7 +4,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import com.fr.general.Inter; + import com.fr.design.beans.GroupModel; import com.fr.design.mainframe.widget.editors.DoubleEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; @@ -23,7 +23,7 @@ public class VerticalSplitProperties implements GroupModel { @Override public String getGroupName() { - return Inter.getLocText("Vertical-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Vertical-Split_Layout"); } @Override @@ -46,11 +46,11 @@ public class VerticalSplitProperties implements GroupModel { if (column == 0) { switch (row) { case 0: - return Inter.getLocText("Ratio"); + return com.fr.design.i18n.Toolkit.i18nText("Ratio"); case 1: - return Inter.getLocText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Hgap"); case 2: - return Inter.getLocText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Vgap"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java index 5b46b8956..9a4ebd529 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java @@ -1,7 +1,7 @@ package com.fr.design.designer.properties.items; import com.fr.form.ui.container.WAbsoluteLayout; -import com.fr.general.Inter; + /** * Created by zhouping on 2016/8/1. @@ -9,8 +9,8 @@ import com.fr.general.Inter; public class FRAbsoluteConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - new Item(Inter.getLocText("FR-Designer_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), - new Item(Inter.getLocText("FR-Designer_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) + new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), + new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) }; public Item[] getItems() { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java index 9fef88199..45f3d89b5 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java @@ -1,6 +1,6 @@ package com.fr.design.designer.properties.items; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.form.ui.container.WBorderLayout; @@ -10,7 +10,7 @@ public class FRBorderConstraintsItems implements ItemProvider { public FRBorderConstraintsItems(String[] directions) { Item[] item = createItems(directions); - VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(Inter.getLocText("BorderLayout-Center"), + VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Center"), WBorderLayout.CENTER)); } @@ -23,13 +23,13 @@ public class FRBorderConstraintsItems implements ItemProvider { Item[] items = new Item[directions.length]; for (int i = 0; i < directions.length; i++) { if (WBorderLayout.NORTH == directions[i]) { - items[i] = new Item(Inter.getLocText("BorderLayout-North"), WBorderLayout.NORTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH); } else if (WBorderLayout.SOUTH == directions[i]) { - items[i] = new Item(Inter.getLocText("BorderLayout-South"), WBorderLayout.SOUTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH); } else if (WBorderLayout.WEST == directions[i]) { - items[i] = new Item(Inter.getLocText("BorderLayout-West"), WBorderLayout.WEST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST); } else if (WBorderLayout.EAST == directions[i]) { - items[i] = new Item(Inter.getLocText("BorderLayout-East"), WBorderLayout.EAST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST); } } return items; diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java index 4faddc986..bad17f9d4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java @@ -4,7 +4,7 @@ package com.fr.design.designer.properties.items; import com.fr.form.ui.container.WFitLayout; -import com.fr.general.Inter; + /** * @author jim @@ -13,8 +13,8 @@ import com.fr.general.Inter; public class FRFitConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - new Item(Inter.getLocText("FR-Designer_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL), - new Item(Inter.getLocText("FR_Designer_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)}; + new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL), + new Item(com.fr.design.i18n.Toolkit.i18nText("FR_Designer_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)}; public Item[] getItems() { return ITEMS; diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java index a0b06380f..b00bb15df 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java @@ -2,14 +2,14 @@ package com.fr.design.designer.properties.items; import java.awt.FlowLayout; -import com.fr.general.Inter; + public class HorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - new Item(Inter.getLocText("Left"), FlowLayout.LEFT), - new Item(Inter.getLocText("Right"), FlowLayout.RIGHT), - new Item(Inter.getLocText("Center"), FlowLayout.CENTER) + new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), FlowLayout.LEFT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), FlowLayout.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), FlowLayout.CENTER) }; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java index a7eae6549..b52bfee8d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java @@ -2,14 +2,14 @@ package com.fr.design.designer.properties.items; import javax.swing.SwingConstants; -import com.fr.general.Inter; + public class LabelHorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - new Item(Inter.getLocText("Left"), SwingConstants.LEFT), - new Item(Inter.getLocText("Right"), SwingConstants.RIGHT), - new Item(Inter.getLocText("Center"), SwingConstants.CENTER) + new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), SwingConstants.LEFT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), SwingConstants.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), SwingConstants.CENTER) }; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java index 5aa214b3d..4e6fa93e8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java @@ -1,14 +1,14 @@ package com.fr.design.designer.properties.items; -import com.fr.general.Inter; + public class UnderlineItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - new Item(Inter.getLocText("DataFunction-None"), ""), - new Item(Inter.getLocText("StyleAlignment-Top"), "overline"), - new Item(Inter.getLocText("Center"), "line-through"), - new Item(Inter.getLocText("StyleAlignment-Bottom"), "underline")}; + new Item(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), ""), + new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), "overline"), + new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), "line-through"), + new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), "underline")}; @Override public Item[] getItems() { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java index a7108d955..2c867ea9f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java @@ -1,6 +1,6 @@ package com.fr.design.designer.properties.items; -import com.fr.general.Inter; + import com.fr.report.stable.FormConstants; /** @@ -12,9 +12,9 @@ import com.fr.report.stable.FormConstants; public class WidgetDisplayPositionItems implements ItemProvider{ //这里为了和web端一致，只好设置成012了 private static Item[] VALUE_ITEMS = { - new Item(Inter.getLocText("StyleAlignment-Left"), FormConstants.LEFTPOSITION), - new Item(Inter.getLocText("Center"), FormConstants.CENTERPOSITION), - new Item(Inter.getLocText("StyleAlignment-Right"), FormConstants.RIGHTPOSITION) + new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), FormConstants.LEFTPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), FormConstants.CENTERPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), FormConstants.RIGHTPOSITION) }; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java index fb0cc93b4..d423e17b1 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java @@ -15,7 +15,7 @@ import com.fr.design.gui.xtable.ReportAppPropertyGroupModel; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; -import com.fr.general.Inter; + /** * 将body的控件列表中再加入手机重布局选项 @@ -32,7 +32,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = { new CRPropertyDescriptor("appRelayout", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) - .setI18NName(Inter.getLocText("FR-Designer-App_ReLayout")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-App_ReLayout")) }; return propertyTableEditor; } @@ -55,7 +55,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { FRContext.getLogger().error(e.getMessage()); } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer))); setModel(new BeanTableModel()); this.repaint(); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java index 133175878..f591c639b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java @@ -7,7 +7,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.widget.ui.designer.mobile.BodyMobileDefinePane; -import com.fr.general.Inter; + /** * Created by Administrator on 2016/5/16/0016. @@ -36,6 +36,6 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java index 6e642a635..ed1a6ebc2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.widget.ui.designer.mobile.ChartEditorDefinePane; -import com.fr.general.Inter; + /** * Created by plough on 2018/1/18. @@ -31,6 +31,6 @@ public class ChartEditorPropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java index 5a156f346..0038bc147 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java @@ -14,7 +14,7 @@ import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; import com.fr.design.mainframe.widget.editors.RefinedDoubleEditor; import com.fr.form.ui.ElementCaseEditor; -import com.fr.general.Inter; + import javax.swing.table.TableModel; import java.beans.IntrospectionException; @@ -49,16 +49,16 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ CRPropertyDescriptor[] propertyTableEditor = { new CRPropertyDescriptor("horziontalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class) .setRendererClass(MobileFitRender.class) - .setI18NName(Inter.getLocText("FR-Designer_Mobile-Horizontal")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), new CRPropertyDescriptor("verticalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class) .setRendererClass(MobileFitRender.class) - .setI18NName(Inter.getLocText("FR-Designer_Mobile-Vertical")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Vertical")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) - .setI18NName(Inter.getLocText("Form-EC_heightrestrict")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightrestrict")) .setRendererClass(BooleanRender.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")) }; List defaultList = new ArrayList<>(); @@ -71,7 +71,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException { CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass()) .setEditorClass(RefinedDoubleEditor.class) - .setI18NName(Inter.getLocText("Form-EC_heightpercent")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightpercent")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); ArrayList defaultList = (ArrayList) createNonListenerProperties(); defaultList.add(heightLimitProperty); @@ -96,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer))); TableModel model = new BeanTableModel(); setModel(model); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java index f84bafc29..fa6cff395 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.widget.ui.designer.mobile.ElementCaseDefinePane; -import com.fr.general.Inter; + /** * Created by Administrator on 2016/5/16/0016. @@ -31,6 +31,6 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java index 8e8ea896f..f81f8e127 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.widget.ui.designer.mobile.MultiFileUploaderDefinePane; -import com.fr.general.Inter; + /** * Created by plough on 2018/4/19. @@ -31,6 +31,6 @@ public class MultiFileUploaderPropertyUI extends AbstractWidgetPropertyUIProvide @Override public String tableTitle() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java index e9fc479fa..119ea6952 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicPane; import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.widget.ui.designer.mobile.ParaMobileDefinePane; -import com.fr.general.Inter; + /** * Created by Administrator on 2016/5/16/0016. @@ -31,6 +31,6 @@ public class ParaMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java index 34572d11d..0efcf02d8 100644 --- a/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java +++ b/designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.javascript.EmailPane; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + /** * 表单的邮件pane @@ -23,10 +23,10 @@ public class FormEmailPane extends EmailPane{ double[] columnSize = { preferred, fill}; centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - createLinePane(Inter.getLocText("HJS-Mail_to"), maitoEditor = new UITextField()), - createLinePane(Inter.getLocText("HJS-CC_to"), ccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-BCC"), bccEditor = new UITextField()), - createLinePane(Inter.getLocText("EmailPane-mailSubject"), titleEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), {mainTextLabel, scrollPane}, {new UILabel(), tipsPane2}},rowSize, columnSize, 7); } diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java index 227962e38..384a080b0 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java @@ -4,7 +4,7 @@ import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.main.mobile.FormMobileAttr; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -63,6 +63,6 @@ public class FormMobileAttrPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java index 960ffa4a6..db7e2d67c 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java @@ -5,7 +5,7 @@ import com.fr.design.designer.IntervalConstants; import com.fr.design.dialog.mobile.MobileRadioCheckPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.main.mobile.FormMobileAttr; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -28,9 +28,9 @@ public class FormMobileOthersPane extends BasicBeanPane { JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow()); JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); contentPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L1, 0, 0)); - appearRefreshCheckPane = new MobileRadioCheckPane(Inter.getLocText("FR-Designer_Appear_Refresh")); + appearRefreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Appear_Refresh")); contentPane.add(appearRefreshCheckPane, BorderLayout.WEST); - promptWhenLeaveWithoutSubmitCheckPane = new MobileRadioCheckPane(Inter.getLocText("FR-Designer_Prompt_When_Leave_Without_Submit")); + promptWhenLeaveWithoutSubmitCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Prompt_When_Leave_Without_Submit")); contentPane.add(promptWhenLeaveWithoutSubmitCheckPane, BorderLayout.CENTER); borderPane.add(contentPane); this.add(borderPane); @@ -60,6 +60,6 @@ public class FormMobileOthersPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Other"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java index a32faac5b..5a853566b 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.main.mobile.FormMobileAttr; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.border.Border; @@ -45,7 +45,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane { UILabel uiLabel = new UILabel("html5"); uiLabel.setBorder(BorderFactory.createEmptyBorder(5, 15, 10, 15)); - this.refreshCheckPane = new MobileRadioCheckPane(Inter.getLocText("FR-Designer_Mobile-Refresh")); + this.refreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Refresh")); toobarsPane.add(uiLabel, BorderLayout.WEST); toobarsPane.add(refreshCheckPane, BorderLayout.EAST); @@ -58,7 +58,7 @@ public class MobileToolBarPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Mobile-ToolBar"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-ToolBar"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java index 5c48f2c70..06a7aa25b 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaDesigner.java @@ -50,7 +50,7 @@ import com.fr.form.ui.WidgetValue; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WLayout; import com.fr.form.ui.container.WParameterLayout; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; /** @@ -613,7 +613,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP } FormSubmitButton formSubmitButton = new FormSubmitButton(); formSubmitButton.setWidgetName("Search"); - formSubmitButton.setText(Inter.getLocText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); xCreator = XCreatorUtils.createXCreator(formSubmitButton); if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { @@ -653,7 +653,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP if (!isWithQueryButton()) { FormSubmitButton formSubmitButton = new FormSubmitButton(); formSubmitButton.setWidgetName("Search"); - formSubmitButton.setText(Inter.getLocText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton); if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java index 8e3a34324..d39e5620e 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java @@ -9,7 +9,7 @@ import com.fr.design.gui.itable.PropertyGroup; import com.fr.design.mainframe.FormDesignerModeForSpecial; import com.fr.form.main.parameter.FormParameterUI; import com.fr.form.parameter.FormSubmitButton; -import com.fr.general.Inter; + import java.util.ArrayList; @@ -26,7 +26,7 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true，否则返回false */ public boolean isEditable(int row) { return true; } } \ No newline at end of file +/* * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved. */ package com.fr.design.form.parameter; import java.awt.Component; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; /** * Created by IntelliJ IDEA. * User : Richer * Version: 6.5.5 * Date : 11-7-5 * Time : 下午2:56 */ public class RootDesignGroupModel implements ConstraintsGroupModel { private DefaultTableCellRenderer renderer; private PropertyCellEditor editor; private XWParameterLayout root; public RootDesignGroupModel(XWParameterLayout root) { this.root = root; renderer = new DefaultTableCellRenderer(); editor = new PropertyCellEditor(new IntegerPropertyEditor()); //初始值为参数面板的初始宽度 if (root.toData().getDesignWidth() == 0){ root.toData().setDesignWidth(root.getWidth()); } } @Override public String getGroupName() { return com.fr.design.i18n.Toolkit.i18nText("Form-Design_Size"); } @Override public int getRowCount() { return 1; } @Override public TableCellRenderer getRenderer(int row) { return renderer; } @Override public TableCellEditor getEditor(int row) { return editor; } @Override public Object getValue(int row, int column) { if (column == 0) { switch (row) { case 0: return com.fr.design.i18n.Toolkit.i18nText("Form-Desin_Width"); } } else { switch (row) { case 0: return root.toData().getDesignWidth(); } } return null; } @Override public boolean setValue(Object value, int row, int column) { if (column == 1) { int designerWidth = value == null ? 0 : ((Number) value).intValue(); switch (row) { case 0: if(isCompsOutOfDesignerWidth(designerWidth)){ return false; } root.toData().setDesignWidth(designerWidth); return true; default: return true; } } else { return false; } } private boolean isCompsOutOfDesignerWidth(int designerWidth){ for(int i=0; i designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true，否则返回false */ public boolean isEditable(int row) { return true; } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java index 09ae68716..d1d8cfbf0 100644 --- a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java @@ -3,6 +3,7 @@ package com.fr.design.gui.core; import javax.swing.Icon; import com.fr.base.BaseUtils; +import com.fr.design.i18n.Toolkit; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout; @@ -12,7 +13,7 @@ import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; -import com.fr.general.Inter; + /** * Author : Shockway @@ -73,35 +74,28 @@ public class FormWidgetOption extends WidgetOption { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } - public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"), + public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"), WAbsoluteLayout.class); - public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), + public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); - public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"), + public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"), WCardLayout.class); - public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), + public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); - public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), + public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); - public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), + public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); - public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), + public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); - public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Inter - .getLocText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), + public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), ElementCaseEditor.class); } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java index da3d79404..b9abdae75 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java @@ -14,7 +14,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.LayoutBorderStyle; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JComponent; @@ -45,13 +45,13 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { double[] columnSize = { p, f}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Title_Background")), this.getTitleBackgroundPane()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), this.getTitleBackgroundPane()}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); this.setTitlePane(new UIScrollPane(rightBottomContentPane)); - this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Title"),null)); + this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); this.getTitlePane().setVisible(false); return this.getTitlePane(); } @@ -66,7 +66,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java index e96eef26e..70dddbd53 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java @@ -6,7 +6,7 @@ import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.frpane.HyperlinkGroupPane; import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.js.EmailJavaScript; public class FormHyperlinkGroupPane extends HyperlinkGroupPane { @@ -33,8 +33,8 @@ public class FormHyperlinkGroupPane extends HyperlinkGroupPane { public NameableCreator[] createNameableCreators() { NameableCreator[] creators = super.createNameableCreators(); for (int i = 0; i < creators.length; i++) { - if (ComparatorUtils.equals(creators[i].menuName(), Inter.getLocText("FR-Designer_Email"))) { - creators[i] = new NameObjectCreator(Inter.getLocText("FR-Designer_Email"), EmailJavaScript.class, FormEmailPane.class); + if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"))) { + creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), EmailJavaScript.class, FormEmailPane.class); break; } } diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 37adb8e83..93fb4e239 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -26,7 +26,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -47,7 +47,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(Inter.getLocText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); treeTableDataComboBox.setPreferredSize(new Dimension(180, 20)); selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -68,14 +68,14 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); - valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(Inter.getLocText("Columns"))}); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); - textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(Inter.getLocText("Columns")), formulaEditor}); + textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { - {new UILabel(Inter.getLocText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), valuePane}, - {new UILabel(Inter.getLocText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), textPane}}; double p = TableLayout.PREFERRED; @@ -98,15 +98,15 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab List namelist = tableDataWrappe.calculateColumnNameList(); String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, Inter.getLocText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, Inter.getLocText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } catch (Exception e) { - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, Inter.getLocText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(Inter.getLocText("Parameter-Formula")); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, Inter.getLocText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } } diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java index 710d5e4a5..0945a2259 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -38,7 +38,7 @@ import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.WidgetTitle; import com.fr.general.Background; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.AbstractButton; @@ -317,8 +317,8 @@ public class LayoutBorderPane extends BasicPane { Constants.LINE_THICK, //3px }; - public final static String[] BORDER_TYPE = new String[]{Inter.getLocText("FR-Designer-Widget-Style_Standard"), Inter.getLocText("FR-Designer-Widget-Style_Custom")}; - public final static String[] BORDER_STYLE= new String[]{Inter.getLocText("FR-Designer-Widget-Style_Common"), Inter.getLocText("FR-Designer-Widget-Style_Shadow")}; + public final static String[] BORDER_TYPE = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Standard"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")}; + public final static String[] BORDER_STYLE= new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Common"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Shadow")}; private final static Dimension BUTTON_SIZE = new Dimension(24, 20); @@ -335,7 +335,7 @@ public class LayoutBorderPane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); @@ -381,27 +381,27 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ getBorderTypeComp(), - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Border_Line")), currentLineCombo}, - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Border_Color")), buttonPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Line")), currentLineCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), buttonPane}, getBorderCornerSpinnerComp(), - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane); - rightTopPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Frame"),null)); + rightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); rightTopPane.setPreferredSize(rightTopPane.getPreferredSize()); return rightTopPane; } protected JComponent[] getBorderTypeComp(){ - return new JComponent[]{new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Frame_Style")), borderTypeCombo}; + return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame_Style")), borderTypeCombo}; } protected JComponent[] getBorderCornerSpinnerComp(){ - return new JComponent[]{new UILabel(Inter.getLocText("plugin-ChartF_Radius")+":"),borderCornerSpinner}; + return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")+":"),borderCornerSpinner}; } protected void switchBorderType(){ @@ -438,14 +438,14 @@ public class LayoutBorderPane extends BasicPane { double[] rowSize = {p,p,p}; double[] columnSize = { p, f}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 6)); JPanel bodyRightTopPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); bodyRightTopPane.add(rightTopContentPane,BorderLayout.CENTER); - bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Frame"),null)); + bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); return bodyRightTopPane; } @@ -463,8 +463,8 @@ public class LayoutBorderPane extends BasicPane { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Left") - , Inter.getLocText("FR-Designer-StyleAlignment_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); hPaneContainer.add(hAlignmentPane); @@ -475,15 +475,15 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Title_Content")), formulaPane}, - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Content")), formulaPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, - {new UILabel(Inter.getLocText("FR-Designer_Alignment-Style")), hPaneContainer}, - {new UILabel(Inter.getLocText("FR-Designer-Widget-Style_Title_Background")), titleBackgroundPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")), hPaneContainer}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), titleBackgroundPane}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); titlePane =new UIScrollPane(rightBottomContentPane); - titlePane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer-Widget-Style_Title"),null)); + titlePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); titlePane.setVisible(false); return titlePane; } @@ -520,20 +520,20 @@ public class LayoutBorderPane extends BasicPane { } protected void initAllNames() { - fontNameComboBox.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Family")); - fontSizeComboBox.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Size")); - colorSelectPane.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Foreground")); - italic.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Italic")); - bold.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Bold")); - underline.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Underline")); - underlineCombo.setGlobalName(Inter.getLocText("FR-Designer-FRFont_Line_Style")); + fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Family")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); + colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); + italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); + bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); + underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); } protected void setToolTips() { - colorSelectPane.setToolTipText(Inter.getLocText("FR-Designer-FRFont_Foreground")); - italic.setToolTipText(Inter.getLocText("FR-Designer-FRFont_Italic")); - bold.setToolTipText(Inter.getLocText("FR-Designer-FRFont_Bold")); - underline.setToolTipText(Inter.getLocText("FR-Designer-FRFont_Underline")); + colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); + italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); + bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); + underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); } @@ -805,9 +805,9 @@ public class LayoutBorderPane extends BasicPane { group.add(normalBorder); group.add(RoundedBorder); -// add(createVerButtonPane(noBorder, Inter.getLocText("None"))); -// add(createVerButtonPane(normalBorder, Inter.getLocText("Border-Style-Normal"))); -// add(createVerButtonPane(RoundedBorder, Inter.getLocText("Border-Style-Radius"))); +// add(createVerButtonPane(noBorder, com.fr.design.i18n.Toolkit.i18nText("None"))); +// add(createVerButtonPane(normalBorder, com.fr.design.i18n.Toolkit.i18nText("Border-Style-Normal"))); +// add(createVerButtonPane(RoundedBorder, com.fr.design.i18n.Toolkit.i18nText("Border-Style-Radius"))); } public void populate(LayoutBorderStyle style) { @@ -929,6 +929,6 @@ public class LayoutBorderPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Widget_Style"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java index 0716e8e24..89a3c9adb 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java @@ -10,7 +10,7 @@ import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.WidgetTitle; import com.fr.general.Background; import com.fr.general.FRFont; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.JPanel; @@ -160,12 +160,12 @@ public class LayoutBorderPreviewPane extends JPanel{ private void drawTabBack(Graphics2D g2d, Graphics g, WidgetTitle title, FontMetrics fm, int startX1, int startY){ Dimension d = getSize(); - String paintText = Inter.getLocText("FR-Designer_Title")+TAB_ZERO; + String paintText = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ZERO; Background rightBack = ColorBackground.getInstance(XCardSwitchButton.CHOOSED_GRAL); Shape right = new Double(this.getWidth()/2, 0, this.getWidth()/2, this.getHeight()); rightBack.paint(g, right); - String rightLabel = Inter.getLocText("FR-Designer_Title")+TAB_ONE; + String rightLabel = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ONE; GraphHelper.drawString(g2d, rightLabel, (d.width/2 - fm.stringWidth(paintText)) / 2+d.width/2, startY); Background background = title.getBackground(); if (background != null) { diff --git a/designer-form/src/main/java/com/fr/design/gui/xtable/PropertyGroupModel.java b/designer-form/src/main/java/com/fr/design/gui/xtable/PropertyGroupModel.java index fa73066eb..b5a7e548a 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xtable/PropertyGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/gui/xtable/PropertyGroupModel.java @@ -8,7 +8,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.report.stable.FormConstants; import java.beans.PropertyChangeEvent; @@ -80,7 +80,7 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel { */ @Override public String getGroupName() { - return Inter.getLocText(groupName); + return com.fr.design.i18n.Toolkit.i18nText(groupName); } /** diff --git a/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java b/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java index 3b45260e4..9d80e2119 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java @@ -4,7 +4,7 @@ import com.fr.base.FRContext; import com.fr.design.designer.creator.CRPropertyDescriptor; import com.fr.design.designer.creator.XCreator; import com.fr.design.mainframe.FormDesigner; -import com.fr.general.Inter; + import java.lang.reflect.Method; import com.fr.general.ComparatorUtils; import com.fr.report.stable.FormConstants; @@ -35,8 +35,8 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { if (state > MAX_HEIGHT) { //弹窗提示 JOptionPane.showMessageDialog(null, - Inter.getLocText("FR-Designer_Mobile-Warning"), - Inter.getLocText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Warning"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.PLAIN_MESSAGE); return false; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java index 5b359b06c..4b4d94b10 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java @@ -5,7 +5,7 @@ import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.icon.IconPathConstants; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.JPanel; @@ -42,7 +42,7 @@ public class CoverPane extends JPanel { setBackground(null); setOpaque(false); - editButton = new UIButton(Inter.getLocText("Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { @Override public Dimension getPreferredSize() { return new Dimension(60, 24); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java index d53865f4b..11fb8a13e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java @@ -22,7 +22,7 @@ import com.fr.design.icon.IconPathConstants; import com.fr.design.utils.ComponentUtils; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.LayoutUtils; -import com.fr.general.Inter; + import com.fr.share.ShareConstants; import com.fr.stable.Constants; @@ -105,7 +105,7 @@ public class EditingMouseListener extends MouseInputAdapter { this.designer = designer; stateModel = designer.getStateModel(); selectionModel = designer.getSelectionModel(); - UIButton promptButton = new UIButton(Inter.getLocText("FR-Designer_Forbid_Drag_into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); + UIButton promptButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); this.promptWindow.add(promptButton); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java index c716d0239..75f1f253e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java @@ -25,7 +25,7 @@ import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.main.mobile.FormMobileAttr; import com.fr.form.ui.container.WBorderLayout; import com.fr.general.FRScreen; -import com.fr.general.Inter; + import javax.swing.JComponent; import javax.swing.JPanel; @@ -156,7 +156,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent { slidePane = JFormSliderPane.getInstance(); slidePane.setPreferredSize(new Dimension(200, 20)); - JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{ tipsPane, new UILabel(), widthPane, new UILabel(Inter.getLocText("FR-Designer_Indent-Pixel")), new UILabel("x"), heightPane, new UILabel(Inter.getLocText("FR-Designer_Indent-Pixel")), new UILabel(), slidePane }}, rowSize, columnSize, RESIZE_PANE_GAP); + JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{ tipsPane, new UILabel(), widthPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel")), new UILabel("x"), heightPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel")), new UILabel(), slidePane }}, rowSize, columnSize, RESIZE_PANE_GAP); this.add(FormRulerLayout.BOTTOM, resizePane); setWidgetsConfig(); // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小 diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java index 29a06060c..6c9504e78 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -17,7 +17,7 @@ import com.fr.form.share.SharableEditorProvider; import com.fr.form.share.ShareLoader; import com.fr.form.ui.SharableWidgetBindInfo; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -184,10 +184,10 @@ public class FormCreatorDropTarget extends DropTarget { private void promptUser(int x, int y, XLayoutContainer container) { if (!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class)) { - promptButton.setText(Inter.getLocText("FR-Designer_Forbid_Drag_into_Para_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Para_Pane")); promptWidgetForbidEnter(x, y, container); } else if (!addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class)) { - promptButton.setText(Inter.getLocText("FR-Designer_Forbid_Drag_into_Adapt_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane")); promptWidgetForbidEnter(x, y, container); } else { cancelPromptWidgetForbidEnter(); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index d986a3a88..abff9a9c8 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -45,7 +45,7 @@ import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WFitLayout; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.bridge.StableFactory; @@ -69,7 +69,7 @@ import java.util.List; */ public class FormDesigner extends TargetComponent

implements TreeSelectionListener, InvocationHandler, BaseFormDesigner, ParaDefinitePane { protected static final ArrayList NAME_ARRAY_LIST = new ArrayList( - Arrays.asList(new String[]{Inter.getLocText("M_Edit-Cut"), Inter.getLocText("M_Edit-Copy"), Inter.getLocText("M_Edit-Delete")}) + Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut"), com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy"), com.fr.design.i18n.Toolkit.i18nText("M_Edit-Delete")}) ); //底层容器的默认大小 protected static final Dimension LARGE_PREFERRED_SIZE = new Dimension(WBorderLayout.DEFAULT_WIDTH, WBorderLayout.DEFAULT_HEIGHT); @@ -291,7 +291,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection } FormSubmitButton formSubmitButton = new FormSubmitButton(); formSubmitButton.setWidgetName("Search"); - formSubmitButton.setText(Inter.getLocText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); xCreator = XCreatorUtils.createXCreator(formSubmitButton); if (!(this.autoAddComponent(xCreator, SUBMIT_BUTTON_H_LOCATION, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { @@ -340,7 +340,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection if (!isWithQueryButton()) { FormSubmitButton formSubmitButton = new FormSubmitButton(); formSubmitButton.setWidgetName("Search"); - formSubmitButton.setText(Inter.getLocText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); XCreator xCreator = XCreatorUtils.createXCreator(formSubmitButton); if (!(this.autoAddComponent(xCreator, H_COMPONENT_GAP * 3 + H_GAP, FIRST_V_LOCATION + V_COMPONENT_GAP * (currentIndex / NUM_IN_A_LINE)))) { @@ -357,8 +357,8 @@ public class FormDesigner extends TargetComponent implements TreeSelection } private void addParaPaneTooltips() { - JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer-Form-Please_Drag_ParaPane"), - Inter.getLocText("FR-Designer_Tooltips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-Please_Drag_ParaPane"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); } /** @@ -604,8 +604,8 @@ public class FormDesigner extends TargetComponent implements TreeSelection return false; } if (this.getTarget().isNameExist(newName)) { - JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + Inter.getLocText("Utils-has_been_existed") - + "!", Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") + + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); return false; } creator.resetCreatorName(newName); @@ -614,7 +614,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection } public void showMessageDialog(String message) { - JOptionPane.showMessageDialog(this, message, Inter.getLocText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, message, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); FormSelectionUtils.rebuildSelection(this); repaint(); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java index 5cc2ead91..f0f3e17d6 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java @@ -17,7 +17,7 @@ import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.utils.ComponentUtils; -import com.fr.general.Inter; + import com.fr.page.WatermarkPainter; import com.fr.report.core.ReportUtils; import com.fr.stable.ArrayUtils; @@ -170,7 +170,7 @@ public class FormDesignerUI extends ComponentUI { x1 = x2 = bounds.x - designer.getArea().getHorizontalValue() + (k == 3 ? 0 : bounds.width); text = Utils.objectToString(x1 + designer.getArea().getHorizontalValue()); } - text += Inter.getLocText("FR-Designer_Indent-Pixel"); + text += com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel"); g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); GraphHelper.drawString(g2d, text, x1 + 3, y1 + 10); GraphHelper.drawLine(g2d, x1, y1, x2, y2); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index 6e74784fd..f18431565 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -22,7 +22,7 @@ import com.fr.form.ui.Button; import com.fr.form.web.button.Export; import com.fr.general.Background; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -125,12 +125,12 @@ public class FormEditToolBar extends BasicPane { this.add(splitPane); list.addListSelectionListener(listSelectionListener); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UIButton bgButton = new UIButton(Inter.getLocText("FR-Designer-Output_Background_Set")); - defaultCheckBox = new UICheckBox(Inter.getLocText("FR-Designer-Output_Default_Background")); + UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set")); + defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Default_Background")); bgButton.addActionListener(actioner); backgroundPane.add(defaultCheckBox); backgroundPane.add(bgButton); - backgroundPane.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("FR-Designer-Output_Background_Set"))); + backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set"))); this.add(backgroundPane, BorderLayout.SOUTH); } @@ -149,7 +149,7 @@ public class FormEditToolBar extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer_Edit"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"); } public void populate(FormToolBar ftoolbar) { @@ -208,7 +208,7 @@ public class FormEditToolBar extends BasicPane { private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(Inter.getLocText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); this.setMnemonic('U'); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/up.png")); } @@ -239,7 +239,7 @@ public class FormEditToolBar extends BasicPane { private class MoveDownItemAction extends UpdateAction { public MoveDownItemAction() { - this.setName(Inter.getLocText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); this.setMnemonic('D'); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/down.png")); } @@ -274,7 +274,7 @@ public class FormEditToolBar extends BasicPane { public class RemoveAction extends UpdateAction { public RemoveAction() { - this.setName(Inter.getLocText("FR-Designer_Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } @@ -287,7 +287,7 @@ public class FormEditToolBar extends BasicPane { if (i < 0 || !(listModel.getElementAt(i) instanceof FormToolBarButton)) { return; } - int val = JOptionPane.showConfirmDialog(FormEditToolBar.this, Inter.getLocText("FR-Designer_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION); + int val = JOptionPane.showConfirmDialog(FormEditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION); if (val != JOptionPane.YES_OPTION) { return; } @@ -321,8 +321,8 @@ public class FormEditToolBar extends BasicPane { public void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel north = FRGUIPaneFactory.createBorderLayout_S_Pane(); - icon = new UICheckBox(Inter.getLocText("FR-Designer_Show_Icon")); - text = new UICheckBox(Inter.getLocText("FR-Designer_Show_Text")); + icon = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Icon")); + text = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Text")); north.add(icon, BorderLayout.NORTH); north.add(text, BorderLayout.CENTER); @@ -335,13 +335,14 @@ public class FormEditToolBar extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p}; - Component[][] coms = new Component[][]{{new UILabel(Inter.getLocText(new String[]{"Widget", "Printer-Alias"}) + ":"), nameField}, {new UILabel(Inter.getLocText(new String[]{"Widget", "Icon"}) + ":"), iconPane}}; + Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Alias_Name") + ":"), nameField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Icon") + ":"), iconPane}}; JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); north.add(nameIconPane, BorderLayout.SOUTH); - north.setBorder(BorderFactory.createTitledBorder(Inter.getLocText(new String[]{"Form-Button", "Property", "Set"}))); + north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Button_Setting"))); this.add(north, BorderLayout.NORTH); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); centerPane = FRGUIPaneFactory.createCardLayout_S_Pane(); @@ -358,9 +359,9 @@ public class FormEditToolBar extends BasicPane { private JPanel getCustomPane() { JPanel customPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - button = new UIButton(Inter.getLocText("FR-Designer_User_Defined_Event")); + button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_User_Defined_Event")); customPane.add(button); - customPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Edit") + "JS", null)); + customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit") + "JS", null)); button.addActionListener(l); return customPane; } @@ -368,14 +369,14 @@ public class FormEditToolBar extends BasicPane { private JPanel getExport() { JPanel export = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); // export.setLayout(new BoxLayout(export, BoxLayout.Y_AXIS)); - excelP = new UICheckBox(Inter.getLocText("FR-Designer-Output_Excel_Page")); - excelO = new UICheckBox(Inter.getLocText("FR-Designer-Output_Excel_Simple")); + excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Page")); + excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Simple")); export.add(excelP); export.add(Box.createVerticalStrut(2)); export.add(excelO); export.add(Box.createVerticalStrut(2)); - export.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText(new String[]{"Form-Button", "Property", "Set"}), null)); + export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Button_Setting"), null)); return export; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java index 0a078ed8a..542d5cdc3 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java @@ -17,7 +17,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; import com.fr.design.parameter.HierarchyTreePane; -import com.fr.general.Inter; + import javax.swing.Action; import javax.swing.BorderFactory; @@ -66,7 +66,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree @Override public String getViewTitle() { - return Inter.getLocText("Form-Hierarchy_Tree"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Hierarchy_Tree"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java index bae8f726b..b7fd82b73 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaPane.java @@ -10,7 +10,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.*; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.manage.PluginFilter; @@ -91,7 +91,7 @@ public class FormParaPane extends JPanel { } }; predefineButton.set4ToolbarButton(); - predefineButton.setToolTipText(Inter.getLocText("Widget-User_Defined_Widget_Config")); + predefineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config")); predefineButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index d5c597265..e3e3492fc 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -22,7 +22,7 @@ import com.fr.form.ui.WidgetConfig; import com.fr.form.ui.WidgetInfoConfig; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; -import com.fr.general.Inter; + import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.manage.PluginFilter; @@ -194,7 +194,7 @@ public class FormParaWidgetPane extends JPanel { JPanel paraPane = new JPanel(new FlowLayout()); ToolBarButton paraButton = new paraButton(FormWidgetOption.PARAMETERCONTAINER); paraPane.add(paraButton); - add(createNormalCombinationPane(paraPane, Inter.getLocText("FR-Designer_Parameter"))); + add(createNormalCombinationPane(paraPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"))); jSeparatorPara = createJSeparator(); add(jSeparatorPara); @@ -203,7 +203,7 @@ public class FormParaWidgetPane extends JPanel { layoutPane.add(new ToolBarButton(option)); } layoutPane.add(new ToolBarButton(FormWidgetOption.ELEMENTCASE)); - add(createNormalCombinationPane(layoutPane, Inter.getLocText("FR-Designer_Layout_Block_Blank"))); + add(createNormalCombinationPane(layoutPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Block_Blank"))); jSeparatorLayout = createJSeparator(); add(jSeparatorLayout); @@ -214,7 +214,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < COMMON_CHAR_NUM; i++) { chartTypePane.add(new ToolBarButton(loadChartOptions()[i])); } - add(createChartCombinationPane(chartTypePane, Inter.getLocText("FR-Designer-Form-ToolBar_Chart"))); + add(createChartCombinationPane(chartTypePane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"))); jSeparatorChart = createJSeparator(); add(jSeparatorChart); } @@ -229,7 +229,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < num; i++) { widgetPane.add(new ToolBarButton(predifinedwidgeList.get(i))); } - add(createWidgetCombinationPane(widgetPane, Inter.getLocText("FR-Designer-Form-ToolBar_Widget"))); + add(createWidgetCombinationPane(widgetPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Widget"))); add(createJSeparator()); } @@ -277,7 +277,7 @@ public class FormParaWidgetPane extends JPanel { reportPane.add(jComponent, BorderLayout.CENTER); JPanel labelPane = new JPanel(new BorderLayout()); UILabel label = new UILabel(typeName, UILabel.CENTER); - if (ComparatorUtils.equals(Inter.getLocText("FR-Designer_Parameter"), typeName)) { + if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"), typeName)) { paraLabel = label; } labelPane.add(label, BorderLayout.CENTER); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java index 5aa874bd2..517be698b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java @@ -18,7 +18,7 @@ import com.fr.form.ui.Widget; import com.fr.form.ui.container.WTitleLayout; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import java.awt.Component; import java.awt.Point; @@ -105,7 +105,7 @@ public class FormSelectionUtils { x + creator.getX() - rec.x + copiedCreator.getWidth() / 2, y + creator.getY() - rec.y + copiedCreator.getHeight() / 2); if (!adapter.accept(copiedCreator, point.x, point.y)) { - designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Large_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Large_To_Paste")); return; } resetTabSub2RealSize(copiedCreator); @@ -185,12 +185,12 @@ public class FormSelectionUtils { XCreator copiedXCreator = XCreatorUtils.createXCreator(copied, creator.getSize()); if (adapter.getClass().equals(FRTabFitLayoutAdapter.class)) { if (!adapter.accept(copiedXCreator, x - tabContainerRect.x, y - tabContainerRect.y)) { - designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); return; } } else { if (!adapter.accept(copiedXCreator, x, y)) { - designer.showMessageDialog(Inter.getLocText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); return; } } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java index c84776789..a8bfa05ea 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java @@ -6,7 +6,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -29,10 +29,10 @@ public class FormSettingToolBar extends JPanel { this.add(new UILabel(name)); this.toolBarPane = toolBarPane; setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon); - setButton.setToolTipText(Inter.getLocText("FR-Designer_Edit_Button_ToolBar")); + setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_Button_ToolBar")); setButton.setAction(new SetAction()); delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon); - delButton.setToolTipText(Inter.getLocText("FR-Designer_Remove_Button_ToolBar")); + delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Button_ToolBar")); delButton.setAction(new DelAction()); this.add(setButton); this.add(delButton); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java b/designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java index eb72e843a..f80ce94eb 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java @@ -8,7 +8,7 @@ import com.fr.design.gui.core.WidgetOptionFactory; import com.fr.design.gui.itable.PropertyGroup; import com.fr.design.designer.properties.WidgetPropertyTable; import com.fr.form.parameter.FormSubmitButton; -import com.fr.general.Inter; + public class FormTargetMode extends FormDesignerModeForSpecial { @@ -21,7 +21,7 @@ public class FormTargetMode extends FormDesignerModeForSpecial { */ public WidgetOption[] getPredefinedWidgetOptions() { return new WidgetOption[]{ - WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Query", "Form-Button"}), + WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/preview_16.png"), FormSubmitButton.class)}; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java index 4bf970234..41b23c04e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java @@ -8,7 +8,7 @@ import com.fr.form.web.button.ExcelP; import com.fr.form.web.button.Export; import com.fr.form.web.button.page.*; import com.fr.general.IOUtils; -import com.fr.general.Inter; + /** * Created by harry on 2017-3-3. @@ -23,32 +23,33 @@ public class FormWebWidgetConstants { } // 当前页/总页数 - public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"HJS-Current_Page", "HF-Number_of_Page"}, new String[]{"/", ""}), + public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Page_Navi_Text"), IOUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class); // 首页 - public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Engine_ReportServerP-First"), IOUtils.readIcon("/com/fr/web/images/first.png"), + public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), IOUtils.readIcon("/com/fr/web/images/first.png"), First.class); // 末页 - public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Engine_ReportServerP-Last"), IOUtils.readIcon("/com/fr/web/images/last.png"), + public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Last"), IOUtils.readIcon("/com/fr/web/images/last.png"), Last.class); // 前一页 - public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Engine_ReportServerP-Previous"), + public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Previous"), IOUtils.readIcon("/com/fr/web/images/previous.png"), Previous.class); // 后一页 - public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(Inter.getLocText("FR-Engine_ReportServerP-Next"), IOUtils.readIcon("/com/fr/web/images/next.png"), + public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Next"), IOUtils.readIcon("/com/fr/web/images/next.png"), Next.class); // 导出成Excel 分页导出 - public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "FR-Designer_Export_Excel_Page"}, new String[]{"(", ")"}), + public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); // 导出成Excel 原样导出 - public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(Inter.getLocText(new String[]{"Excel", "FR-Designer_Export_Excel_Simple"}, new String[]{"(", ")"}), + public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory - .createByWidgetClass(Inter.getLocText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory - .createByWidgetClass(Inter.getLocText(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Toolbar_Custom_Button"), CustomToolBarButton.class); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index f94fe1664..e00510fb7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.share.ShareLoader; import com.fr.form.ui.SharableWidgetBindInfo; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.general.CloudCenter; import com.fr.share.ShareConstants; import com.fr.stable.ArrayUtils; @@ -54,8 +54,8 @@ public class FormWidgetDetailPane extends FormDockView{ private boolean isEdit; private CardLayout card; - private static final String REPORT_TAB = Inter.getLocText("FR-Engine_Report"); - private static final String CHART_TAB = Inter.getLocText("FR-Designer-Form-ToolBar_Chart"); + private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report"); + private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"); public static FormWidgetDetailPane getInstance() { if (HOLDER.singleton == null) { @@ -80,7 +80,7 @@ public class FormWidgetDetailPane extends FormDockView{ } public String getViewTitle() { - return Inter.getLocText("FR-Widget_Tree_And_Table"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Tree_And_Table"); } @Override @@ -141,7 +141,7 @@ public class FormWidgetDetailPane extends FormDockView{ // menutPanel.setPreferredSize(new Dimension(240, 48)); menutPanelNorthPane = new JPanel(new BorderLayout()); - menutPanelNorthPane.add(new UILabel(Inter.getLocText("FR-Designer_LocalWidget"), + menutPanelNorthPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LocalWidget"), SwingConstants.HORIZONTAL), BorderLayout.WEST); menutPanelNorthPane.add(initEditButtonPane(), BorderLayout.EAST); menutPanelNorthPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); @@ -174,7 +174,7 @@ public class FormWidgetDetailPane extends FormDockView{ */ private JPanel initResetButtonPane() { resetPanel = new JPanel(); - resetButton = new UIButton(Inter.getLocText("FR-Designer_Reset")); + resetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reset")); resetPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); resetButton.setBackground(Color.white); resetButton.setForeground(new Color(0x333334)); @@ -187,7 +187,7 @@ public class FormWidgetDetailPane extends FormDockView{ } }); - deleteButton = new UIButton(Inter.getLocText("FR-Designer_Remove_Item")); + deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Item")); deleteButton.setBackground(Color.white); deleteButton.setForeground(new Color(0xeb1d1f)); deleteButton.addActionListener(new ActionListener() { @@ -197,12 +197,12 @@ public class FormWidgetDetailPane extends FormDockView{ refreshShareMoudule(); reuWidgetPanel.remove(deleteButton); elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Removed_Successful")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Successful")); refreshDownPanel(false); replaceButtonPanel(false); refreshComboxData(); } else { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Removed_Failed")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Failed")); } } @@ -259,7 +259,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton createRefreshButton() { return createToolButton( BaseUtils.readIcon("/com/fr/design/form/images/refresh.png"), - Inter.getLocText("FR-Designer_Refresh"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -294,7 +294,7 @@ public class FormWidgetDetailPane extends FormDockView{ UIButton downloadButton = new UIButton(); downloadButton.setIcon(BaseUtils.readIcon("/com/fr/design/form/images/download icon.png")); downloadButton.set4ToolbarButton(); - downloadButton.setToolTipText(Inter.getLocText("FR-Designer_Download_Template")); + downloadButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Download_Template")); downloadButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -306,7 +306,7 @@ public class FormWidgetDetailPane extends FormDockView{ try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); } catch (URISyntaxException exp) { FineLoggerFactory.getLogger().error(exp.getMessage(), exp); @@ -325,14 +325,14 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton createInstallButton() { return createToolButton( BaseUtils.readIcon("/com/fr/design/form/images/install icon.png"), - Inter.getLocText("FR-Designer_Install_Template"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Install_Template"), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { JFileChooser fileChooser = new JFileChooser(); fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); fileChooser.setFileFilter(new FileNameExtensionFilter(".reu", "reu")); - int returnValue = fileChooser.showDialog(new UILabel(), Inter.getLocText("FR-Designer_Select")); + int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); if (returnValue == JFileChooser.APPROVE_OPTION) { final File chosenFile = fileChooser.getSelectedFile(); installFromDiskZipFile(chosenFile); @@ -348,7 +348,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton createDeleteButton() { return createToolButton( BaseUtils.readIcon("/com/fr/design/form/images/delete icon.png"), - Inter.getLocText("FR-Designer_Delete_Template"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete_Template"), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -378,12 +378,12 @@ public class FormWidgetDetailPane extends FormDockView{ elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList(); refreshDownPanel(false); refreshComboxData(); - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_OK")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_OK")); } else { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Error")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error")); } } catch (IOException e) { - JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Share_Module_Error")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error")); FineLoggerFactory.getLogger().error(e.getMessage(), e); } } @@ -401,7 +401,7 @@ public class FormWidgetDetailPane extends FormDockView{ * 获取报表块组件分类 */ public String[] getFormCategories() { - return ArrayUtils.addAll(new String[] {Inter.getLocText("FR-Designer_AllCategories")}, ShareLoader.getLoader().getModuleCategory()); + return ArrayUtils.addAll(new String[] {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AllCategories")}, ShareLoader.getLoader().getModuleCategory()); } public void refreshDownPanel(boolean isEdit) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 4f9837806..b219f6396 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -55,7 +55,7 @@ import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.page.PaperSettingProvider; import com.fr.report.worksheet.FormElementCase; @@ -643,9 +643,9 @@ public class JForm extends JTemplate implements BaseJForm { return dim; } }; - UILabel uiLabel = new UILabel(Inter.getLocText(new String[]{"DashBoard-FormBook", "Privilege", "Edit"})); + UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Authority_Edit")); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(Inter.getLocText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; @@ -691,7 +691,7 @@ public class JForm extends JTemplate implements BaseJForm { * @return 菜单 */ public UIMenuItem[] createMenuItem4Preview() { - UIMenuItem form = new UIMenuItem(Inter.getLocText("M-Form_Preview"), UIConstants.RUN_SMALL_ICON); + UIMenuItem form = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("M-Form_Preview"), UIConstants.RUN_SMALL_ICON); form.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/MobileParaWidgetTable.java b/designer-form/src/main/java/com/fr/design/mainframe/MobileParaWidgetTable.java index e7e5089b5..fccf60e70 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/MobileParaWidgetTable.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/MobileParaWidgetTable.java @@ -11,7 +11,7 @@ import com.fr.form.ui.Label; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WParameterLayout; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.*; @@ -38,7 +38,7 @@ class MobileParaWidgetTable extends JTable { private FormDesigner designer; private String[][] cellData; - private String[] headers = {Inter.getLocText("FR-Designer_Label"), Inter.getLocText("FR-Designer_Widgetname")}; + private String[] headers = {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widgetname")}; private static final int WIDGET_TABLE_ROW_HEIGHT = 22; private static final int UITEXTFIELD_WIDTH = 0; private static final int GAP = 11; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/MobileWidgetTable.java b/designer-form/src/main/java/com/fr/design/mainframe/MobileWidgetTable.java index 982f5aad0..49733cd44 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/MobileWidgetTable.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/MobileWidgetTable.java @@ -18,7 +18,7 @@ import com.fr.design.gui.itable.GroupRenderer; import com.fr.form.ui.Widget; import com.fr.form.ui.container.*; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; /** @@ -33,7 +33,7 @@ public class MobileWidgetTable extends JTable { private FormDesigner designer; private String[][] cellData; - private String[] headers = {Inter.getLocText("Form-Widget_Name")}; + private String[] headers = {com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")}; private static final int WIDGET_TABLE_ROW_HEIGHT = 22; private UILabel moveComponent = new UILabel(); // 作为拖动时候随鼠标移动的那个半透明控件 private int selectedRow = -1; @@ -267,7 +267,7 @@ public class MobileWidgetTable extends JTable { mobileWidgetList = body.getOrderedMobileWidgetList(); } String[][] widgetName = new String[mobileWidgetList.size() + 1][1]; - widgetName[0][0] = Inter.getLocText("FR-Designer_WidgetOrder"); + widgetName[0][0] = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetOrder"); for (int i = 0; i < mobileWidgetList.size(); i++) { widgetName[i + 1][0] = mobileWidgetList.get(i); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java index ee4f27286..5a5124f60 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java @@ -20,7 +20,7 @@ import javax.swing.JToolTip; import com.fr.base.BaseUtils; import com.fr.design.layout.TableLayoutHelper; -import com.fr.general.Inter; + import com.fr.stable.Constants; import com.fr.base.GraphHelper; import com.fr.design.gui.itooltip.MultiLineToolTip; @@ -41,15 +41,15 @@ public class WLayoutSelectionPane extends BasicPane { private KindPane currentKindPane; public WLayoutSelectionPane() { - this.setBorder(BorderFactory.createTitledBorder(Inter.getLocText("Form-Please_Select_A_Kind_Of_Form_Container") + ":")); + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Form-Please_Select_A_Kind_Of_Form_Container") + ":")); this.setLayout(FRGUIPaneFactory.createBorderLayout()); Component[][] coms = { - {createTypeLabel(Inter.getLocText("BorderLayout")), new + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout")), new BorderLayoutPane()}, - {createTypeLabel(Inter.getLocText("GridLayout")), new GridLayoutPane()}, - {createTypeLabel(Inter.getLocText("CardLayout")), new CardLayoutPane()}, - {createTypeLabel(Inter.getLocText("Form-NullLayout")), new AbsoluteLayoutPane()}}; + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("GridLayout")), new GridLayoutPane()}, + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("CardLayout")), new CardLayoutPane()}, + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Form-NullLayout")), new AbsoluteLayoutPane()}}; double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] rowSize = {p, p, p, p, p}; @@ -65,7 +65,7 @@ public class WLayoutSelectionPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Widget-Form_Widget_Container"); + return com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); } @Override @@ -78,11 +78,11 @@ public class WLayoutSelectionPane extends BasicPane { public BorderLayoutPane() { this.setLayout(new /* */ GridLayout(1, 4, 5, 5)); KindPane b1 = new KindPane("/com/fr/web/images/form/layout_border_nc.png", new WBorderLayout(0, 0, new String[]{WBorderLayout.NORTH, WBorderLayout.CENTER})); - b1.setToolTipText(Inter.getLocText("WLayout-Border-LayoutContainer")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-LayoutContainer")); KindPane b2 = new KindPane("/com/fr/web/images/form/layout_border_ncw.png", new WBorderLayout(0, 0, new String[]{WBorderLayout.WEST, WBorderLayout.NORTH, WBorderLayout.CENTER})); - b2.setToolTipText(Inter.getLocText("WLayout-Border-ThreeContainer")); + b2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ThreeContainer")); KindPane b4 = new KindPane("/com/fr/web/images/form/layout_border_all.png", new WBorderLayout(0, 0)); - b4.setToolTipText(Inter.getLocText("WLayout-Border-ToolTips")); + b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ToolTips")); this.add(b1); this.add(b2); this.add(b4); @@ -100,13 +100,13 @@ public class WLayoutSelectionPane extends BasicPane { public GridLayoutPane() { this.setLayout(new/**/ GridLayout(1, 4, 5, 5)); KindPane b1 = new KindPane("/com/fr/web/images/form/layout_grid_2x2.png", new WGridLayout(2, 2, 0, 0)); - b1.setToolTipText(Inter.getLocText(new String[]{"Two_Rows_Of_Two_Grid", "Layout_Container"})); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_2x2")); KindPane b2 = new KindPane("/com/fr/web/images/form/layout_grid_2x3.png", new WGridLayout(2, 3, 0, 0)); - b2.setToolTipText(Inter.getLocText(new String[]{"Two_Rows_Of_Three_Grid", "Layout_Container"})); + b2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_2x3")); KindPane b3 = new KindPane("/com/fr/web/images/form/layout_grid_3x2.png", new WGridLayout(3, 2, 0, 0)); - b3.setToolTipText(Inter.getLocText(new String[]{"Three_Rows_Of_Two_Grid", "Layout_Container"})); + b3.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_3x2")); KindPane b4 = new KindPane("/com/fr/web/images/form/layout_grid_3x3.png", new WGridLayout(3, 3, 0, 0)); - b4.setToolTipText(Inter.getLocText(new String[]{"Three_Rows_Of_Three_Grid", "Layout_Container"})); + b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_3x3")); this.add(b1); this.add(b2); this.add(b3); @@ -124,7 +124,7 @@ public class WLayoutSelectionPane extends BasicPane { public CardLayoutPane() { this.setLayout(new /* */ GridLayout(1, 4, 5, 5)); KindPane b1 = new KindPane("/com/fr/web/images/form/layout_absolute_big.png", new WCardLayout()); - b1.setToolTipText(Inter.getLocText("WLayout-Card-ToolTip")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Card-ToolTip")); this.add(b1); this.add(new UILabel()); this.add(new UILabel()); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetHelpDialog.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetHelpDialog.java index d45c7c321..92afcfd2b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetHelpDialog.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetHelpDialog.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe; import com.fr.design.dialog.UIDialog; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.itextarea.UITextArea; -import com.fr.general.Inter; + import javax.swing.JFrame; import javax.swing.JPanel; @@ -52,7 +52,7 @@ public class WidgetHelpDialog extends UIDialog { contentPane.setLayout(new BorderLayout()); add(helpArea, BorderLayout.CENTER); this.applyClosingAction(); - this.setTitle(Inter.getLocText("FR-Designer_Help")); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help")); } /** diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index c0baf9151..b62725caa 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -15,7 +15,7 @@ import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.ui.FormWidgetCardPane; import com.fr.design.widget.ui.designer.mobile.MobileWidgetDefinePane; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import javax.swing.*; @@ -66,13 +66,13 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Widget_Settings"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"); } @Override public String getViewTitle() { - return Inter.getLocText("Form-Widget_Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Table"); } @Override @@ -210,7 +210,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope // "无可用配置项"面板 private JPanel getUnavailablePane() { JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel label = new UILabel(Inter.getLocText("FR-Designer_No_Settings_Available")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); label.setHorizontalAlignment(SwingConstants.CENTER); panel.add(label); return panel; @@ -218,15 +218,15 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope private void initTabPane() { final String[] tabTitles = new String[]{ - Inter.getLocText("FR-Designer_Properties"), - Inter.getLocText("FR-Designer_Event"), - Inter.getLocText("FR-Widget_Mobile_Terminal") + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties"), + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"), + com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal") }; final CardLayout tabbedPane = new CardLayout(); final JPanel center = new JPanel(tabbedPane); - center.add(formWidgetCardPane, Inter.getLocText("FR-Designer_Properties")); - center.add(eventTable, Inter.getLocText("FR-Designer_Event")); - center.add(wsp, Inter.getLocText("FR-Widget_Mobile_Terminal")); + center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties")); + center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event")); + center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal")); this.add(center, BorderLayout.CENTER); tabsHeaderIconPane = new UIHeadGroup(tabTitles) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index 5599bfe16..c6dfdd9ed 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -8,7 +8,7 @@ import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.module.DesignModuleFactory; -import com.fr.general.Inter; + import javax.swing.JComponent; import javax.swing.JPanel; @@ -133,7 +133,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide private void initFormButtons() { if (componentsList4Form.isEmpty()) { // 表单布局 - this.componentsList4Form.add(new TitleLabel(Inter.getLocText("Form-Layout"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout"))); WidgetOption[] containerWidgetArray = FormWidgetOption.getFormContainerInstance(); for (WidgetOption no : containerWidgetArray) { this.componentsList4Form.add(new ToolBarButton(no)); @@ -143,9 +143,9 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide // 这个条件说明是否加载了图表模块 if (wo != null && wo.length > 0) { - this.componentsList4Form.add(new TitleLabel(Inter.getLocText("Chart"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); - chartButton.setToolTipText(Inter.getLocText("Click-Me")); + chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Me")); chartButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java index e921429f7..300b762f0 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java @@ -18,7 +18,7 @@ import com.fr.file.filter.ChooseFileFilter; import com.fr.form.main.Form; import com.fr.form.main.FormEmbeddedTableDataExporter; import com.fr.log.FineLoggerFactory; -import com.fr.general.Inter; + import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.project.ProjectConstants; @@ -86,10 +86,10 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ FineLoggerFactory.getLogger().error("Error In Make New File"); } fileChooserPane = null; - FRContext.getLogger().info("\"" + file.getName() + "\"" + Inter.getLocText("FR-Designer_Prepare_Export") + "!"); + FRContext.getLogger().info("\"" + file.getName() + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Prepare_Export") + "!"); (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame, - Inter.getLocText("FR-Designer_Exporting"), "", 0, 100)).start(); + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exporting"), "", 0, 100)).start(); } private boolean isOk(int saveValue){ @@ -115,7 +115,7 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ } protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(new String[]{"frm"}, Inter.getLocText("FR-Designer_Form_EmbeddedTD")); + return new ChooseFileFilter(new String[]{"frm"}, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form_EmbeddedTD")); } private SwingWorker createExportWork(FILE file, final Form tpl, final Map parameterMap) { @@ -135,13 +135,13 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ fileOutputStream.close(); this.setProgress(100); - FRContext.getLogger().info("\"" + fileGetName + "\"" + Inter.getLocText("FR-Designer_Finish_Export") + "!"); + FRContext.getLogger().info("\"" + fileGetName + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - Inter.getLocText("FR-Designer_Exported_successfully") + "\n" + fileGetName); + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exported_successfully") + "\n" + fileGetName); } catch (Exception exp) { this.setProgress(100); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Export_failed") + "\n" + filePath); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_failed") + "\n" + filePath); } return null; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java index 7bd34fa76..7a68a04a5 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java @@ -14,7 +14,7 @@ import com.fr.design.menu.MenuKeySet; import com.fr.file.FILE; import com.fr.form.main.Form; import com.fr.form.main.mobile.FormMobileAttr; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.event.ActionEvent; @@ -82,7 +82,7 @@ public class FormMobileAttrAction extends JTemplateAction { @Override public String getMenuName() { - return Inter.getLocText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java index 275d02f4e..13cd907d8 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java @@ -6,7 +6,7 @@ import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.MenuKeySet; -import com.fr.general.Inter; + import com.fr.stable.bridge.StableFactory; import javax.swing.KeyStroke; @@ -44,7 +44,7 @@ public class NewFormAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M-New_FormBook"); + return com.fr.design.i18n.Toolkit.i18nText("M-New_FormBook"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java index 4a515ded4..f1123a140 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java @@ -15,16 +15,16 @@ import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.border.Border; -import com.fr.general.Inter; + import com.fr.design.layout.FRGUIPaneFactory; public class ColorPalette extends JPopupMenu { private Border BLACK_BORDER = BorderFactory.createLineBorder(new Color(127, 157, 185)); - private Object[] colors = new Object[]{new Object[]{Inter.getLocText("Black"), new Color(0, 0, 0)}, new Object[]{Inter.getLocText("Crimson"), new Color(128, 0, 0)}, new Object[]{Inter.getLocText("Red"), new Color(255, 0, 0)}, - new Object[]{Inter.getLocText("Pink"), new Color(255, 0, 255)}, new Object[]{Inter.getLocText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{Inter.getLocText("Brown"), new Color(153, 51, 0)}, - new Object[]{Inter.getLocText("Orange"), new Color(255, 102, 0)}, new Object[]{Inter.getLocText("Light_Orange"), new Color(255, 153, 0)}, new Object[]{Inter.getLocText("Golden"), new Color(255, 204, 0)}, - new Object[]{Inter.getLocText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, + private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Golden"), new Color(255, 204, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)}, new Object[]{"", new Color(51, 153, 102)}, new Object[]{"", new Color(172, 168, 153)}, new Object[]{"", new Color(204, 255, 204)}, new Object[]{"", new Color(0, 51, 102)}, new Object[]{"", new Color(0, 128, 128)}, new Object[]{"", new Color(51, 204, 204)}, new Object[]{"", new Color(0, 255, 255)}, new Object[]{"", new Color(204, 255, 255)}, @@ -69,7 +69,7 @@ public class ColorPalette extends JPopupMenu { bottom_bar.setLayout(new /**/GridLayout(1, 1)); bottom_bar.setBorderPainted(false); bottom_bar.setFloatable(false); - btnCustom = getBtn(Inter.getLocText("Custom") + "..."); + btnCustom = getBtn(com.fr.design.i18n.Toolkit.i18nText("Custom") + "..."); bottom_bar.add(btnCustom); return bottom_bar; } @@ -113,7 +113,7 @@ public class ColorPalette extends JPopupMenu { top_bar.setOpaque(false); top_bar.setFloatable(false); top_bar.setLayout(new /**/GridLayout(1, 1)); - btnDefault = getBtn(Inter.getLocText("Form-Restore_Default_Value")); + btnDefault = getBtn(com.fr.design.i18n.Toolkit.i18nText("Form-Restore_Default_Value")); top_bar.add(btnDefault); return top_bar; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java index d268aca22..d5e1ff93a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java @@ -10,7 +10,7 @@ import java.awt.event.ActionListener; import com.fr.design.Exception.ValidationException; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.DictionaryComboBox; -import com.fr.general.Inter; + /** * @author richer @@ -18,7 +18,7 @@ import com.fr.general.Inter; */ public class AdjustModeEditor extends AbstractPropertyEditor { public static final String[] AjustRowTypes = new String[] { - Inter.getLocText("No"), Inter.getLocText("Utils-Row_Height"), Inter.getLocText("Utils-Column_Width"), Inter.getLocText("Default")}; + com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Default")}; private UIComboBox combobox; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java index c4f8267d9..e0521f5b1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java @@ -10,16 +10,16 @@ import com.fr.design.gui.icombobox.ComboCheckBox; import com.fr.design.designer.properties.items.FRBorderConstraintsItems; import com.fr.design.designer.properties.items.Item; import com.fr.form.ui.container.WBorderLayout; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { public static final Item[] ITEMS = new Item[] { - new Item(Inter.getLocText("BorderLayout-North"), WBorderLayout.NORTH), - new Item(Inter.getLocText("BorderLayout-South"), WBorderLayout.SOUTH), - new Item(Inter.getLocText("BorderLayout-West"), WBorderLayout.WEST), - new Item(Inter.getLocText("BorderLayout-East"), WBorderLayout.EAST) }; + new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST), + new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST) }; private ComboCheckBox comboBox; @@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { setText(StringUtils.join("、", res)); } } else { - setText(Inter.getLocText("None")); + setText(com.fr.design.i18n.Toolkit.i18nText("None")); } return this; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java index 28c15d256..8f739f8c1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java @@ -1,13 +1,13 @@ package com.fr.design.mainframe.widget.editors; import com.fr.design.designer.properties.items.Item; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; public class ButtonTypeEditor extends ComboEditor { public ButtonTypeEditor() { - super(new Item[] { new Item(Inter.getLocText("Default"), false), new Item(Inter.getLocText("Custom"), true), }); + super(new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Default"), false), new Item(com.fr.design.i18n.Toolkit.i18nText("Custom"), true), }); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DataTableConfigPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DataTableConfigPane.java index c9582ad61..6270ebd6d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DataTableConfigPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DataTableConfigPane.java @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.ilable.UILabel; import com.fr.form.data.DataTableConfig; -import com.fr.general.Inter; + import com.fr.stable.core.PropertyChangeListener; import javax.swing.*; @@ -184,7 +184,7 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis * Constructor */ public CutAction() { - this.setName(Inter.getLocText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER)); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java index 247e611b1..9d17e4199 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java @@ -9,7 +9,7 @@ import javax.swing.JPanel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; + public class DimensionEditingPane extends BasicPane { @@ -24,8 +24,8 @@ public class DimensionEditingPane extends BasicPane { private void initComponents() { setLayout(new/**/ GridLayout(2, 1)); - jLabel1 = new com.fr.design.gui.ilable.UILabel(Inter.getLocText("Widget-Width") + ":"); - jLabel2 = new com.fr.design.gui.ilable.UILabel(Inter.getLocText("Widget-Height") + ":"); + jLabel1 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Width") + ":"); + jLabel2 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Height") + ":"); spWidth = new UISpinner(0, Integer.MAX_VALUE, 1, 0); spHeight = new UISpinner(0, Integer.MAX_VALUE, 1, 0); @@ -46,7 +46,7 @@ public class DimensionEditingPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("Widget-Sizing"); + return com.fr.design.i18n.Toolkit.i18nText("Widget-Sizing"); } public Dimension update() { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java index f25ed791a..a8e901b0b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java @@ -14,7 +14,7 @@ import com.fr.form.ui.Widget; import com.fr.form.web.FormToolBarManager; import com.fr.form.web.Location; import com.fr.general.IOUtils; -import com.fr.general.Inter; + import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -39,7 +39,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane private int row = 6; private DefaultTableModel toolbarButtonTableModel; private JTable layoutTable; - private UICheckBox isUseToolBarCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Use_ToolBar") + ":"); // 是否使用工具栏 + private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_ToolBar") + ":"); // 是否使用工具栏 private FormToolBarPane northToolBar; private FormToolBarPane southToolBar; @@ -50,7 +50,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane toolbarButtonTableModel = new TableModel(row ,COLUMN); this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel north = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UIButton defaultButton = new UIButton(Inter.getLocText("FR-Designer_Restore_Default")); + UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Restore_Default")); // 恢复默认按钮 defaultButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -98,7 +98,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane northToolBar.validate(); northToolBar.repaint(); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); } } }); @@ -123,7 +123,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane southToolBar.validate(); southToolBar.repaint(); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); } } }); @@ -144,13 +144,13 @@ public class ElementCaseToolBarPane extends BasicBeanPane southToolBar.setBackground(Color.lightGray); JPanel movePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - FormSettingToolBar top = new FormSettingToolBar(Inter.getLocText("FR-Designer_ToolBar_Top"), northToolBar); + FormSettingToolBar top = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Top"), northToolBar); northContentPane.add(top, BorderLayout.EAST); northContentPane.add(northToolBar, BorderLayout.CENTER); northContentPane.setBackground(Color.lightGray); JPanel southContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - FormSettingToolBar bottom = new FormSettingToolBar(Inter.getLocText("FR-Designer_ToolBar_Bottom"), southToolBar); + FormSettingToolBar bottom = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Bottom"), southToolBar); southContentPane.add(bottom, BorderLayout.EAST); southContentPane.add(southToolBar, BorderLayout.CENTER); southContentPane.setBackground(Color.lightGray); @@ -171,7 +171,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane layoutTable.setColumnSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false); layoutTable.setBackground(Color.WHITE); - int columnWidth = Integer.parseInt(Inter.getLocText("FR-Designer_LayoutTable_Column_Width")); + int columnWidth = Integer.parseInt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LayoutTable_Column_Width")); for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); } @@ -241,7 +241,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"Form-EC_toolbar", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Toolbar_Setting"); } public void setCheckBoxSelected(boolean b) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java index 3cdcebe11..e49520e04 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java @@ -18,7 +18,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.PaddingMargin; -import com.fr.general.Inter; + /** * @author richer @@ -38,34 +38,34 @@ public class PaddingMarginPane extends BasicPane { contentPane = new JPanel(new GridLayout(2, 2, 4, 4)); this.add(contentPane); JPanel topPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - topPane.add(new UILabel(Inter.getLocText("FR-Base_Top") + " "), BorderLayout.WEST); + topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Top") + " "), BorderLayout.WEST); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); topPane.add(topSpinner, BorderLayout.CENTER); - UILabel topLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Indent-Pixel") + " "); + UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); topPane.add(topLabel, BorderLayout.EAST); contentPane.add(topPane); JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - leftPane.add(new UILabel(Inter.getLocText("FR-Base_Left") + " "), BorderLayout.WEST); + leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Left") + " "), BorderLayout.WEST); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); leftPane.add(leftSpinner, BorderLayout.CENTER); - UILabel leftLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Indent-Pixel") + " "); + UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); leftPane.add(leftLabel, BorderLayout.EAST); contentPane.add(leftPane); JPanel bottomPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - bottomPane.add(new UILabel(Inter.getLocText("FR-Base_Bottom") + " "), BorderLayout.WEST); + bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Bottom") + " "), BorderLayout.WEST); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); bottomPane.add(bottomSpinner, BorderLayout.CENTER); - UILabel bottomLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Indent-Pixel") + " "); + UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); bottomPane.add(bottomLabel, BorderLayout.EAST); contentPane.add(bottomPane); JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - rightPane.add(new UILabel(Inter.getLocText("FR-Base_Right") + " "), BorderLayout.WEST); + rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Right") + " "), BorderLayout.WEST); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); rightPane.add(rightSpinner, BorderLayout.CENTER); - UILabel rightLabel = new UILabel(" " + Inter.getLocText("FR-Designer_Indent-Pixel") + " "); + UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); rightPane.add(rightLabel, BorderLayout.EAST); contentPane.add(rightPane); } @@ -103,7 +103,7 @@ public class PaddingMarginPane extends BasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Base_Margin"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Margin"); } public void populate(PaddingMargin pm) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java index 8b13c4e07..724e840aa 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java @@ -3,7 +3,7 @@ package com.fr.design.mainframe.widget.ui; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -26,8 +26,8 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane { if(otherOtherConfig != null){ pane2.add(otherOtherConfig); } - visibleCheckBox = new UICheckBox(Inter.getLocText("Widget-Visible"), true); - visibleCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic")); + visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Visible"), true); + visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); pane2.add(visibleCheckBox); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java index ccb3a1e91..5755e1959 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.widget.ui; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.form.ui.Widget; -import com.fr.general.Inter; + import javax.swing.BorderFactory; /** @@ -16,8 +16,8 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane { } public UICheckBox createOtherConfig() { - enableCheckBox = new UICheckBox(Inter.getLocText("Enabled"), true); - enableCheckBox.setGlobalName(Inter.getLocText("FR-Designer_Basic")); + enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Enabled"), true); + enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); return enableCheckBox; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 538f26099..b55f6a3e5 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -32,7 +32,7 @@ import com.fr.form.ui.container.WScaleLayout; import com.fr.form.ui.container.WTitleLayout; import com.fr.form.ui.widget.CRBoundsWidget; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; import javax.swing.BorderFactory; @@ -151,7 +151,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { widgetPropertyPane = WidgetBasicPropertyPaneFactory.createBasicPropertyPane(innerCreator); - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Basic"), 280, 20, widgetPropertyPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 280, 20, widgetPropertyPane); jPanel.add(uiExpandablePane, BorderLayout.NORTH); @@ -211,11 +211,11 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { public void updateCreator() { currentEditorDefinePane.setGlobalName(getGlobalName()); Widget widget = currentEditorDefinePane.updateBean(); - if (ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Basic")) && widgetPropertyPane != null) { + if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")) && widgetPropertyPane != null) { UITextField widgetNameField = widgetPropertyPane.getWidgetNameField(); if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) { widgetNameField.setText(widget.getWidgetName()); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText("FR-Designer_Form_Widget_Rename_Failure"), Inter.getLocText("FR-Designer_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png")); return; } widgetPropertyPane.update(widget); @@ -228,7 +228,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public void updateWidgetBound() { - if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), Inter.getLocText("FR-Designer_Coords_And_Size"))) { + if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"))) { widgetBoundPane.update(); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java index e244c2a22..6647f5013 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java @@ -4,7 +4,7 @@ import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; import com.fr.form.web.FormToolBarManager; -import com.fr.general.Inter; + /** * Created by harry on 2017-3-1. @@ -27,8 +27,8 @@ public class ElementCaseToolBarWrapper implements Encoder, Decoder { } FormToolBarManager[] toolBarManager = (FormToolBarManager[])v; if (toolBarManager.length != 0) { - return Inter.getLocText("FR-Designer_Open"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"); } - return Inter.getLocText("FR-Designer_Close"); + return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); } } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java index 86ddc277e..6c666dfb2 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.widget.wrappers; import com.fr.design.designer.properties.Encoder; import com.fr.design.designer.properties.NameWithListeners; -import com.fr.general.Inter; + public class EventHandlerWrapper implements Encoder { @@ -12,7 +12,7 @@ public class EventHandlerWrapper implements Encoder { return null; } else { NameWithListeners handler = (NameWithListeners) v; - return Inter.getLocText("Page_Total") + handler.getCountOfListeners4ThisName() + Inter.getLocText("Ge") + handler.getName() + Inter.getLocText("Event"); + return com.fr.design.i18n.Toolkit.i18nText("Page_Total") + handler.getCountOfListeners4ThisName() + com.fr.design.i18n.Toolkit.i18nText("Ge") + handler.getName() + com.fr.design.i18n.Toolkit.i18nText("Event"); } } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java index f66e438be..f6dc5361b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java @@ -7,7 +7,7 @@ import com.fr.base.BaseFormula; import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; -import com.fr.general.Inter; + import com.fr.stable.StringUtils; /** @@ -40,6 +40,6 @@ public class FormulaWrapper implements Encoder, Decoder{ if (txt.length() > 0 && txt.charAt(0) == '=') { return; } - throw new ValidationException(Inter.getLocText("Formula_Tips")); + throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Formula_Tips")); } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/GridWidgetWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/GridWidgetWrapper.java index 9c031668f..0ae134a29 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/GridWidgetWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/GridWidgetWrapper.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.widget.wrappers; -import com.fr.general.Inter; + import com.fr.design.designer.properties.Encoder; public class GridWidgetWrapper implements Encoder { @@ -8,7 +8,7 @@ public class GridWidgetWrapper implements Encoder { @Override public String encode(Object v) { if (v != null) { - return Inter.getLocText(new String[]{"Widget", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Setting"); } return null; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java index bd2a32199..12b516bfa 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java @@ -3,7 +3,7 @@ */ package com.fr.design.mainframe.widget.wrappers; -import com.fr.general.Inter; + import com.fr.js.NameJavaScriptGroup; import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; @@ -26,10 +26,10 @@ public class HyperlinkGroupWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v == null) { - return Inter.getLocText(new String[]{"HF-Undefined", "Hyperlink"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Undefined"); } NameJavaScriptGroup group = (NameJavaScriptGroup)v; - return Inter.getLocText(new String[]{"Total", "Has"}) + group.size() + Inter.getLocText(new String[]{"SpecifiedG-Groups", "Hyperlink"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Group_Count", group.size()); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java index a50cf3d9a..9a335e27a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.widget.wrappers; -import com.fr.general.Inter; + import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; import com.fr.design.Exception.ValidationException; @@ -14,7 +14,7 @@ public class ParameterWrapper implements Encoder, Decoder { if (v == null) { return StringUtils.EMPTY; } - return Inter.getLocText("Total") + ((ParameterProvider[]) v).length + Inter.getLocText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Total") + ((ParameterProvider[]) v).length + com.fr.design.i18n.Toolkit.i18nText("Parameters"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/parameter/ParameterToolBarPane.java b/designer-form/src/main/java/com/fr/design/parameter/ParameterToolBarPane.java index d5c95614e..f03fffa12 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/ParameterToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/ParameterToolBarPane.java @@ -15,7 +15,7 @@ import javax.swing.SwingConstants; import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButton; -import com.fr.general.Inter; + /** * 参数点击动作条 @@ -48,12 +48,12 @@ public class ParameterToolBarPane extends BasicBeanPane { return new Dimension(super.getPreferredSize().width, 18); } }; - label.setText(Inter.getLocText("FR-Following_parameters_are_not_generated") + ":"); + label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Following_parameters_are_not_generated") + ":"); label.setHorizontalAlignment(SwingConstants.LEFT); label.setBorder(BorderFactory.createEmptyBorder(0, LABEL_PADDING_LEFT, 0, 0)); this.add(label); - addAll = new UIButton(Inter.getLocText("FR-Designer_Add_all")); + addAll = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_all")); this.add(addAll); } diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 6cfa4a266..17eda1d2a 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -22,7 +22,7 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor; import com.fr.design.widget.ui.designer.AbstractDataModify; import com.fr.form.ui.container.WParameterLayout; import com.fr.general.Background; -import com.fr.general.Inter; + import com.fr.report.stable.FormConstants; import javax.swing.BorderFactory; @@ -58,10 +58,10 @@ public class RootDesignDefinePane extends AbstractDataModify { this.setLayout(FRGUIPaneFactory.createBorderLayout()); designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1); JPanel advancePane = createAdvancePane(); - UIExpandablePane advanceExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, advancePane); + UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane); this.add(advanceExpandablePane, BorderLayout.NORTH); JPanel layoutPane = createBoundsPane(); - UIExpandablePane layoutExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Size"), 280, 20, layoutPane); + UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Size"), 280, 20, layoutPane); this.add(layoutExpandablePane, BorderLayout.CENTER); } @@ -73,7 +73,7 @@ public class RootDesignDefinePane extends AbstractDataModify { double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Form-Desin_Width")), designerWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Desin_Width")), designerWidth}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -85,27 +85,27 @@ public class RootDesignDefinePane extends AbstractDataModify { public JPanel createAdvancePane() { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); labelNameTextField = new UITextField(); - displayReport = new UICheckBox(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery")); - useParamsTemplate = new UICheckBox(Inter.getLocText("FR-Designer_Use_Params_Template")); + displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery")); + useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_Params_Template")); background = new AccessibleBackgroundEditor(); Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Left") - , Inter.getLocText("FR-Designer-StyleAlignment_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p, p, p, p, p}; double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), background}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")), background}, new Component[]{displayReport, null}, new Component[]{useParamsTemplate, null}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1); panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0)); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java index d0ed62b0a..0e2dda3b4 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleIconEditor; import com.fr.design.widget.btn.ButtonConstants; import com.fr.form.ui.Button; -import com.fr.general.Inter; + import com.fr.stable.StableUtils; import javax.swing.*; @@ -42,22 +42,22 @@ public abstract class ButtonDefinePane extends AbstractDataMod labelNameTextField = new UITextField(); Component[] backgroundCompPane = createBackgroundComp(); Component[] frFont = createFontPane(); - UILabel backgroundLabel = new UILabel(Inter.getLocText("FR-Designer_Background")); + UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")); backgroundLabel.setVerticalAlignment(SwingConstants.TOP); Component[][] n_components = { - {new UILabel(Inter.getLocText("FR-Designer_Button-Name")), buttonNameTextField}, - {new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, backgroundCompPane, frFont, - {new UILabel(Inter.getLocText("FR-Designer_Icon")), iconPane}, - {new UILabel(Inter.getLocText("FR-Designer_Button-Hotkeys")), hotkeysTextField} + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")), iconPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")), hotkeysTextField} }; hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ",")); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); boundsPane.add(panel); - UIExpandablePane advancedPane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, boundsPane); + UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane); this.add(advancedPane); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java index 6c64cd319..83916c729 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java @@ -7,7 +7,7 @@ import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.ButtonGroup; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -30,9 +30,9 @@ public class ButtonGroupDictPane extends JPanel { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - adaptiveCheckbox = new UICheckBox(Inter.getLocText("Adaptive"), true); + adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.columnLabel = new UILabel(Inter.getLocText("Button-Group-Display-Columns") + ":"); + this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{adaptiveCheckbox, columnLabel, columnSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java index fc7a1dfdc..ac89c40a0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.widget.ui.designer.component.FontSizeComboPane; import com.fr.design.widget.ui.designer.component.FormWidgetValuePane; import com.fr.form.ui.CheckBox; -import com.fr.general.Inter; + import javax.swing.BorderFactory; import javax.swing.JPanel; @@ -34,16 +34,16 @@ public class CheckBoxDefinePane extends AbstractDataModify { text = new UITextField(); fontSizePane = new FontSizeComboPane(); labelNameTextField = new UITextField(); - UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Text")), text }, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text")), text }, new Component[]{widgetValueLabel, formWidgetValuePane }, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizePane}, }; double[] rowSize = {p, p, p, p, p, p}; double[] columnSize = {p, f}; @@ -52,7 +52,7 @@ public class CheckBoxDefinePane extends AbstractDataModify { JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); boundsPane.add(panel); - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, boundsPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane); this.add(uiExpandablePane); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java index 1ffee293a..6ffdd1be1 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java @@ -10,7 +10,7 @@ import com.fr.design.present.dict.DictionaryPane; import com.fr.design.widget.component.CheckBoxDictPane; import com.fr.design.widget.ui.designer.btn.ButtonGroupDefinePane; import com.fr.form.ui.CheckBoxGroup; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -39,7 +39,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane { } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } public Component[] createWaterMarkPane() { waterMarkField = new UITextField(); - return new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkField}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkField}; } protected void populateSubDictionaryEditorBean(ComboBox ob){ diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java index fd6b8148e..a8b70c943 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java @@ -10,7 +10,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.widget.component.CheckBoxDictPane; import com.fr.form.ui.ComboCheckBox; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -26,19 +26,19 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } public Component[] createWaterMarkPane() { waterMarkDictPane = new UITextField(); - return new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane}; } public JPanel createOtherPane(){ - supportTagCheckBox = new UICheckBox(Inter.getLocText("Form-SupportTag"), true); + supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag"), true); supportTagCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkBoxDictPane = new CheckBoxDictPane(); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java index a96207871..9cb8e1047 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java @@ -4,7 +4,7 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.form.ui.CustomWriteAbleRepeatEditor; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -24,7 +24,7 @@ public abstract class CustomWritableRepeatEditorPane(new String[] {Inter.getLocText("Date") , Inter.getLocText("String")}); + returnTypeComboBox = new UIButtonGroup<>(new String[] {com.fr.design.i18n.Toolkit.i18nText("Date") , com.fr.design.i18n.Toolkit.i18nText("String")}); JPanel formatHead = createFormatHead(); startDv = new DateValuePane(); endDv = new DateValuePane(); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane}, new Component[]{formatLabel, formatHead}, new Component[]{startDateLabel, startDv}, new Component[]{endDateLabel, endDv}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), waterMarkDictPane}, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane}, - new Component[]{new UILabel(Inter.getLocText("Widget-Date_Selector_Return_Type")), returnTypeComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Date_Selector_Return_Type")), returnTypeComboBox} }; double[] rowSize = {p, p, p, p, p, p, p, p, p, p}; @@ -91,7 +91,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane e @Override protected JPanel setFirstContentPane() { JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel widgetValueLabel = new UILabel(Inter.getLocText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null}; @@ -37,12 +37,12 @@ public abstract class DirectWriteEditorDefinePane e double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane }, dicPane, removeRepeatPane, waterMarkComponent, - new Component[]{new UILabel(Inter.getLocText("FR-Designer_Font-Size")), fontSizePane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizePane} }; double[] rowSize = {p, p, p, p, p, p, p, p}; double[] columnSize = {p, f}; @@ -75,7 +75,7 @@ public abstract class DirectWriteEditorDefinePane e } public JPanel setValidatePane(){ - directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false); + directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit"), false); directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); otherContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java index ad47924d4..039c754c4 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.widget.ui.designer.component.FontSizeComboPane; import com.fr.form.ui.FieldEditor; -import com.fr.general.Inter; + import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -37,7 +37,7 @@ public abstract class FieldEditorDefinePane extends Abstr protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); labelNameTextField = new UITextField(); - allowBlankCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Allow_Null")); + allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Null")); allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); fontSizePane = new FontSizeComboPane(); errorMsgTextField = new UITextField(); @@ -46,7 +46,7 @@ public abstract class FieldEditorDefinePane extends Abstr jPanel.add(contentPane, BorderLayout.CENTER); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); if (contentPane != null) { - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, jPanel); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, jPanel); this.add(uiExpandablePane, BorderLayout.NORTH); } this.addValidatePane(); @@ -109,7 +109,7 @@ public abstract class FieldEditorDefinePane extends Abstr protected void addValidatePane() { initErrorMsgPane(); validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - final UILabel uiLabel = new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")); + final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM); errorTipPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); @@ -134,7 +134,7 @@ public abstract class FieldEditorDefinePane extends Abstr validatePane.add(contentPane, BorderLayout.CENTER); } - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Validate"), 280, 20, validatePane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Validate"), 280, 20, validatePane); this.add(uiExpandablePane, BorderLayout.CENTER); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java index 1c470394d..1168cb9de 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java @@ -7,7 +7,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.widget.component.ButtonBackgroundPane; import com.fr.form.ui.FreeButton; import com.fr.general.FRFont; -import com.fr.general.Inter; + import javax.swing.*; import java.awt.*; @@ -31,7 +31,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane { public Component[] createFontPane() { JPanel fontLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - fontLabel = new UILabel(Inter.getLocText("FR-Designer_Font")); + fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")); fontLabelPanel.add(fontLabel, BorderLayout.CENTER); fontLabel.setVerticalAlignment(SwingConstants.TOP); frFontPane = new FRFontPane(); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java index 7d360051c..e3b539354 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java @@ -11,7 +11,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.IframeEditor; -import com.fr.general.Inter; + import com.fr.stable.ParameterProvider; import javax.swing.*; @@ -34,8 +34,8 @@ public class IframeEditorDefinePane extends AbstractDataModify { JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); JPanel attr = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - attr.add(horizontalCheck = new UICheckBox(Inter.getLocText("Preference-Horizontal_Scroll_Bar_Visible"))); - attr.add(verticalCheck = new UICheckBox(Inter.getLocText("Preference-Vertical_Scroll_Bar_Visible"))); + attr.add(horizontalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Horizontal_Scroll_Bar_Visible"))); + attr.add(verticalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Vertical_Scroll_Bar_Visible"))); contentPane.add(attr); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; @@ -45,14 +45,14 @@ public class IframeEditorDefinePane extends AbstractDataModify { Component[][] coms = { { horizontalCheck, null }, { verticalCheck, null }, - { new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField() }, - { new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } }; + { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Url") + ":"), srcTextField = new UITextField() }, + { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } }; int[][] rowCount = {{1, 1},{1, 1},{1, 1}, {1, 1}}; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5); contentPane.add(panel); - UIExpandablePane uiExpandablePane = new UIExpandablePane(Inter.getLocText("FR-Designer_Advanced"), 280, 20, contentPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, contentPane); this.add(uiExpandablePane, BorderLayout.NORTH); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java index 02c47c41e..bd7de6e2d 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -13,7 +13,7 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.widget.ui.designer.component.FormWidgetValuePane; import com.fr.form.ui.Label; -import com.fr.general.Inter; + import com.fr.stable.Constants; import javax.swing.*; @@ -38,39 +38,39 @@ public class LabelDefinePane extends AbstractDataModify