diff --git a/designer-base/pom.xml b/designer-base/pom.xml index d97a420933..942dcd302d 100644 --- a/designer-base/pom.xml +++ b/designer-base/pom.xml @@ -6,7 +6,7 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 @@ -17,5 +17,5 @@ com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file 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 e2335c111f..eefafb84ef 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -207,8 +207,9 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { return; } String installHome = StableUtils.getInstallHome(); - if (installHome != null && !".".equals(installHome)) { - String name = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_DEFAULT"); + //这里不判断路径是.的情况，放在checkValid方法里面，重新选 + if (installHome != null) { + String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_DEFAULT"); String envPath = designerEnvManager.getDefaultenvPath(installHome); designerEnvManager.putEnv(name, LocalDesignerWorkspaceInfo.create(name, envPath)); designerEnvManager.setCurEnvName(name); @@ -1519,7 +1520,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { if ((tmpVal = reader.getAttrAsString("webinfLocation", null)) != null) { // marks:兼容6.1的 // marks:设置默认的目录. - String curReportServerName = com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server"); + String curReportServerName = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/community/BBSAction.java b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java index 1cd5f115b9..98ad28c9c2 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 @@ -1,20 +1,15 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; import javax.swing.*; -import java.awt.*; + import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; public class BBSAction extends UpdateAction { @@ -25,33 +20,19 @@ public class BBSAction extends UpdateAction this.setMenuKeySet(BBS); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/bbs.png")); } /** * 动作 - * @param e 事件 + * @param arg0 事件 */ @Override public void actionPerformed(ActionEvent arg0) { String url = CloudCenter.getInstance().acquireUrlByKind("bbs"); - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } + BrowseUtils.browser(url); } public static final MenuKeySet BBS = new MenuKeySet() { @Override @@ -61,7 +42,7 @@ public class BBSAction extends UpdateAction @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BBS"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 c446caa6de..d9c75321d6 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 @@ -1,20 +1,14 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; - import javax.swing.*; -import java.awt.*; + import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; public class BugAction extends UpdateAction { @@ -23,7 +17,7 @@ public class BugAction extends UpdateAction { this.setMenuKeySet(BUG); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bug.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/bug.png")); } @@ -31,28 +25,14 @@ public class BugAction extends UpdateAction public void actionPerformed(ActionEvent arg0) { String url = CloudCenter.getInstance().acquireUrlByKind("bbs.bugs"); - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } + BrowseUtils.browser(url); } public static final MenuKeySet BUG = new MenuKeySet() { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_BUG"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_Bug"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java b/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java new file mode 100644 index 0000000000..3ba97c0fc5 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/community/CenterAction.java @@ -0,0 +1,47 @@ +package com.fr.design.actions.community; + +import com.fr.base.BaseUtils; +import com.fr.design.menu.MenuKeySet; +import com.fr.design.utils.BrowseUtils; +import com.fr.general.CloudCenter; + +import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; + +/** + * Created by XINZAI on 2018/8/23. + */ +public class CenterAction extends UpAction{ + public CenterAction() + { + this.setMenuKeySet(CENTER); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/center.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = CloudCenter.getInstance().acquireUrlByKind("bbs.center"); + BrowseUtils.browser(url); + + } + public static final MenuKeySet CENTER = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'C'; + } + + @Override + public String getMenuName() { + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Center"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; +} diff --git a/designer-base/src/main/java/com/fr/design/actions/community/CusDemandAction.java b/designer-base/src/main/java/com/fr/design/actions/community/CusDemandAction.java new file mode 100644 index 0000000000..9e294d859c --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/community/CusDemandAction.java @@ -0,0 +1,48 @@ +package com.fr.design.actions.community; + +import com.fr.base.BaseUtils; + +import com.fr.design.menu.MenuKeySet; +import com.fr.design.utils.BrowseUtils; +import com.fr.general.CloudCenter; +import javax.swing.KeyStroke; + +import java.awt.event.ActionEvent; + +/** + * Created by XINZAI on 2018/8/23. + */ +public class CusDemandAction extends UpAction{ + public CusDemandAction() + { + this.setMenuKeySet(DEMAND); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/demand.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = CloudCenter.getInstance().acquireUrlByKind("bbs.demand"); + BrowseUtils.browser(url); + + } + public static final MenuKeySet DEMAND = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'D'; + } + + @Override + public String getMenuName() { + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Demand"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; +} 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 552923b5f7..c604e51d07 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 @@ -1,20 +1,14 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; - import javax.swing.*; -import java.awt.*; + import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; public class NeedAction extends UpdateAction { @@ -24,29 +18,15 @@ public class NeedAction extends UpdateAction this.setMenuKeySet(NEED); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/need.png")); - + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/need.png")); + } @Override public void actionPerformed(ActionEvent arg0) { String url = CloudCenter.getInstance().acquireUrlByKind("bbs.needs"); - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } + BrowseUtils.browser(url); } public static final MenuKeySet NEED = new MenuKeySet() { @@ -57,7 +37,7 @@ public class NeedAction extends UpdateAction @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_NEED"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_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 0b6d33ee15..717537df6f 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 @@ -1,20 +1,14 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; - import javax.swing.*; -import java.awt.*; + import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; public class QuestionAction extends UpdateAction { @@ -23,7 +17,7 @@ public class QuestionAction extends UpdateAction { this.setMenuKeySet(QUESTIONS); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/questions.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/question.png")); } @@ -31,22 +25,7 @@ public class QuestionAction extends UpdateAction public void actionPerformed(ActionEvent arg0) { String url = CloudCenter.getInstance().acquireUrlByKind("bbs.questions"); - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } - + BrowseUtils.browser(url); } public static final MenuKeySet QUESTIONS = new MenuKeySet() { @Override @@ -56,7 +35,7 @@ public void actionPerformed(ActionEvent arg0) @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_QUESTIONS"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2e4c5142f4..c08619b23b 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 @@ -1,20 +1,15 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; import javax.swing.*; -import java.awt.*; + import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; public class SignAction extends UpdateAction { @@ -24,7 +19,7 @@ public class SignAction extends UpdateAction this.setMenuKeySet(SIGN); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/signature.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/sign.png")); } @@ -32,21 +27,7 @@ public class SignAction extends UpdateAction public void actionPerformed(ActionEvent arg0) { String url = CloudCenter.getInstance().acquireUrlByKind("bbs.aut"); - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } + BrowseUtils.browser(url); } public static final MenuKeySet SIGN = new MenuKeySet() { @@ -57,7 +38,7 @@ public class SignAction extends UpdateAction @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_SIGN"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community_sign"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java new file mode 100644 index 0000000000..a099216094 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/actions/community/TechSolutionAction.java @@ -0,0 +1,52 @@ +package com.fr.design.actions.community; + +import com.fr.base.BaseUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.design.utils.BrowseUtils; +import com.fr.general.CloudCenter; + + +import javax.swing.KeyStroke; + +import java.awt.event.ActionEvent; + + +/** + * Created by XINZAI on 2018/8/23. + */ +public class TechSolutionAction extends UpdateAction{ + public TechSolutionAction() + { + this.setMenuKeySet(TSO); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/solution.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = CloudCenter.getInstance().acquireUrlByKind("bbs.solution"); + BrowseUtils.browser(url); + + } + public static final MenuKeySet TSO = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'T'; + } + + @Override + public String getMenuName() { + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Commuinity_Solution"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} 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 024039ee52..d1baef84f0 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 @@ -39,7 +39,7 @@ public class UpAction extends UpdateAction try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_UPDATE"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f28ee3b722..8e9fd5b32e 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 @@ -1,20 +1,14 @@ package com.fr.design.actions.community; 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.design.utils.BrowseUtils; import com.fr.general.CloudCenter; import com.fr.general.GeneralContext; -import com.fr.log.FineLoggerFactory; -import com.fr.stable.StringUtils; import javax.swing.*; -import java.awt.*; import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; import java.util.Locale; public class VideoAction extends UpdateAction @@ -25,7 +19,7 @@ public class VideoAction extends UpdateAction this.setMenuKeySet(VIDEO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/video.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/video.png")); } @@ -38,21 +32,7 @@ public class VideoAction extends UpdateAction } else { url = CloudCenter.getInstance().acquireUrlByKind("bbs.video"); } - if (StringUtils.isEmpty(url)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(url)); - } catch (IOException exp) { - 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); - } catch (Exception exp) { - FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); - } + BrowseUtils.browser(url); } public static final MenuKeySet VIDEO = new MenuKeySet() { @@ -63,7 +43,7 @@ public class VideoAction extends UpdateAction @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_VIDEO"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2b02d75eb8..568b439f03 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 @@ -20,7 +20,7 @@ public class CopyAction extends TemplateComponentAction { public CopyAction(TargetComponent t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 0c668c8c6a..67ffae2377 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 @@ -24,7 +24,7 @@ public class CutAction extends TemplateComponentAction { public CutAction(TargetComponent t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 5f88504b69..476516a79c 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 @@ -24,7 +24,7 @@ public class PasteAction extends TemplateComponentAction { public PasteAction(TargetComponent t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d483df5a78..d920721193 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 @@ -19,7 +19,7 @@ public class CloseTemplateAction extends JTemplateAction> { public CloseTemplateAction(JTemplate jt) { super(jt); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M-Close_Template")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a4bf798f20..f8b185a09d 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 @@ -1,17 +1,17 @@ package com.fr.design.actions.file; -import java.awt.event.ActionEvent; - import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.TemplatePane; +import java.awt.event.ActionEvent; + public class EditEnvAction extends UpdateAction { public EditEnvAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("M-Others") + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2c914bd479..634af28b9e 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 @@ -95,8 +95,8 @@ public class LocalePane extends BasicPane { }); - 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)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Predefined"), new UIScrollPane(predefinedTable)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Custom"), new UIScrollPane(customTable)); loadData(); } @@ -146,7 +146,7 @@ public class LocalePane extends BasicPane { keyVector.addAll(sortKeys); - predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key"), keyVector); + predefineTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key"), keyVector); for (Map.Entry> entry : data.entrySet()) { predefineTableModel.addColumn(entry.getKey().getDisplayName(), entry.getValue()); } @@ -161,7 +161,7 @@ public class LocalePane extends BasicPane { List list = new ArrayList(); Set keys = new HashSet(); - customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Key")); + customTableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key")); for (FileNode fileNode : fileNodes) { String fileName = fileNode.getName(); if (fileName.endsWith(".properties")) { @@ -218,6 +218,6 @@ public class LocalePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Preference-Locale"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5617c51099..325df90e09 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 @@ -1,6 +1,7 @@ package com.fr.design.actions.file; import com.fr.base.BaseUtils; +import com.fr.config.Configuration; import com.fr.design.DesignerEnvManager; import com.fr.design.RestartHelper; import com.fr.design.dialog.BasicDialog; @@ -24,9 +25,12 @@ 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 com.fr.transaction.Configurations; +import com.fr.transaction.Worker; import javax.swing.*; import java.awt.*; @@ -128,9 +132,9 @@ public class PreferencePane extends BasicPane { UITabbedPane jtabPane = new UITabbedPane(); JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_General"), generalPane); + jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_General"), generalPane); JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); - jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), advancePane); + jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), advancePane); contentPane.add(jtabPane, BorderLayout.NORTH); @@ -153,12 +157,12 @@ public class PreferencePane extends BasicPane { createJdkHomePane(advancePane); - JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables")); + JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Oracle_All_Tables")); oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables")); oraclePane.add(oracleSpace); - 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")); + JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Product_Improve")); + joinProductImprove = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Join_Product_Improve")); improvePane.add(joinProductImprove); JPanel spaceUpPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -169,16 +173,16 @@ public class PreferencePane extends BasicPane { } private void createFunctionPane(JPanel generalPane) { - JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preference-Function")); + JPanel functionPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Function")); generalPane.add(functionPane); //添加supportUndo选择项 - supportUndoCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Undo")); + supportUndoCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Undo")); functionPane.add(supportUndoCheckBox); //添加maxUndoLimit //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"}; - 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)")}; + String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_10 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)") + , MAX_UNDO_LIMIT_15 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_20 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_50 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Time(s)")}; maxUndoLimit = new UIComboBox(undoTimes); functionPane.add(maxUndoLimit); @@ -192,7 +196,7 @@ public class PreferencePane extends BasicPane { //添加supportDefaultParentCalculate选择项 supportDefaultParentCalculateCheckBox = new UICheckBox( - com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Default_Parent_Calculate")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Default_Parent_Calculate")); functionPane.add(supportDefaultParentCalculateCheckBox); } @@ -206,7 +210,7 @@ public class PreferencePane extends BasicPane { editPane.add(supportStringToFormulaBox); //是否默认转化 - defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Always")); + defaultStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Always")); editPane.add(defaultStringToFormulaBox); //不支持转化则不能默认执行 @@ -216,7 +220,7 @@ public class PreferencePane extends BasicPane { } }); JPanel keyStrokePane = new JPanel(new BorderLayout()); - keyStrokePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Support-Auto_Complete_Shortcut") + ":"), BorderLayout.WEST); + keyStrokePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST); shortCutLabel = new UILabel(); keyStrokePane.add(shortCutLabel, BorderLayout.CENTER); editPane.add(keyStrokePane); @@ -246,7 +250,7 @@ public class PreferencePane extends BasicPane { requestFocusInWindow(); label = new UILabel(text); add(GUICoreUtils.createBorderLayoutPane( - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Support-Current_Auto_Complete_Shortcut") + ":"), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Current_Auto_Complete_Shortcut") + ":"), BorderLayout.WEST, label, BorderLayout.CENTER), @@ -280,24 +284,24 @@ public class PreferencePane extends BasicPane { private void createGuiOfGridPane(JPanel generalPane) { // GridPane - JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-Setting_Grid")); + JPanel guiOfGridPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Setting_Grid")); generalPane.add(guiOfGridPane); - supportCellEditorDefCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Support_Cell_Editor_Definition")); + supportCellEditorDefCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Support_Cell_Editor_Definition")); guiOfGridPane.add(supportCellEditorDefCheckBox); - isDragPermitedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Is_Drag_Permited")); + isDragPermitedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Is_Drag_Permited")); guiOfGridPane.add(isDragPermitedCheckBox); } private void createColorSettingPane(JPanel generalPane) { // Color Setting Pane - JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-Setting_Colors")); + JPanel colorSettingPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Setting_Colors")); generalPane.add(colorSettingPane); - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Grid_Line_Color")); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Grid_Line_Color")); - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Pagination_Line_Color")); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color")); gridLineColorTBButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/foreground.png")); gridLineColorTBButton.setEnabled(this.isEnabled()); @@ -306,10 +310,10 @@ public class PreferencePane extends BasicPane { paginationLineColorTBButton.setEnabled(this.isEnabled()); JPanel leftPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Grid_Line_Color") + ":")); + leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Grid_Line_Color") + ":")); leftPane.add(gridLineColorTBButton); JPanel rightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Preference-Pagination_Line_Color") + ":")); + rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Pagination_Line_Color") + ":")); rightPane.add(paginationLineColorTBButton); colorSettingPane.add(leftPane); colorSettingPane.add(rightPane); @@ -319,9 +323,9 @@ public class PreferencePane extends BasicPane { //richer:选择导出log文件的目录. JPanel logPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); advancePane.add(logPane); - JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_Setting")); + JPanel logExportPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export_Setting")); logPane.add(logExportPane); - UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Export_Log_Directory") + ":"); + UILabel logLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":"); logExportPane.add(logLabel, BorderLayout.WEST); logExportDirectoryField = new UITextField(24); logExportPane.add(logExportDirectoryField, BorderLayout.CENTER); @@ -340,14 +344,23 @@ public class PreferencePane extends BasicPane { } }); - JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Level_Setting")); + JPanel logLevelPane = FRGUIPaneFactory.createTitledBorderPane("log" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Level_Setting")); logPane.add(logLevelPane); logLevelComboBox = new UIComboBox(LOG); logLevelPane.add(logLevelComboBox); logLevelComboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + Configurations.update(new Worker() { + @Override + public void run() { + Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem()); + } - Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem()); + @Override + public Class[] targets() { + return new Class[]{Log4jConfig.class}; + } + }); } }); } @@ -355,13 +368,13 @@ public class PreferencePane extends BasicPane { private void createLanPane(JPanel generalPane) { // ben:选择版本语言; JPanel languageAndDashBoard_pane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Choose_Language")); + JPanel LanguagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_Language")); generalPane.add(languageAndDashBoard_pane); languageAndDashBoard_pane.add(LanguagePane); languageComboBox = createLanguageComboBox(); - ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Designer_Language")); + ActionLabel languageLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Language")); languageLabel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -375,7 +388,7 @@ public class PreferencePane extends BasicPane { dlg.setVisible(true); } }); - UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));//sail:提示重启后生效 + UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效 double p = TableLayout.PREFERRED; double rowSize[] = {p}; double columnSize[] = {p, p, p}; @@ -394,7 +407,8 @@ public class PreferencePane extends BasicPane { int i = 0; for (Map.Entry entry : map.entrySet()) { keys[i] = entry.getKey(); - values[i] = com.fr.design.i18n.Toolkit.i18nText(entry.getValue()); + // 想要读取到，必需在这里 使用 Inter 才行。 + values[i] = Inter.getLocText(entry.getValue()); i++; } UIDictionaryComboBox languageComboBox = new UIDictionaryComboBox<>(keys, values); @@ -420,16 +434,16 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; // 长度单位选择 - JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Setting-Ruler-Units")); + JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Setting_Ruler_Units")); advancePane.add(lengthPane); - 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 = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")}); pageLengthComboBox.setPreferredSize(new Dimension(80, 20)); pageLengthComboBox.setMinimumSize(new Dimension(80, 20)); - 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 = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate")}); reportLengthComboBox.setPreferredSize(new Dimension(80, 20)); reportLengthComboBox.setMinimumSize(new Dimension(80, 20)); - 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") + ":"); + UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":"); + UILabel reportLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Design_Ruler_Units") + ":"); Component[][] lengthComponents = { {pagelengthLabel, pageLengthComboBox, reportLengthLabel, reportLengthComboBox}, }; @@ -442,13 +456,13 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; double columnSize[] = {p, p, p}; - JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Web_Preview_Port_Setting")); + JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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") + ":"); + UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer")); + UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port") + ":"); Component[][] portComponents = { {serverPortLabel, portEditor, notiJlabel}, }; @@ -461,7 +475,7 @@ public class PreferencePane extends BasicPane { double rowSize[] = {p}; double columnSize[] = {p, p, p}; - JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preference-JDK_Home")); + JPanel serverPortPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home")); advancePane.add(serverPortPane); jdkHomeTextField = new UITextField(); UIButton chooseBtn = new UIButton("..."); @@ -483,8 +497,8 @@ public class PreferencePane extends BasicPane { } }); panel.setPreferredSize(new Dimension(300, 20)); - 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") + ":"); + UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer")); + UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home") + ":"); Component[][] portComponents = { {serverPortLabel, panel, notiJlabel}, }; @@ -493,9 +507,9 @@ public class PreferencePane extends BasicPane { } private JPanel createMemoryPane() { - 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")); + JPanel memoryPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template")); + UILabel memoryLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Max_Caching_Template")); + UILabel memoryTipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip")); memoryTipLabel.setBorder(BorderFactory.createEmptyBorder(0, CACHING_GAP, 0, 0)); cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT); JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout()); @@ -508,7 +522,7 @@ public class PreferencePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("M_Window-Preference"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Window_Preference"); } /** @@ -633,7 +647,17 @@ public class PreferencePane extends BasicPane { designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50); } - Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem())); + Configurations.update(new Worker() { + @Override + public void run() { + Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem())); + } + + @Override + public Class[] targets() { + return new Class[]{Log4jConfig.class}; + } + }); } @@ -645,12 +669,12 @@ public class PreferencePane extends BasicPane { } int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Language_Change_Successful"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, - 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")}, + new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 915c06981e..d79df8d2c3 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 @@ -116,7 +116,7 @@ public class SwitchExistEnv extends MenuDef { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } catch (RegistEditionException exception) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } catch (Exception exception) { FineLoggerFactory.getLogger().error(exception.getMessage(), exception); 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 3307ad02e1..2a73de7a40 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 @@ -59,8 +59,8 @@ public final class WebPreviewUtils { browseUrl(currentTemplate, baseRoute, map, actionType, jt); } else { // 说明模板没有保存在报表运行环境下面,提示用户 - 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); + int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview_Tool_Tips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); if (JOptionPane.OK_OPTION == selVal) { if (!jt.saveAsTemplate2Env()) { @@ -103,8 +103,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(), com.fr.design.i18n.Toolkit.i18nText("Web_Preview_Message"), - com.fr.design.i18n.Toolkit.i18nText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Message"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview_Tool_Tips"), 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 00a4cf9913..4dcc53a13c 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 @@ -39,7 +39,7 @@ public class AboutAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Help-About_Software"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 af62e25fca..b4b6d53c6f 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 @@ -47,7 +47,7 @@ public class AboutDialog extends JDialog implements ActionListener { sysPane = new SystemInfoPane(); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Basic_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 4299293137..b8acba9fe2 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 @@ -72,11 +72,11 @@ public class AboutPane extends JPanel { addPhoneAndQQPane(contentPane); // 官网 - JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL)); + JPanel urlActionPane = getURLActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Official_Website"), CloudCenter.getInstance().acquireUrlByKind("website." + GeneralContext.getLocale(), ProductConstants.WEBSITE_URL)); // 支持邮箱 String defaultEmail = CloudCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL); - JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + GeneralContext.getLocale(), defaultEmail)); + JPanel emailPane = getEmailActionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_Email"), CloudCenter.getInstance().acquireUrlByKind("support.email." + GeneralContext.getLocale(), defaultEmail)); contentPane.add(urlActionPane); contentPane.add(emailPane); @@ -96,7 +96,7 @@ public class AboutPane extends JPanel { if (GeneralContext.getLocale().equals(Locale.US)) { return; } - boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE)); + boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Service_Phone") + CloudCenter.getInstance().acquireUrlByKind("service.phone." + FRContext.getLocale(), COMPANY_TELEPHONE)); contentPane.add(boxCenterAlignmentPane); // 繁体版不显示QQ if (GeneralContext.getLocale().equals(Locale.TAIWAN)) { @@ -175,12 +175,12 @@ public class AboutPane extends JPanel { } private String getCopyRight() { - return append(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL, + return append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_CopyRight"), COPYRIGHT_LABEL, ProductConstants.HISTORY, StringUtils.BLANK, CloudCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME)); } private String getBuildTitle() { - return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_About_Version"), + return append(ProductConstants.APP_NAME, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ee9a18453d..348d71dd23 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 @@ -46,7 +46,7 @@ public class FeedBackAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("product_feedback"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a72b35e31e..3047f64703 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 @@ -67,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(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); + private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Send"), true); private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); - private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; private boolean isSendSuccessful = false; @@ -179,11 +179,11 @@ public class FeedBackPane extends BasicPane { private JPanel initDetailPane() { double p = TableLayout.PREFERRED; - UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("detail_description") + ":"); + UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Detail_Description") + ":"); info.setBorder(INNER_LEFT_BORDER); JPanel contactPane = getContactPane(); contactPane.setBorder(INNER_LEFT_BORDER); - UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("contact_info") + ":"); + UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Contact_Info") + ":"); contact.setBorder(INNER_LEFT_BORDER); JPanel jPanel = new JPanel(); jPanel.add(detailField); @@ -206,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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email") + ":", SwingConstants.RIGHT), email}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Number") + ":", SwingConstants.RIGHT), phone} }; double[] rowSize = {p, p, p}; double[] columnSize = {p, p}; @@ -219,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(com.fr.design.i18n.Toolkit.i18nText("Send")); + sendButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Send")); buttonsPane.add(sendButton); buttonsPane.setBorder(SEND_BORDER); sendButton.addActionListener(new ActionListener() { @@ -235,7 +235,7 @@ public class FeedBackPane extends BasicPane { private void doWithSendPane() { Object[] options = new Object[]{ok, cancle}; - send = new JOptionPane(com.fr.design.i18n.Toolkit.i18nText("sending"), + send = new JOptionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sending"), JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null, options, options[0]); ok.setEnabled(false); ok.addActionListener(new ActionListener() { @@ -246,7 +246,7 @@ public class FeedBackPane extends BasicPane { feedbackDialog.dispose(); } else { ok.setEnabled(false); - send.setMessage(com.fr.design.i18n.Toolkit.i18nText("sending")); + send.setMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sending")); setWorker(send); worker.execute(); } @@ -292,7 +292,7 @@ public class FeedBackPane extends BasicPane { if (model) { //发送成功 isSendSuccessful = true; - send.setMessage(com.fr.design.i18n.Toolkit.i18nText("HJS-Send_Successfully") + "!"); + send.setMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Send_Successfully") + "!"); } else { isSendSuccessful = false; } @@ -309,7 +309,7 @@ public class FeedBackPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("product_feedback"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ebfb100836..65ce1924c0 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 @@ -48,7 +48,7 @@ public class ForumAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(url)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Forum"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Forum"); } @Override @@ -74,4 +74,4 @@ public class ForumAction extends UpdateAction { return null; } }; -} \ No newline at end of file +} 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 6e08a7258f..a118f9d878 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 @@ -37,7 +37,7 @@ public class SupportQQAction extends UpdateAction { try { Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ)); } catch (IOException exp) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Support_QQ"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Support_QQ"); } @Override @@ -60,4 +60,4 @@ public class SupportQQAction extends UpdateAction { return null; } }; -} \ No newline at end of file +} 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 f33a0473aa..7fe26054f6 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 @@ -25,8 +25,8 @@ public class SystemInfoPane extends JPanel { return false; } }; - tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Property")); - tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Value")); + tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")); + tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 c0e255af7b..3c51f4bbd4 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 @@ -31,7 +31,7 @@ public class TutorialAction extends UpdateAction { this.setMenuKeySet(HELP_TUTORIAL); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/help.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs/help.png")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } @@ -107,7 +107,7 @@ public class TutorialAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 8596d5e44c..613982abdf 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 @@ -36,7 +36,7 @@ public class WebDemoAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Product_Demo"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3669064bdb..ddb8e425c8 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 @@ -87,26 +87,26 @@ public class AlphaFineConfigPane extends BasicPane { double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP}; - 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 northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range")); + isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend")); + isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")); + isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon")); + isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")); + isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Templates")); + isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content")); JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize); northPane.add(searchConfigPane); contentPane.add(northPane); } private void createShortcutsPane(JPanel contentPane) { - JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Shortcut_Config")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Shortcut_Config")); shortcutsField = new UITextField(); shortcutsField.setEditable(false); shortcutsField.selectAll(); shortcutsField.setPreferredSize(new Dimension(100, 20)); initFieldListener(); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":")); northPane.add(shortcutsField); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts")); label.setForeground(Color.RED); @@ -138,8 +138,8 @@ public class AlphaFineConfigPane extends BasicPane { } private void createOnlinePane(JPanel contentPane) { - 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")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Internet")); + isSearchOnlineCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_Internet_Search")); 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Enable")); - isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_EnableAlphaFine")); + JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable")); + isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine")); northPane.add(isEnabledCheckbox); contentPane.add(northPane); } 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 5eeea95d17..89f2ac3c3f 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 @@ -43,7 +43,7 @@ public class ConnectionListAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 bd5f44d73b..bbc324ffda 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 @@ -76,7 +76,7 @@ public class FunctionManagerAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Server-Function_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 b206df6df9..c546129e95 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 @@ -83,7 +83,7 @@ public class GlobalParameterAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 288970cf88..deef91f0c7 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 @@ -21,7 +21,6 @@ import com.fr.design.menu.MenuKeySet; import com.fr.file.ProcedureConfig; import com.fr.file.TableDataConfig; -import com.fr.locale.InterProviderFactory; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.Worker; @@ -53,7 +52,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f0fef3eade..5f364303a7 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 @@ -33,7 +33,7 @@ public class PlatformManagerAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 e3890885f7..ecd0d961a1 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 @@ -36,7 +36,7 @@ public class PluginManagerAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 0761568846..9989182d48 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 @@ -20,7 +20,7 @@ import java.awt.event.ActionEvent; public class ProcedureListAction extends UpdateAction { public ProcedureListAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure") + "(P)" + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/border/UITitledBorder.java b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java index 0c5adcc483..3987844cf8 100644 --- a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java +++ b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java @@ -17,6 +17,10 @@ public class UITitledBorder extends TitledBorder { return new UITitledBorder(title); } + public static UITitledBorder createBorderWithTitle(String title, int roundedCorner) { + return new UITitledBorder(title, roundedCorner); + } + private UITitledBorder(String title) { super( BorderFactory.createCompoundBorder( @@ -37,4 +41,29 @@ public class UITitledBorder extends TitledBorder { new Color(1, 159, 222) ); } + + /** + * @param title title + * @param roundedCorner corner width 圆弧宽度，即圆角直径 + */ + private UITitledBorder(String title, int roundedCorner) { + super( + BorderFactory.createCompoundBorder( + BorderFactory.createEmptyBorder( + 0, + 0, + 5, + 0), + new UIRoundedBorder( + UIConstants.TITLED_BORDER_COLOR, + 1, + roundedCorner) + ), + title, + TitledBorder.LEADING, + TitledBorder.TOP, + null, + new Color(1, 159, 222) + ); + } } \ No newline at end of file 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 f7b237ca01..188c330538 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 @@ -35,14 +35,14 @@ public abstract class ConditionAttributesPane extends BasicBeanPane { JPanel propertyChangePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); this.add(propertyChangePane); - propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Property") + ":", null)); + propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property") + ":", null)); // 选择要改变的属性. JPanel addItemPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); ToolBarDef toolbarDef = new ToolBarDef(); menuDef = new CellHighlightAddMenuDef(); - menuDef.setName(com.fr.design.i18n.Toolkit.i18nText("Highlight-Click_to_Choose_Property_To_Modify")); + menuDef.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index 5a52f9ee6d..9a6cd609e6 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -54,16 +54,16 @@ public abstract class LiteConditionPane extends BasicBeanPa private static final long serialVersionUID = 1L; // peter:这两个变量在弹出公式编辑器的时候,需要用. - 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 UIRadioButton commonRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common")); + private UIRadioButton formulaRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula")); private JPanel conditionCardPane; protected BasicBeanPane defaultConditionPane; // card2 private UITextArea formulaTextArea; private UIButton modifyButton; private UIButton addButton; - 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")); + private UIRadioButton andRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_ConditionB_AND") + " "); + private UIRadioButton orRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_ConditionB_OR")); protected JTree conditionsTree;// Conditions private UIButton removeButton; private UIButton moveUpButton; @@ -223,7 +223,7 @@ public abstract class LiteConditionPane extends BasicBeanPa } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), - com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); buttonPane.add(moveUpButton); moveUpButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/up.png")); moveUpButton.addActionListener(actionListener4); - moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); buttonPane.add(moveDownButton); moveDownButton.setIcon(BaseUtils.readIcon("com/fr/design/images/control/down.png")); moveDownButton.addActionListener(actionListener5); // peter:加括号 - bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Add_bracket")); + bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Add_bracket")); buttonPane.add(bracketButton); bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png")); bracketButton.addActionListener(actionListener6); // peter:去掉括号 - unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Remove_bracket")); + unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + ":"); + UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); + formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); formulaTextArea = new UITextArea(); formulaPane.add(new JScrollPane(formulaTextArea), BorderLayout.CENTER); - UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Define")); + UIButton editFormulaButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Modify"), BaseUtils.readIcon("com/fr/base/images/cell/control/rename.png")); + modifyButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Submit_Condition"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Common_Condition"), null)); + this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Common_Condition"), null)); cl.show(conditionCardPane, "DEFAULT"); } else { - this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LiteCondition_Formula_Condition"), null)); + this.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lite_Condition_Formula_Condition"), null)); cl.show(conditionCardPane, "FORMULA"); } } @@ -971,4 +971,4 @@ public abstract class LiteConditionPane extends BasicBeanPa return newCondition; } } -} \ No newline at end of file +} 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 1d8c82618c..b863717f60 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 @@ -79,7 +79,7 @@ public class ObjectLiteConditionPane extends LiteConditionPane conditionValuePane = ValueEditorPaneFactory.createAllValueEditorPane(); - Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConditionB-Operator") + ":"), new UILabel() }, + Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Operator") + ":"), new UILabel() }, { conditionOPComboBox, conditionValuePane } }; double p = TableLayout.PREFERRED; 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 0bd400eb2a..6dac67b1fc 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 @@ -79,7 +79,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp */ @Override public String getViewTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData"); } /** @@ -138,7 +138,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp } private boolean isProcedureName(String oldName) { - return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")); + return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")); } @@ -383,7 +383,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp private TableDataTree dataTree; public PreviewTableDataAction(TableDataTree dataTree) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); this.setMnemonic('p'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.PREVIEW_ICON_PATH)); this.dataTree = dataTree; @@ -422,7 +422,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp protected class ConnectionTableAction extends com.fr.design.actions.server.ConnectionListAction { public ConnectionTableAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 7f51d8f16d..dc891c1c63 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 @@ -208,9 +208,9 @@ public class ChoosePane extends BasicBeanPane implements Refresha } protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) { - 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") + ":"); + UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":"); + UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model") + ":"); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading") + "..."); + schemaBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Successfully") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh_Database"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table")); + ExpandMutableTreeNode tableTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 + "-" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View")); + ExpandMutableTreeNode viewTreeNode = new ExpandMutableTreeNode(selectedDSName + "-" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View")); rootTreeNode.add(viewTreeNode); for (int i = 0; i < sqlViewArray.length; i++) { ExpandMutableTreeNode viewChildTreeNode = new ExpandMutableTreeNode(sqlViewArray[i]); @@ -456,7 +456,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha if (!connect) { DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Failed"), JOptionPane.INFORMATION_MESSAGE); failedToFindTable(); return null; } 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 18d8bdcb06..1971c77809 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 @@ -19,7 +19,7 @@ public class RefreshLabel extends UIButton { this.refreshable = refreshable; - this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Refresh_Database")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2298206267..b480e168c4 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 @@ -36,7 +36,7 @@ public class ReportTableDataPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 0b298fdc93..533139b376 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 @@ -31,7 +31,7 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createReportTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"), + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), "ds", "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), @@ -56,7 +56,7 @@ public class TableDataCreatorProducer { return true; } }; - TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), + TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), "Proc", "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class) { @@ -69,7 +69,7 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createServerTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, DBTableDataPane.class); TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, ClassTableDataPane.class); 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 2b18c3e789..1ec28a97c5 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 @@ -113,7 +113,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator { * @return 提示 */ public String createTooltip() { - return b ? com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") : null; + return b ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") : null; } public String getPrefix() { 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 00a46a5f84..9c19013901 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 @@ -100,19 +100,19 @@ public class TableDataSourceOP implements UserObjectOP { } private ExpandMutableTreeNode initTemplateDataNode(Map templateDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-TableData"), TEMPLATE_TABLE_DATA), true); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData"), TEMPLATE_TABLE_DATA), true); templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap)); return templateNode; } private ExpandMutableTreeNode initServerDataNode(Map serverDataMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"), SERVER_TABLE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), SERVER_TABLE_DATA), false); templateNode.addChildTreeNodes(getNodeArrayFromMap(serverDataMap)); return templateNode; } private ExpandMutableTreeNode initStoreProcedureNode(Map storeProcedureMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 309502e806..37aa4ef123 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 @@ -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 = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), 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); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + ":" + selectedNO.getName() + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 32f89ac25d..81c7912825 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 @@ -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(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 = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Parent_Marked_Filed"), true); + lengthMarkRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Build_Tree_Accord_Marked_Filed_Length")); parentMarkRadio.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if (isBuildByParentFiled()) { @@ -90,11 +90,11 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { markButtonGroup.add(parentMarkRadio); markButtonGroup.add(lengthMarkRadio); - 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); + originFieldDependsOnParentLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT); + parentFieldLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parent_Marked_Field") + " :", SwingConstants.RIGHT); + treeDataFieldLabel1 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT); + originFieldDependsOnLengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Original_Marked_Filed") + " :", SwingConstants.RIGHT); + treeDataFieldLabel2 = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Data_Field") + " :", SwingConstants.RIGHT); // 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"))}); @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + UIButton treeDataPreviewButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ae577234dd..bd5f8ed51f 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 @@ -38,8 +38,8 @@ 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(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 l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEFT); + UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEFT); UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT); if (labelSize > 0) { 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 484a9c1161..a14944d5e6 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 @@ -29,7 +29,7 @@ import java.util.Set; * Connection List Pane. */ public class ConnectionListPane extends JListControlPane implements ConnectionShowPane { - public static final String TITLE_NAME = Toolkit.i18nText("Server-Define_Data_Connection"); + public static final String TITLE_NAME = Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection"); private boolean isNamePermitted = true; private HashMap renameMap = new HashMap(); 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 75127e5ee4..6c768145f3 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 @@ -1,8 +1,6 @@ package com.fr.design.data.datapane.connect; import com.fr.design.gui.frpane.LoadingBasicPane; -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; @@ -28,7 +26,7 @@ public class ConnectionManagerPane extends LoadingBasicPane implements Connectio @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 810f6adccc..ed09c87a88 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 @@ -112,15 +112,15 @@ public class ConnectionTableProcedurePane extends BasicPane { // 根据环境是否为中文设置不同的显示 if (GeneralContext.isChineseEnv()) { - first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table"), + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"), BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING)); - second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View"), + second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-Table")); - ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SQL-View")); + ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table")); + ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 e867febd53..aed07afb03 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 @@ -29,14 +29,13 @@ import java.awt.event.WindowEvent; */ public abstract class DatabaseConnectionPane extends BasicBeanPane { - // 编码转换. - private UIComboBox originalCharSetComboBox; - private UIComboBox newCharSetComboBox; private UILabel message; private UIButton okButton; private UIButton cancelButton; private JDialog dialog; private UILabel uiLabel; + private String oirginalCharSet = null; + private String newCharSet = null; // Database pane public DatabaseConnectionPane() { @@ -44,12 +43,10 @@ public abstract class DatabaseConnectionPane() { protected PreviewTableModel doInBackground() throws Exception { connectionBar.start(); - if (tableData instanceof DBTableData) { - boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase()); - if (!status) { - connectionBar.close(); - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); + try { + if (tableData instanceof DBTableData) { + boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase()); + if (!status) { + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); + } } + } finally { + connectionBar.close(); } - connectionBar.close(); TableDataSource dataSource = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getTarget(); previewTableData = DesignTableDataManager.previewTableDataNeedInputParameters(dataSource, tableData, (int) maxPreviewNumberField.getValue(), true); // parameterInputDialog @@ -420,7 +433,7 @@ public class PreviewTablePane extends BasicPane { public static void previewStoreData(final ProcedureDataModel storeProcedureDataModel, final int keyIndex, final int valueIndex) { final PreviewTablePane previewTablePane = new PreviewTablePane(); previewTablePane.storeProcedureDataModel = storeProcedureDataModel; - previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data"))); + previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"))); try { previewTablePane.populateStoreDataSQL(); @@ -451,7 +464,7 @@ public class PreviewTablePane extends BasicPane { for (int i = 0; i < tableSize; i++) { PreviewTablePane previewTablePane = new PreviewTablePane(); previewTablePane.storeProcedureDataModel = storeProcedureDataModels[i]; - previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data"))); + previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"))); try { previewTablePane.populateStoreDataSQL(); } catch (Exception e) { @@ -464,7 +477,7 @@ public class PreviewTablePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"); } }; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java index 92d8233f59..e475820a52 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java @@ -1 +1 @@ -package com.fr.design.data.datapane.sqlpane; import com.fr.base.FRContext; import com.fr.data.core.DataCoreUtils; import com.fr.data.core.db.TableProcedure; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.general.ComparatorUtils; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.*; import java.awt.event.ActionEvent; /** * Created by IntelliJ IDEA. * Author : Richer * Version: 7.0.3 * Date: 13-5-2 * Time: 上午11:09 */ public class SQLEditPane extends RSyntaxTextArea { public static final boolean REQUEST_DROPTARGET = true; public static final boolean UNREQUEST_DROPTARGET = false; public SQLEditPane() { this(REQUEST_DROPTARGET); } public SQLEditPane(boolean requestDroptarget) { super(); setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); setAnimateBracketMatching(true); setAntiAliasingEnabled(true); setAutoIndentEnabled(true); setCodeFoldingEnabled(true); setUseSelectedTextColor(true); setCloseCurlyBraces(true); setBracketMatchingEnabled(true); setAntiAliasingEnabled(true); setCloseMarkupTags(true); setLineWrap(true); if (requestDroptarget) { new SQLPaneDropTarget(this); } } private static class SQLPaneDropTarget extends DropTargetAdapter { private TableProcedure sqlTable; public SQLPaneDropTarget(SQLEditPane sqlTextPane) { new DropTarget(sqlTextPane, this); } public void dragEnter(DropTargetDragEvent dtde) { dtde.acceptDrag(dtde.getDropAction()); } public void dragOver(DropTargetDragEvent dtde) { dtde.acceptDrag(dtde.getDropAction()); } public void drop(DropTargetDropEvent dtde) { Point p = dtde.getLocation(); DropTargetContext dtc = dtde.getDropTargetContext(); SQLEditPane jTextPane = (SQLEditPane) dtc.getComponent(); try { Transferable tr = dtde.getTransferable(); DataFlavor[] flavors = tr.getTransferDataFlavors(); for (int i = 0; i < flavors.length; i++) { if (!tr.isDataFlavorSupported(flavors[i])) { continue; } dtde.acceptDrop(dtde.getDropAction()); Object userObj = tr.getTransferData(flavors[i]); if (userObj instanceof TableProcedure) { this.sqlTable = (TableProcedure) userObj; JPopupMenu popupMenu = new JPopupMenu(); popupMenu.add(new NameAction(jTextPane, sqlTable).createMenuItem()); if (ComparatorUtils.equals(sqlTable.getType(), TableProcedure.PROCEDURE)) { popupMenu.add(new CallAction(jTextPane, sqlTable).createMenuItem()); } else { popupMenu.add(new SelectAction(jTextPane, sqlTable).createMenuItem()); } GUICoreUtils.showPopupMenu(popupMenu, jTextPane, (int) p.getX() + 1, (int) p.getY() + 1); } dtde.dropComplete(true); } dtde.rejectDrop(); } catch (Exception e) { dtde.rejectDrop(); } } class NameAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public NameAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName(com.fr.design.i18n.Toolkit.i18nText("Name")); this.setMnemonic('N'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { if (sqlTable != null) { insertStringTo(sqlTextPane, sqlTable.toString()); } } } class SelectAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public SelectAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName("SELECT *"); this.setMnemonic('s'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { //daniel: 添加参数 insertStringTo(sqlTextPane, DataCoreUtils.createSelectSQL(sqlTable.getSchema(), sqlTable.getName(), sqlTable.getDialect())); } } class CallAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public CallAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName("CALL PROCEDURE "); this.setMnemonic('s'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { StringBuffer sBuf = new StringBuffer(); sBuf.append("{call "); if (sqlTable != null) { sBuf.append(sqlTable.toString()).append("()"); } sBuf.append('}'); insertStringTo(sqlTextPane, sBuf.toString()); } } private void insertStringTo(SQLEditPane sqlTextPane, String str) { Document document = sqlTextPane.getDocument(); try { document.insertString(sqlTextPane.getCaretPosition(), str, null); } catch (BadLocationException badLocationException) { FRContext.getLogger().error(badLocationException.getMessage(), badLocationException); } sqlTextPane.requestFocus(); } } } \ No newline at end of file +package com.fr.design.data.datapane.sqlpane; import com.fr.base.FRContext; import com.fr.data.core.DataCoreUtils; import com.fr.data.core.db.TableProcedure; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea; import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants; import com.fr.general.ComparatorUtils; import com.fr.design.utils.gui.GUICoreUtils; import javax.swing.*; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.*; import java.awt.event.ActionEvent; /** * Created by IntelliJ IDEA. * Author : Richer * Version: 7.0.3 * Date: 13-5-2 * Time: 上午11:09 */ public class SQLEditPane extends RSyntaxTextArea { public static final boolean REQUEST_DROPTARGET = true; public static final boolean UNREQUEST_DROPTARGET = false; public SQLEditPane() { this(REQUEST_DROPTARGET); } public SQLEditPane(boolean requestDroptarget) { super(); setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_SQL); setAnimateBracketMatching(true); setAntiAliasingEnabled(true); setAutoIndentEnabled(true); setCodeFoldingEnabled(true); setUseSelectedTextColor(true); setCloseCurlyBraces(true); setBracketMatchingEnabled(true); setAntiAliasingEnabled(true); setCloseMarkupTags(true); setLineWrap(true); if (requestDroptarget) { new SQLPaneDropTarget(this); } } private static class SQLPaneDropTarget extends DropTargetAdapter { private TableProcedure sqlTable; public SQLPaneDropTarget(SQLEditPane sqlTextPane) { new DropTarget(sqlTextPane, this); } public void dragEnter(DropTargetDragEvent dtde) { dtde.acceptDrag(dtde.getDropAction()); } public void dragOver(DropTargetDragEvent dtde) { dtde.acceptDrag(dtde.getDropAction()); } public void drop(DropTargetDropEvent dtde) { Point p = dtde.getLocation(); DropTargetContext dtc = dtde.getDropTargetContext(); SQLEditPane jTextPane = (SQLEditPane) dtc.getComponent(); try { Transferable tr = dtde.getTransferable(); DataFlavor[] flavors = tr.getTransferDataFlavors(); for (int i = 0; i < flavors.length; i++) { if (!tr.isDataFlavorSupported(flavors[i])) { continue; } dtde.acceptDrop(dtde.getDropAction()); Object userObj = tr.getTransferData(flavors[i]); if (userObj instanceof TableProcedure) { this.sqlTable = (TableProcedure) userObj; JPopupMenu popupMenu = new JPopupMenu(); popupMenu.add(new NameAction(jTextPane, sqlTable).createMenuItem()); if (ComparatorUtils.equals(sqlTable.getType(), TableProcedure.PROCEDURE)) { popupMenu.add(new CallAction(jTextPane, sqlTable).createMenuItem()); } else { popupMenu.add(new SelectAction(jTextPane, sqlTable).createMenuItem()); } GUICoreUtils.showPopupMenu(popupMenu, jTextPane, (int) p.getX() + 1, (int) p.getY() + 1); } dtde.dropComplete(true); } dtde.rejectDrop(); } catch (Exception e) { dtde.rejectDrop(); } } class NameAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public NameAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name")); this.setMnemonic('N'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { if (sqlTable != null) { insertStringTo(sqlTextPane, sqlTable.toString()); } } } class SelectAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public SelectAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName("SELECT *"); this.setMnemonic('s'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { //daniel: 添加参数 insertStringTo(sqlTextPane, DataCoreUtils.createSelectSQL(sqlTable.getSchema(), sqlTable.getName(), sqlTable.getDialect())); } } class CallAction extends UpdateAction { private SQLEditPane sqlTextPane; private TableProcedure sqlTable; public CallAction(SQLEditPane sqlTextPane, TableProcedure sqlTable) { this.sqlTextPane = sqlTextPane; this.sqlTable = sqlTable; this.setName("CALL PROCEDURE "); this.setMnemonic('s'); this.setSmallIcon(null); } public void actionPerformed(ActionEvent evt) { StringBuffer sBuf = new StringBuffer(); sBuf.append("{call "); if (sqlTable != null) { sBuf.append(sqlTable.toString()).append("()"); } sBuf.append('}'); insertStringTo(sqlTextPane, sBuf.toString()); } } private void insertStringTo(SQLEditPane sqlTextPane, String str) { Document document = sqlTextPane.getDocument(); try { document.insertString(sqlTextPane.getCaretPosition(), str, null); } catch (BadLocationException badLocationException) { FRContext.getLogger().error(badLocationException.getMessage(), badLocationException); } sqlTextPane.requestFocus(); } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java index cedd1deda9..a3248ba1d8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java @@ -117,24 +117,24 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel { private int getParameterType (Object value) { String type; if(value instanceof CursorEditor) - type= com.fr.design.i18n.Toolkit.i18nText("Cursor"); + type= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"); else if(value instanceof String ){ if(((String) value).length() > 0 && ((String) value).charAt(0) == '=') - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String"); }else if(value instanceof Integer) - type = com.fr.design.i18n.Toolkit.i18nText("Integer"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"); else if(value instanceof Double) - type = com.fr.design.i18n.Toolkit.i18nText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"); else if(value instanceof Date) - type = com.fr.design.i18n.Toolkit.i18nText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); else if(value instanceof Boolean) - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Boolean"); else if(value instanceof BaseFormula) - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 cc1b79187a..08f0c1f154 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 @@ -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( - com.fr.design.i18n.Toolkit.i18nText("Function-Choose_Function_Class") + ":")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Choose_Function_Class") + ":")); classFileTree = new ClassFileTree(); classFileTree.refreshEnv(); @@ -31,7 +31,7 @@ public class ClassNameSelectPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Function-Function_Class_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Function-The_selected_file_cannot_be_null")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5d8235b948..7cd8dec3e8 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 @@ -44,7 +44,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { classNameTextField = new UITextField(36); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); @@ -89,9 +89,9 @@ public class ClassTableDataPane extends AbstractTableDataPane { }); Component[][] components = { - {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\"")}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Class_Must_Implement_The_Interface") + "\"com.fr.data.Tabledata\"")}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -111,7 +111,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { new RemoveParaAction() }; } - }, " " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_TableData-Default-Para")); + }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Default_Para")); jpanel.add(editorPane, BorderLayout.CENTER); @@ -120,7 +120,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { public class AddParaAction extends UITableEditAction { public AddParaAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -136,7 +136,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { } private class RemoveParaAction extends UITableEditAction { public RemoveParaAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/control/remove.png")); } @@ -154,7 +154,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Class_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 574dcc5aa6..37ba914661 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 @@ -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 = 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 static final String PREVIEW_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"); + private static final String REFRESH_BUTTON = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Datasource-Param_DES")); + UILabel paraMean = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Param_DES")); paraMeanPane.add(paraMean, BorderLayout.CENTER); @@ -171,7 +171,7 @@ public class DBTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-DS-Database_Query"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { // JOptionPane.showMessageDialog(DBTableDataPane.this, - // com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") + "."); + // com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } } @@ -328,13 +328,13 @@ public class DBTableDataPane extends AbstractTableDataPane { private class EditPageQueryAction extends UpdateAction { public EditPageQueryAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_PageQuery")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Page_Query")); 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-LayerPageReport_Define_PageQuerySQL")); + final QueryPane pane = new QueryPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Page_Report_Define_Page_Query_SQL")); pane.populate(pageQuery); BasicDialog dialog = pane.showWindow(DesignerContext.getDesignerFrame()); dialog.addDialogActionListener(new DialogActionAdapter() { @@ -383,4 +383,4 @@ public class DBTableDataPane extends AbstractTableDataPane { return title; } } -} \ No newline at end of file +} 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 6fa6271313..42332f1cf2 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Utils-File_type") + ":")); + type.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-File_address"))); + centerPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"))); + setPanel.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Local_file") + ":", true); + localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection")); + chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Selection")); chooseFile.addActionListener(chooseFileListener); - testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); + testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "
" + String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(FileTableDataPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_JS_warning")); return; } params = getEditorPaneParameter(); @@ -224,7 +224,7 @@ public class FileTableDataPane extends AbstractTableDataPane { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + UIButton preview = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Encoding_Type") + ":"); + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FirstRow_IS_ColumnName"), false); + needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_JS_warning")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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")); + needColumnNameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FirstRow_IS_Column_Name"), true); + dismenberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dismenber") + ":"); + tableDismemberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember"), false); + tableDismemberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Dismember")); + spaceDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space"), true); + spaceDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Space")); + commaDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber"), false); + commaDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Comma_Dismenber")); + otherDismenberRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other") + ":", false); + otherDismenberRadioButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(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") + ":"); + igoreOneMoreDelimiterCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Series_Dismenber_As_Single"), true); + encodeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Type_Parameter") + "reportlets/excel/FineReport${abc}." + getFileSuffixToString() + "
" + String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); } @@ -782,7 +782,7 @@ public class FileTableDataPane extends AbstractTableDataPane { xmlNodeTree = new XMLNodeTree(); this.add(new JScrollPane(xmlNodeTree)); - keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_KeyPoint") + ":"); + keyPointLaber = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Key_Point") + ":"); 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_loadedTreeModel")); + ExpandMutableTreeNode rootTreeNode = new ExpandMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loaded_Tree_Model")); 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 bd06b39e3d..4863a27960 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 @@ -51,7 +51,7 @@ public class MaxMemRowCountPanel extends UIToolbar { this.setFloatable(false); this.setRollover(true); this.setBackground(UIConstants.NORMAL_BACKGROUND); - String[] cacheList = { com.fr.design.i18n.Toolkit.i18nText("Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Max-Mem-Row-Count") }; + String[] cacheList = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save_All_Records_In_Memory"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(" " + com.fr.design.i18n.Toolkit.i18nText("Row"))); + this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 42cdbda84b..4a5b33033a 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 @@ -88,7 +88,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane imp storeProcedureContextPane.setPreferredSize(new Dimension(680, 600)); JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure") + ":")); + namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Is_Share_DBTableData")); + isShareCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource-Stored_Procedure"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"); } @Override @@ -237,9 +237,9 @@ public class ProcedureDataPane extends AbstractTableDataPane imp if (StringUtils.isBlank(dbName)) { try { - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } catch (Exception e) { - JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Connect_SQL_Cannot_Null") + "."); + JOptionPane.showMessageDialog(ProcedureDataPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); } } @@ -357,7 +357,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp protected class RefreshAction extends UITableEditAction { public RefreshAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/ProcedureManagerPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java index 3c306e8df5..ff905a3fd4 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 @@ -22,7 +22,7 @@ public class ProcedureManagerPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 065d7ebfe9..e7b7e7026b 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 @@ -29,13 +29,13 @@ public class StoreProcedureParameterPane extends BasicPane { }; private static NameObject[] nameAndValue = new NameObject[]{ - 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(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"), StoreProcedureConstants.CURSOR), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String"), StoreProcedureConstants.VARCHAR), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"), StoreProcedureConstants.INTEGER), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), StoreProcedureConstants.DECIMAL), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), StoreProcedureConstants.DATE), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Boolean"), StoreProcedureConstants.BOOLEAN), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("IN_and_INOUT_type_not_as_cursor")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_And_Inout_Type_Not_As_Cursor")); } } @@ -71,16 +71,16 @@ public class StoreProcedureParameterPane extends BasicPane { schemaCombo = new UIComboBox(); initUIComboBox(schemaCombo, schemaName); JPanel namePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - namePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Name") + ":"), BorderLayout.WEST); + namePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.WEST); nameField = new UITextField(10); namePane.add(nameField, BorderLayout.CENTER); namePane.add(new UILabel(" "), BorderLayout.EAST); - valuePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_DEFAULT") + ":"), BorderLayout.WEST); + valuePane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Default") + ":"), BorderLayout.WEST); valuePane.add(valueEditPane, BorderLayout.CENTER); valuePane.add(new UILabel(" "), BorderLayout.EAST); Component[][] components = {{null}, {namePane}, - {addPane("Model", 1, schemaCombo)}, + {addPane("Fine-Design_Basic_Model", 1, schemaCombo)}, {valuePane}, {null} }; @@ -105,7 +105,7 @@ public class StoreProcedureParameterPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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=com.fr.design.i18n.Toolkit.i18nText("Cursor"); + type=com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"); else if(value instanceof String ){ if(((String) value).length() > 0 && ((String) value).charAt(0) == '=') - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String"); }else if(value instanceof Integer) - type = com.fr.design.i18n.Toolkit.i18nText("Integer"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"); else if(value instanceof Double) - type = com.fr.design.i18n.Toolkit.i18nText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"); else if(value instanceof Date) - type = com.fr.design.i18n.Toolkit.i18nText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); else if(value instanceof Boolean) - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Boolean"); else if(value instanceof BaseFormula) - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else - type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 b9276310fb..845010cd55 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 @@ -1,24 +1,23 @@ package com.fr.design.data.tabledata.tabledatapane; -import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.List; - -import javax.swing.BorderFactory; - import com.fr.base.StoreProcedureParameter; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.itableeditorpane.UITableEditAction; 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 javax.swing.BorderFactory; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.List; public class StoreProcedureTableModel extends UITableModelAdapter { public StoreProcedureTableModel() { - 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") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") }); if (shouldResponseDoubleClickAction()) { table.addMouseListener(new MouseAdapter() { @@ -36,7 +35,7 @@ public class StoreProcedureTableModel extends UITableModelAdapter(); } columnNameList = Arrays.asList(procedureDataModel.getColumnName()); @@ -176,7 +176,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { return null; } }.execute(); - connectionBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Utils-Now_create_connection"), "", 0, 100) { + connectionBar = new AutoProgressBar(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Now_Create_Connection"), "", 0, 100) { public void doMonitorCanceled() { connectionBar.close(); worker.cancel(true); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index 622f88204c..28c6628a6c 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java @@ -3,17 +3,37 @@ package com.fr.design.data.tabledata.wrapper; import com.fr.base.FRContext; import com.fr.base.TableData; import com.fr.data.TableDataSource; -import com.fr.data.impl.*; +import com.fr.data.impl.ClassTableData; +import com.fr.data.impl.DBTableData; +import com.fr.data.impl.DecoratedTableData; +import com.fr.data.impl.EmbeddedTableData; +import com.fr.data.impl.FileTableData; +import com.fr.data.impl.MultiFieldTableData; +import com.fr.data.impl.MultiTDTableData; +import com.fr.data.impl.RecursionTableData; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.data.datapane.TableDataNameObjectCreator; -import com.fr.design.data.tabledata.tabledatapane.*; +import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.ClassTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.DBTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.DecoratedTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.EmbeddedTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.FileTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.ProcedureDataPane; +import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.file.TableDataConfig; import com.fr.general.ComparatorUtils; +import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import java.lang.reflect.Constructor; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; /** @@ -155,12 +175,17 @@ public abstract class TableDataFactory { @SuppressWarnings("unchecked") public static String[] getSortOfChineseNameOfServerData(TableDataConfig tableDataConfig) { clearAll(); - java.util.Iterator nameIt = tableDataConfig.getTableDatas().keySet().iterator(); - while (nameIt.hasNext()) { - String name = nameIt.next(); - TableData td = TableDataConfig.getInstance().getTableData(name); - addName(name, td); + try { + java.util.Iterator nameIt = tableDataConfig.getTableDatas().keySet().iterator(); + while (nameIt.hasNext()) { + String name = nameIt.next(); + addName(name, tableDataConfig.getTableData(name)); + } + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + return ArrayUtils.EMPTY_STRING_ARRAY; } + return getSortedNameArray(); } 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 a50b846418..8c70536505 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Hyperlink_Name") + ":"), BorderLayout.WEST); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2fc2f53e06..aac7461c33 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 @@ -80,7 +80,7 @@ public class InformationWarnPane extends JPanel{ }); arrow.setBounds(90,100,30,30); - UILabel more = new UILabel(""+com.fr.design.i18n.Toolkit.i18nText("More-information")+""); + UILabel more = new UILabel(""+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Information")+""); more.setBounds(125,102,55,25); moreText = new UITextArea(moreInfo); 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 0326540abc..95894bd014 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 @@ -1,5 +1,14 @@ package com.fr.design.dialog; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.layout.FRGUIPaneFactory; + +import javax.swing.BorderFactory; +import javax.swing.Icon; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JSeparator; import java.awt.BorderLayout; import java.awt.CardLayout; import java.awt.Dialog; @@ -10,16 +19,6 @@ import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.BorderFactory; -import javax.swing.Icon; -import javax.swing.JDialog; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; -import javax.swing.JSeparator; - -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.layout.FRGUIPaneFactory; - /** * Wizard dialog. @@ -104,25 +103,25 @@ public class JWizardDialog extends BasicDialog { workArea.setLayout(cardLayout); // Buttons - buttonBack = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Previous")); + buttonBack = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Previous")); buttonBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { back(); } }); - buttonNext = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Next")); + buttonNext = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Next")); buttonNext.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { next(); } }); - buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Finish")); + buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Finish")); buttonFinish.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { finish(); } }); - buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); buttonCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { cancel(); @@ -365,4 +364,4 @@ public class JWizardDialog extends BasicDialog { @Override public void checkValid() throws Exception { } -} \ No newline at end of file +} 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 c704705885..bfba65b942 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 @@ -100,7 +100,7 @@ public abstract class UIDialog extends JDialog { } private void addCancelButton(JPanel buttonsPane) { - cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); cancelButton.setName(CANCEL_BUTTON); cancelButton.setMnemonic('C'); buttonsPane.add(cancelButton); 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 7768cd0368..de8df9a718 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}), BorderLayout.NORTH); + content.add(new DoubleDeckValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula"))) { + if (ComparatorUtils.equals(cards[i].getName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), 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); + int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula") + + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.YES_NO_OPTION); if (returnValue == JOptionPane.OK_OPTION) { setCurrentEditor(j); @@ -426,4 +426,4 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} 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 88651f32b6..4ebe3c83fa 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 @@ -101,7 +101,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy")); + globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { + if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula"))) { + if (ComparatorUtils.equals(cards[i].getName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), 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); + int returnValue = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit_String_To_Formula") + + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), 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 aaecbcef41..71959b72da 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 @@ -83,7 +83,7 @@ public class ValueEditorPaneFactory { * @return 返回公式编辑器面板 */ public static ValueEditorPane createFormulaValueEditorPane() { - return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula"))}, + return createValueEditorPane(new Editor[]{new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula"))}, StringUtils.EMPTY, StringUtils.EMPTY); } @@ -227,12 +227,12 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] basicEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ new TextEditor(), new SpinnerIntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor }; @@ -244,15 +244,15 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] formEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, - new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget")) + new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget")) }; } @@ -262,16 +262,16 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] extendedEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")) }; } @@ -281,17 +281,17 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] extendedCellGroupEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), - new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), + new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group")) }; } @@ -302,8 +302,8 @@ public class ValueEditorPaneFactory { */ public static Editor[] cellGroupEditor() { return new Editor[]{ - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), - new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Cell_Group")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), + new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName), + new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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) ? 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")) + new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None") : popupName), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), + new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")) }; } @@ -342,17 +342,17 @@ public class ValueEditorPaneFactory { * @return 值编辑器 */ public static Editor[] allEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); // formulaEditor.setEnabled(true); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), new ColumnSelectedEditor(), //23328 allEditors中删除控件选项 // 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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), }; } @@ -380,12 +380,12 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] noCRnoColumnEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), @@ -398,7 +398,7 @@ public class ValueEditorPaneFactory { * @return 编辑器 */ public static Editor[] numberEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); return new Editor[]{ - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), formulaEditor, new ParameterEditor(), }; @@ -427,14 +427,14 @@ public class ValueEditorPaneFactory { * @return 存储过程的编辑器 */ public static Editor[] StoreProcedureEditors() { - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); formulaEditor.setEnabled(true); return new Editor[]{ new CursorEditor(), new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"))); + list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"))); list.add(new BooleanEditor()); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Formula")); formulaEditor.setEnabled(true); list.add(formulaEditor); @@ -493,15 +493,15 @@ public class ValueEditorPaneFactory { JPanel paneLeft = FRGUIPaneFactory.createBorderLayout_S_Pane(); pane.add(paneLeft); - paneLeft.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Actual_Value") + ":"), BorderLayout.NORTH); + paneLeft.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), BorderLayout.NORTH); paneLeft.add(keyColumnPane, BorderLayout.CENTER); JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane(); pane.add(paneRight); - paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH); + paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), BorderLayout.NORTH); paneRight.add(valueDictPane, BorderLayout.CENTER); return pane; } -} \ No newline at end of file +} 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 78ee449d91..af2589d455 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 @@ -42,7 +42,7 @@ public class BooleanEditor extends Editor { booleanCheckBox = new UICheckBox("true"); this.add(booleanCheckBox, BorderLayout.CENTER); this.setValue(value); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d092db22bf..e3b5dacccd 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 @@ -26,7 +26,7 @@ public class ColumnIndexEditor extends Editor { * @param value */ public ColumnIndexEditor(int value) { - this(value, com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); + this(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3cd7dddb20..f4d2a132cf 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 @@ -23,7 +23,7 @@ public class ColumnNameEditor extends ColumnIndexEditor { } public ColumnNameEditor(String[] columnNames) { - this(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")); + this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")); } public ColumnNameEditor(final String[] columnNames, String name) { 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 461d657f19..3b658d0cef 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 @@ -12,10 +12,10 @@ public class CursorEditor extends Editor { public CursorEditor(){ this.setLayout(FRGUIPaneFactory.createCenterFlowLayout()); - label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.add(label); this.setPreferredSize(new Dimension(10,20)); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.setEnabled(false); } @@ -36,7 +36,7 @@ public class CursorEditor extends Editor { @Override public void setValue(CursorEditor value) { - label.setText(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 0604c677a6..b39c16fe56 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 @@ -16,7 +16,7 @@ public class DoubleEditor extends NumberEditor { } public DoubleEditor(Double value) { - super(value, com.fr.design.i18n.Toolkit.i18nText("Parameter-Double")); + super(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 00909d7f04..e3f6052194 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 @@ -16,7 +16,7 @@ public class FloatEditor extends NumberEditor { } public FloatEditor(Float value) { - super(value, com.fr.design.i18n.Toolkit.i18nText("Parameter-Float")); + super(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 86fbe305b2..b68c62b6d3 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 @@ -18,7 +18,7 @@ public class IntegerEditor extends NumberEditor { } public IntegerEditor(Integer value) { - super(value, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer")); + super(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 42d117862f..b2cb6dc211 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 @@ -51,8 +51,8 @@ public class OldColumnIndexEditor extends Editor { } protected void initComponents() { - indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index")); - nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName")); + indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index")); + nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")); 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 813ca021ff..be25cab036 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 @@ -28,7 +28,7 @@ public class ParameterEditor extends Editor { this.add(parameterCombobox, BorderLayout.CENTER); this.setValue(parameter); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 140ea8d94e..8d2bdb48ba 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter_Integer")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 0632be2e46..7084fbcc45 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 @@ -45,7 +45,7 @@ public class TextEditor extends Editor { this.textField.addKeyListener(textKeyListener); this.setValue(value); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Parameter-String")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5676701640..0aaaea3ae8 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 @@ -34,7 +34,7 @@ public class XMLANameEditor extends ColumnIndexEditor{ * @param columnNames 度量值 */ public XMLANameEditor(String[] columnNames) { - this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Measure")); + this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Measure")); } /** diff --git a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java index 70de034416..7da0d9fe0f 100644 --- a/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java +++ b/designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java @@ -77,7 +77,8 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo { @Override public boolean checkValid(){ File file = new File(this.path); - if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF")) { + //判断不是文件夹/路径不在WEB-INF下/代码启动三种情况 + if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF") || this.path.startsWith(".")) { return false; } 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 d2b30d3125..0eb1144665 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 @@ -98,7 +98,7 @@ public abstract class PluginAbstractLoadingViewPane extends PluginAbstract @Override public String textForInstallButton() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ca1620aebb..393626ce01 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 @@ -8,7 +8,6 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.IOUtils; -import com.fr.plugin.context.PluginContext; import com.fr.plugin.context.PluginMarker; import com.fr.plugin.license.Licensed; import com.fr.plugin.manage.PluginManager; @@ -59,7 +58,7 @@ public class PluginControlPane extends BasicPane { doSearch(searchTextField.getText()); } }); - add(GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH); + add(GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Search") + ":"), searchTextField, FlowLayout.LEFT), BorderLayout.NORTH); pluginList = new UIList(); DefaultListCellRenderer renderer = new DefaultListCellRenderer() { @@ -74,12 +73,12 @@ public class PluginControlPane extends BasicPane { } String extraInfo = ""; if (context.isLicDamaged()) { - extraInfo = "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Plugin_Damaged") + ")"; + extraInfo = "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Plugin_Damaged") + ")"; } else if (!context.isFree()) { if (context.isAvailable()) { - 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") + ")"; + extraInfo = "(" + (context.isOnTrial() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Trial") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Authorized")) + context.getLeftDays() + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Left") + ")"; } else { - 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") + ")"; + extraInfo = "(" + (context.isOnTrial() ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Trial") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Authorized")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Designer_Expired") + ")"; } } setText(((PluginView) value).getName() + extraInfo); @@ -95,7 +94,7 @@ public class PluginControlPane extends BasicPane { PluginDescriptionLabel label = new PluginDescriptionLabel(); - label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2d87777fae..cd80d8eb7a 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 @@ -26,7 +26,7 @@ public class PluginDetailPane extends BasicPane { public PluginDetailPane() { setLayout(new BorderLayout()); PluginDescriptionLabel label = new PluginDescriptionLabel(); - label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Plugin_Description")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 c02d2c416e..3f7caf2fb9 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 @@ -59,13 +59,13 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane plugins) { controlPane.loadPlugins(plugins); - tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_All_Plugins") + "(" + plugins.size() + ")"); + tabbedPane.setTitleAt(2, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins") + "(" + plugins.size() + ")"); } /** @@ -177,14 +177,14 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane plugins) { controlPane.loadPlugins(plugins); - tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update") + "(" + plugins.size() + ")"); + tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update") + "(" + plugins.size() + ")"); } /** @@ -155,7 +155,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane map = new HashMap(); map.put("name", pluginName); @@ -172,12 +172,12 @@ public class PluginUtils { return ""; } - return com.fr.design.i18n.Toolkit.i18nText(getInterKeyByErrorCode(errorCode)); + return com.fr.design.i18n.Toolkit.i18nCompatibleServerText(getInterKeyByErrorCode(errorCode)); } private static String getInterKeyByErrorCode(PluginErrorCode errorCode) { - return ERROR_CODE_I18N_PREFIX + errorCode.getDescription(); + return errorCode.getDescription(); } public static PluginMarker getInstalledPluginMarkerByID(String pluginID) { @@ -246,7 +246,7 @@ public class PluginUtils { int leftDays = plugin.getLeftDays(); if (leftDays == Integer.MAX_VALUE) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Store_Permanent"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 189b448a76..3ab17b92ea 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 @@ -53,7 +53,6 @@ public class PluginWebBridge { private static final String PLUGIN_INFO = "pluginInfo"; private static final int COREPOOLSIZE = 3; private static final int MAXPOOLSIZE = 5; - private static final String I18N_PREFIX = "FR-"; private static PluginWebBridge helper; @@ -380,11 +379,11 @@ public class PluginWebBridge { int rv = JOptionPane.showOptionDialog( null, message, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, - 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")}, + new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Restart_Designer_Later")}, null ); if (rv == JOptionPane.OK_OPTION) { @@ -571,13 +570,15 @@ public class PluginWebBridge { //todo 初始化设计器其他部分 } + /** - * 国际化 + * 国际化(用来做兼容，暂时不删) */ public String parseI18(final String key) { - return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + key); + return com.fr.design.i18n.Toolkit.i18nText(key); } + /** * 是否是在设计器中操作 */ diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java index 1d3f1ac2b7..3e2cafdfea 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebPane.java @@ -1,6 +1,7 @@ package com.fr.design.extra; import com.fr.base.TemplateUtils; +import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.StableUtils; @@ -30,6 +31,7 @@ import java.util.Map; */ public class PluginWebPane extends JFXPanel { private static final String RESOURCE_URL = "resourceURL"; + private static final String LANGUAGE = "language"; private WebEngine webEngine; public PluginWebPane(final String installHome, final String mainJs) { @@ -75,6 +77,7 @@ public class PluginWebPane extends JFXPanel { Map map4Tpl = new HashMap(); map4Tpl.put(RESOURCE_URL, "file:///" + URLEncoder.encode(installHome, "UTF-8")); + map4Tpl.put(LANGUAGE, GeneralContext.getLocale().toString()); while ((line = read.readLine()) != null) { if (sb.length() > 0) { sb.append('\n'); 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 747e12acf3..8895e83e45 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_PluginMarket_Coding")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Plugin_Market_Coding")); } return parseResText(resText, plugins); } @@ -75,7 +75,7 @@ public class PluginsReaderFromStore { } } } catch (JSONException e) { - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Read_Plugin_List_Error")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d2a20e05f1..4773aff689 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 @@ -22,7 +22,7 @@ public class QQLoginDialog extends UIDialog { setSize(DEFAULT_SHOP); GUICoreUtils.centerWindow(this); setResizable(false); - setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 db7e32e7cf..f3d37cab70 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 @@ -177,7 +177,7 @@ public class QQLoginWebPane extends JFXPanel { dialog.close(); } }).build(), - ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Cancel")).cancelButton(true).onAction(new EventHandler() { + ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 4adb074574..c7d0894f95 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 @@ -26,6 +26,6 @@ public class ShopManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 084f3fce21..11bfc334ab 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 @@ -64,8 +64,8 @@ public class WebViewDlgHelper { if (!file.exists()) { int rv = JOptionPane.showConfirmDialog( null, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE ); @@ -82,7 +82,7 @@ public class WebViewDlgHelper { int rv = JOptionPane.showConfirmDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Manager"); } }; traditionalStorePane.setLayout(new BorderLayout()); @@ -201,8 +201,8 @@ public class WebViewDlgHelper { private static void confirmDownLoadShopJS() { int rv = JOptionPane.showConfirmDialog( null, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Install"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update"), new PluginUpdatePane(tabbedPane)); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); return tabbedPane; } @@ -266,7 +266,7 @@ public class WebViewDlgHelper { } }); } catch (PluginVerifyException e) { - JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, e.getMessage(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Installed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), 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, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Shop_Need_Update"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Update"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 8928c3671a..1e170c8443 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 @@ -37,13 +37,13 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("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")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success")); } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - 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"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, - com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Install_Lower"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 7055df6c9e..9b86641e66 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 @@ -35,13 +35,13 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback { String pluginInfo = PluginOperateUtils.getSuccessInfo(result); if (result.isSuccess()) { jsCallback.execute("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")); + FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success")); + JOptionPane.showMessageDialog(null, pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Success")); } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){ int rv = JOptionPane.showOptionDialog( null, - com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Has_Install_Lower"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Install_Lower"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Failed")); + JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a945e85442..681180053e 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 @@ -22,10 +22,10 @@ public class ModifyStatusCallback implements PluginTaskCallback{ public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("success"); - 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"); + String modifyMessage = isActive ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Has_Been_Disabled_Duplicate") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Plugin_Has_Been_Actived_Duplicate"); JOptionPane.showMessageDialog(null, modifyMessage); } else { - JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d3d1b2ab0a..a6f781b94b 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 @@ -25,13 +25,13 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("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")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Success")); }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) { int rv = JOptionPane.showOptionDialog( null, - 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"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2d7ed2c061..cd0ccab848 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 @@ -37,13 +37,13 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback { public void done(PluginTaskResult result) { if (result.isSuccess()) { jsCallback.execute("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")); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) { int rv = JOptionPane.showOptionDialog( null, - 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"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, - com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_No_Plugin_Update"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_No_Plugin_Update"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed")); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 cad84e8c9a..c857960c78 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 @@ -31,12 +31,12 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback { String pluginInfo = PluginOperateUtils.getSuccessInfo(result); if (result.isSuccess()) { jsCallback.execute("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")); + FineLoggerFactory.getLogger().info(pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); + JOptionPane.showMessageDialog(null,pluginInfo + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Success")); } else { jsCallback.execute("failed"); - 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); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Failed")); + JOptionPane.showMessageDialog(null, pluginInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 645fa3df4a..468e923166 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 @@ -32,11 +32,11 @@ public class UpdateOnlineCallback implements ProgressCallback { public void done(PluginTaskResult result){ if (result.isSuccess()) { 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")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Successful")); } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) { int rv = JOptionPane.showOptionDialog( null, - 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_Dependence"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"), JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE, @@ -50,7 +50,7 @@ public class UpdateOnlineCallback implements ProgressCallback { PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane)); } else { 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); + JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_MESSAGE); } } } 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 4e991c05c3..b1cb56ede1 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 @@ -167,14 +167,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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Song_TypeFace"), 0, 12)); + this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Close_Other_Templates")); + UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Close_Other_Templates")); setListDownItemPreferredSize(closeOther); closeOther.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -694,8 +694,8 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M //如果在权限编辑情况下，不允许切换到表单类型的工作簿 if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) { DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex)); - 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); + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") + + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE); this.repaint(); return; } @@ -734,7 +734,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M if (!specifiedTemplate.isALLSaved() && !DesignerMode.isVcsMode()) { specifiedTemplate.stopEditing(); - int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(); 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 a3c54113a0..295b63385b 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.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_Basic_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_Basic_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 +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("Fine-Design_Basic_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("Fine-Design_Basic_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_Basic_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("Fine-Design_Basic_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_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a6818827c5..e3d12da1ac 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 @@ -168,7 +168,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (reportPaths.length == 0) { return; } - if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) { + if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete_File")) != JOptionPane.OK_OPTION) { return; } for (String reportPath : reportPaths) { @@ -176,7 +176,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { if (nodeFile.isLocked()) { if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"), - com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { refreshDockingView(); } break; @@ -187,7 +187,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { fileAssistUtils.moveToTrash(nodeFile.getPath()); deleteHistory(path.replaceAll("/", "\\\\")); } else { - JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Warning-Template_Do_Not_Exsit"), ProductConstants.PRODUCT_NAME, + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 9c4a7f3909..c2c69299d1 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 @@ -89,7 +89,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" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips"); + String tip = "\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Tips"); if (text.contains(tip)) { text = text.substring(0, text.indexOf(tip)); insertPosition = 0; @@ -161,7 +161,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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Search")); + UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search")); searchPane.add(searchButton, BorderLayout.EAST); tipsPane.add(searchPane, BorderLayout.NORTH); initKeyWordTextFieldKeyListener(); @@ -188,7 +188,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(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Input_formula_in_the_text_area_below") + ":" + UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":" + " "); formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); initFormulaTextArea(); @@ -201,7 +201,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { initTipsPane(); - UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Check_Valid")); + UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Check_Valid")); checkValidButton.addActionListener(checkValidActionListener); JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); @@ -477,7 +477,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Formula_Definition"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Formula_Definition"); } /** @@ -496,7 +496,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" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Tips")); + this.formulaTextArea.setText("\n\n\n" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Tips")); this.formulaTextArea.setCaretPosition(0); ifHasBeenWriten = 0; this.listModel.removeAllElements(); @@ -568,7 +568,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { * 不需要eval * TODO 但有个问题,有些函数的参数个数是有规定的,何以判别之 */ - (expression != null ? com.fr.design.i18n.Toolkit.i18nText("FormulaD-Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("FormulaD-Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME, + (expression != null ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Valid_Formula") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Invalid_Formula")) + ".", ProductConstants.PRODUCT_NAME, JOptionPane.INFORMATION_MESSAGE); } } @@ -588,7 +588,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(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_category") + ":", functionTypeScrollPane), BorderLayout.WEST); + functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST); initTypeListCellRenderer(); initGroupTypeModel(); initTypeListSelectionListener(); @@ -702,7 +702,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList); functionNameScrollPane.setPreferredSize(new Dimension(140, 200)); functionPane.add( - this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Function_name") + ":", functionNameScrollPane), + this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane), BorderLayout.CENTER); functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC)); initFunctionNameListCellRenderer(); @@ -716,7 +716,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea); desScrollPane.setBorder(null); - this.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); + this.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.EAST); descriptionTextArea.setBackground(Color.white); descriptionTextArea.setLineWrap(true); descriptionTextArea.setWrapStyleWord(true); @@ -789,7 +789,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( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.CENTER); variablesTree.setRootVisible(false); variablesTree.setShowsRootHandles(true); variablesTree.addMouseListener(applyTextMouseListener); @@ -818,7 +818,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { private class LookDetailAction extends UpdateAction { public LookDetailAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail")); this.setMnemonic('L'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); } @@ -833,7 +833,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { BasicPane basicPane = new BasicPane() { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Function_Detail"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail"); } }; basicPane.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -924,12 +924,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { rootNode.add(bindCellNode); } - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Data_Fields"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Data_Fields"), BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"), variableResolver.resolveColumnNames()).createMutableTreeNode()); // Set cutReport Variable - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaPane_Variables"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"), BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); @@ -937,11 +937,11 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("ParameterD-Report_Parameter"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ParameterD_Report_Parameter"), BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"), variableResolver.resolveReportParameterVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 752f005a2a..e08f7e3b40 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 @@ -25,7 +25,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { @Override protected void extendCheckBoxPane(JPanel checkBoxPane) { // peter:添加公式是否兼容Excel的属性 - reserveCheckBox4Result = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export-Save-Formula")); + reserveCheckBox4Result = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export_Save_Formula")); reserveCheckBox4Result.setSelected(false); reserveCheckBox4Result.addChangeListener(new ChangeListener() { @@ -38,7 +38,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { } } }); - reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write-Save-Formula")); + reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 74f1953fd8..4595b04ac0 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 @@ -96,7 +96,7 @@ public abstract class FunctionConstants { public static FunctionGroup CUSTOM = new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Custom_Function"); } @Override @@ -117,25 +117,25 @@ public abstract class FunctionConstants { } }; - public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FormulaD-Most_Recently_Used"), new Function[] { + public static NameAndFunctionList COMMON = new NameAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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_Basic_FormulaD_Math_&_Trig"), Function.MATH), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Text"), Function.TEXT), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Date_&_Time"), Function.DATETIME), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Logical"), Function.LOGIC), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Array"), Function.ARRAY), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Report"), Function.REPORT), + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Other"), Function.OTHER), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA) }; public static FunctionGroup ALL = new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-All"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a18c13cd7a..3d56dd925e 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 @@ -44,7 +44,7 @@ public class FunctionManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Function-Function_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Function_Manager"); } /** @@ -94,7 +94,7 @@ public class FunctionManagerPane extends BasicPane { @Override public NameableCreator[] createNameableCreators() { - NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function"), FunctionDef.class, + NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), + northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Function_Description_Area_Text", path1, path2)); + descriptionArea.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Description") + ":"), BorderLayout.NORTH); + descriptionPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Description") + ":"), BorderLayout.NORTH); this.descriptionTextArea = new UITextArea(6, 24); descriptionPane.add(new JScrollPane(this.descriptionTextArea), BorderLayout.CENTER); } @@ -211,4 +211,4 @@ public class FunctionManagerPane extends BasicPane { return editing; } } -} \ No newline at end of file +} 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 4bfd27189f..6c99f24c68 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Save")); + UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save")); saveButton.setAction(new SaveAction()); - UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Compile")); + UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile")); compileButton.setAction(new CompilerAction()); toolbarPane.add(saveButton); toolbarPane.add(compileButton); @@ -141,7 +141,7 @@ public class JavaEditorPane extends BasicPane { private class SaveAction extends AbstractAction { //新建文件命令 public SaveAction() { - super(com.fr.design.i18n.Toolkit.i18nText("Save")); + super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save")); } public void actionPerformed(ActionEvent e) { saveTextToFile(javaText.getText()); @@ -168,7 +168,7 @@ public class JavaEditorPane extends BasicPane { private class CompilerAction extends AbstractAction { public CompilerAction() { - super(com.fr.design.i18n.Toolkit.i18nText("Compile")); + super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 = com.fr.design.i18n.Toolkit.i18nText("Compile_Success") + "!"; + message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!"; } JOptionPane.showMessageDialog(null, message); } catch (InterruptedException e1) { @@ -199,7 +199,7 @@ public class JavaEditorPane extends BasicPane { } protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FormulaD-Custom_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5348c12b45..222aa90fec 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 @@ -38,7 +38,7 @@ public abstract class SortFormulaPane extends JPanel { sortFormulaTextField = new UITextField(16); //Lance:添加一公式编辑器按钮 sortFormulaTextFieldButton = new UIButton("..."); - sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "..."); + sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "..."); sortFormulaTextFieldButton.setPreferredSize(new Dimension(25, sortFormulaTextFieldButton.getPreferredSize().height)); sortFormulaTextFieldButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -48,7 +48,7 @@ public abstract class SortFormulaPane extends JPanel { 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(com.fr.design.i18n.Toolkit.i18nText("Formula") + ":="), sortFormulaTextField, //selectButton, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2a2b6db5c0..d3060b42b8 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 @@ -35,11 +35,11 @@ public class TinyFormulaPane extends BasicBeanPane implements UIObserver protected void initComponents() { formulaTextField = new UITextField(); - formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand")); + formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand")); // 添加一公式编辑器按钮 formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); - formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula") + "..."); + formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 47d1532fa2..bc2cbdbf90 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 @@ -18,7 +18,7 @@ public class HyperlinkFilterHelper { return false; } //先屏蔽掉这个，之后还有别的 - String[] names = {com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Float")}; + String[] names = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ 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 = {com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Float"), com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Chart_Cell")}; + String[] names = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ Hyperlink_Chart_Float"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 = com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); + String formName = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 8c2c288538..a269359b73 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 @@ -25,7 +25,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane { this.add(pane, BorderLayout.NORTH); JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column") + ":")); + colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("Row") + ":")); + rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") + ":")); initRowSpinner(); rowPane.add(rowSpinner); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/CommonShortCutHandlers.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/CommonShortCutHandlers.java new file mode 100644 index 0000000000..42c0d2f2d0 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/CommonShortCutHandlers.java @@ -0,0 +1,212 @@ +package com.fr.design.gui.controlpane; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.gui.ilist.JNameEdList; +import com.fr.design.gui.ilist.ListModelElement; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.ComparatorUtils; +import com.fr.stable.ArrayUtils; +import com.fr.stable.Nameable; + +import javax.swing.DefaultListModel; +import javax.swing.SwingUtilities; +import java.awt.Component; +import java.util.Arrays; +import java.util.Comparator; + +/** + * 存放一些通用的事件处理方法 + * Created by plough on 2018/8/13. + */ +public class CommonShortCutHandlers { + ListControlPaneProvider listControlPane; + JNameEdList nameableList; + + private CommonShortCutHandlers(ListControlPaneProvider listControlPane) { + this.listControlPane = listControlPane; + this.nameableList = listControlPane.getNameableList(); + } + + public static CommonShortCutHandlers newInstance(ListControlPaneProvider listControlPane) { + return new CommonShortCutHandlers(listControlPane); + } + + public void onAddItem(NameableCreator creator) { + if (listControlPane.hasInvalid(true)) { + return; + } + + Nameable nameable = creator.createNameable(listControlPane); + listControlPane.addNameable(nameable, listControlPane.getModel().getSize()); + } + + public void onRemoveItem() { + try { + nameableList.getCellEditor() + .stopCellEditing(); + } catch (Exception ignored) { + } + if (GUICoreUtils.removeJListSelectedNodes(SwingUtilities + .getWindowAncestor((Component) listControlPane), nameableList)) { + listControlPane.checkButtonEnabled(); + } + } + + public void onCopyItem() { + // p:选中的值. + ListModelElement selectedValue = (ListModelElement) nameableList.getSelectedValue(); + if (selectedValue == null) { + return; + } + + listControlPane.getControlUpdatePane().update(); + + Nameable selectedNameable = selectedValue.wrapper; + + // p: 用反射机制实现 + try { + Nameable newNameable = (Nameable) BaseUtils.cloneObject(selectedNameable); + newNameable.setName(createUnrepeatedCopyName(selectedNameable.getName())); + + listControlPane.addNameable(newNameable, listControlPane.getSelectedIndex() + 1); + } catch (Exception e) { + FRContext.getLogger().error(e.getMessage(), e); + } + } + + public void onMoveUpItem() { + int selectedIndex = nameableList.getSelectedIndex(); + if (selectedIndex == -1) { + return; + } + + // 上移 + if (selectedIndex > 0) { + DefaultListModel listModel = (DefaultListModel) nameableList.getModel(); + Object selecteObj1 = listModel.get(selectedIndex - 1); + listModel.set(selectedIndex - 1, listModel.get(selectedIndex)); + listModel.set(selectedIndex, selecteObj1); + + nameableList.setSelectedIndex(selectedIndex - 1); + nameableList.ensureIndexIsVisible(selectedIndex - 1); + } + } + + public void onMoveDownItem() { + int selectedIndex = nameableList.getSelectedIndex(); + if (selectedIndex == -1) { + return; + } + + if (selectedIndex < nameableList.getModel().getSize() - 1) { + DefaultListModel listModel = (DefaultListModel) nameableList + .getModel(); + + Object selecteObj1 = listModel.get(selectedIndex + 1); + listModel.set(selectedIndex + 1, listModel.get(selectedIndex)); + listModel.set(selectedIndex, selecteObj1); + + nameableList.setSelectedIndex(selectedIndex + 1); + nameableList.ensureIndexIsVisible(selectedIndex + 1); + } + } + + public void onSortItem(boolean isAtoZ) { + // p:选中的值. + Object selectedValue = nameableList.getSelectedValue(); + + DefaultListModel listModel = (DefaultListModel) nameableList + .getModel(); + Nameable[] nameableArray = new Nameable[listModel.getSize()]; + if (nameableArray.length <= 0) { + return; + } + + for (int i = 0; i < listModel.getSize(); i++) { + nameableArray[i] = ((ListModelElement) listModel.getElementAt(i)).wrapper; + } + + // p:排序. + if (isAtoZ) { + Comparator nameableComparator = new Comparator() { + @Override + public int compare(Nameable o1, Nameable o2) { + return -ComparatorUtils.compare(o1.getName(), o2 + .getName()); + } + }; + isAtoZ = !isAtoZ; + Arrays.sort(nameableArray, nameableComparator); + } else { + Comparator nameableComparator = new Comparator() { + @Override + public int compare(Nameable o1, Nameable o2) { + return ComparatorUtils.compare(o1.getName(), o2 + .getName()); + } + }; + isAtoZ = !isAtoZ; + Arrays.sort(nameableArray, nameableComparator); + } + + for (int i = 0; i < nameableArray.length; i++) { + listModel.set(i, new ListModelElement(nameableArray[i])); + } + + // p:需要选中以前的那个值. + if (selectedValue != null) { + nameableList.setSelectedValue(selectedValue, true); + } + + listControlPane.checkButtonEnabled(); + // p:需要repaint. + nameableList.repaint(); + } + + private String createUnrepeatedCopyName(String suffix) { + DefaultListModel model = listControlPane.getModel(); + String[] names = new String[model.getSize()]; + for (int i = 0; i < model.size(); i++) { + names[i] = ((ListModelElement) model.get(i)).wrapper.getName(); + } + String lastName = "CopyOf" + suffix; + while (ArrayUtils.contains(names, lastName)) { + lastName = "CopyOf" + lastName; + } + return lastName; + } + + /** + * 生成不重复的名字 + * + * @param prefix 名字前缀 + * @return 名字 + */ + public String createUnrepeatedName(String prefix) { + DefaultListModel model = listControlPane.getModel(); + Nameable[] all = new Nameable[model.getSize()]; + for (int i = 0; i < model.size(); i++) { + all[i] = ((ListModelElement) model.get(i)).wrapper; + } + // richer:生成的名字从1开始. kunsnat: 添加属性从0开始. + int count = all.length + 1; + while (true) { + String name_test = prefix + count; + boolean repeated = false; + for (int i = 0, len = model.size(); i < len; i++) { + Nameable nameable = all[i]; + if (ComparatorUtils.equals(nameable.getName(), name_test)) { + repeated = true; + break; + } + } + + if (!repeated) { + return name_test; + } + + count++; + } + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java index 55201d639e..0d01ddbdaa 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java @@ -1,6 +1,8 @@ package com.fr.design.gui.controlpane; import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.controlpane.shortcutfactory.AbstractShortCutFactory; +import com.fr.design.gui.controlpane.shortcutfactory.OldShortCutFactory; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolbar; import com.fr.design.layout.FRGUIPaneFactory; @@ -17,24 +19,32 @@ import java.awt.*; * Date: 2016/5/17 * Time: 15:07 */ -public abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper { - protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 - protected JPanel controlUpdatePane; - - private ShortCut4JControlPane[] shorts; - private NameableCreator[] creators; +abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, ShortCutListenerProvider { + private static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 + private static final String SELECT = "SELECT"; + private static final String EDIT = "EDIT"; + JPanel controlUpdatePane; + + ShortCut4JControlPane[] shorts; + NameableCreator[] creators; private ToolBarDef toolbarDef; - private UIToolbar toolBar; + UIToolbar toolBar; // peter:这是整体的一个cardLayout Pane protected CardLayout cardLayout; protected JPanel cardPane; + protected AbstractShortCutFactory shortCutFactory; - public JControlPane() { + JControlPane() { + this.initShortCutFactory(); this.initComponentPane(); } + protected void initShortCutFactory() { + this.shortCutFactory = OldShortCutFactory.newInstance(this); + } + /** * 生成添加按钮的NameableCreator * @@ -46,10 +56,6 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe return shorts; } - public void setShorts(ShortCut4JControlPane[] shorts) { - this.shorts = shorts; - } - public void setCreators(NameableCreator[] creators) { this.creators = creators; } @@ -89,6 +95,18 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe protected void initComponentPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.creators = this.createNameableCreators(); + initCardPane(); + // SplitPane + JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); + mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); + mainSplitPane.setOneTouchExpandable(true); + + this.add(mainSplitPane, BorderLayout.CENTER); + mainSplitPane.setDividerLocation(getLeftPreferredSize()); + this.checkButtonEnabled(); + } + + protected void initCardPane() { this.controlUpdatePane = createControlUpdatePane(); // p: edit card layout @@ -97,20 +115,29 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe cardPane.setLayout(this.cardLayout); // p:选择的Label UILabel selectLabel = new UILabel(); - cardPane.add(selectLabel, "SELECT"); - cardPane.add(controlUpdatePane, "EDIT"); - // SplitPane - JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); - mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); - mainSplitPane.setOneTouchExpandable(true); + cardPane.add(selectLabel, SELECT); + cardPane.add(controlUpdatePane, EDIT); + } - this.add(mainSplitPane, BorderLayout.CENTER); - mainSplitPane.setDividerLocation(getLeftPreferredSize()); - this.checkButtonEnabled(); + public void showEditPane() { + this.cardLayout.show(cardPane, EDIT); + } + + public void showSelectPane() { + this.cardLayout.show(cardPane, SELECT); } protected abstract JPanel createControlUpdatePane(); + protected void initToolBar() { + toolbarDef = new ToolBarDef(); + for (ShortCut4JControlPane sj : shorts) { + toolbarDef.addShortCut(sj.getShortCut()); + } + toolBar = ToolBarDef.createJToolBar(); + toolbarDef.updateToolBar(toolBar); + } + protected JPanel getLeftPane() { // LeftPane JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -122,12 +149,8 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe return leftPane; } - toolbarDef = new ToolBarDef(); - for (ShortCut4JControlPane sj : shorts) { - toolbarDef.addShortCut(sj.getShortCut()); - } - toolBar = ToolBarDef.createJToolBar(); - toolbarDef.updateToolBar(toolBar); + initToolBar(); + leftPane.add(toolBar, BorderLayout.NORTH); return leftPane; } @@ -143,30 +166,10 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe return shorts.length * SHORT_WIDTH; } - protected ShortCut4JControlPane[] createShortcuts() { - return new ShortCut4JControlPane[]{ - addItemShortCut(), - removeItemShortCut(), - copyItemShortCut(), - moveUpItemShortCut(), - moveDownItemShortCut(), - sortItemShortCut() - }; + return shortCutFactory.createShortCuts(); } - protected abstract ShortCut4JControlPane addItemShortCut(); - - protected abstract ShortCut4JControlPane removeItemShortCut(); - - protected abstract ShortCut4JControlPane copyItemShortCut(); - - protected abstract ShortCut4JControlPane moveUpItemShortCut(); - - protected abstract ShortCut4JControlPane moveDownItemShortCut(); - - protected abstract ShortCut4JControlPane sortItemShortCut(); - public abstract Nameable[] update(); @@ -179,23 +182,15 @@ public abstract class JControlPane extends BasicPane implements UnrepeatedNameHe public void checkButtonEnabled() { } - protected void doBeforeRemove() { - } - - protected void doAfterRemove() { - } - public NameableCreator[] creators() { return creators == null ? new NameableCreator[0] : creators; } - protected abstract boolean hasInvalid(boolean isAdd); - /** - * 刷新 NameableCreator - * - * @param creators 生成器 - */ + * 刷新 NameableCreator + * + * @param creators 生成器 + */ public void refreshNameableCreator(NameableCreator[] creators) { this.creators = creators; shorts = this.createShortcuts(); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java new file mode 100644 index 0000000000..17e3182860 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -0,0 +1,112 @@ +package com.fr.design.gui.controlpane; + +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; +import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; +import com.fr.design.gui.ilist.ListModelElement; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.general.ComparatorUtils; + +import javax.swing.JPanel; +import java.awt.CardLayout; + +/** + * Created by plough on 2018/8/13. + */ +class JControlUpdatePane extends JPanel { + private ListControlPaneProvider listControlPane; + private CardLayout card; + private JPanel cardPane; + private BasicBeanPane[] updatePanes; + + private ListModelElement elEditing; + + private JControlUpdatePane(ListControlPaneProvider listControlPane) { + this.listControlPane = listControlPane; + initUpdatePane(); + } + + public static JControlUpdatePane newInstance(ListControlPaneProvider listControlPane) { + return new JControlUpdatePane(listControlPane); + } + + private void initUpdatePane() { + NameableCreator[] creators = listControlPane.creators(); + if (creators == null) { + return; + } + card = new CardLayout(); + cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); + cardPane.setLayout(card); + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.add(cardPane); + int len = creators.length; + updatePanes = new BasicBeanPane[len]; + } + + public BasicBeanPane[] getUpdatePanes() { + return updatePanes; + } + + public void populate() { + ListModelElement el = listControlPane.getSelectedValue(); + if (el == null) { + return; + } + + elEditing = el; + NameableCreator[] creators = listControlPane.creators(); + + for (int i = 0, len = updatePanes.length; i < len; i++) { + Object ob2Populate = creators[i].acceptObject2Populate(el.wrapper); + if (ob2Populate != null) { + if (updatePanes[i] == null) { + if (isMulti(creators[i].getUpdatePane()) || isTree(creators[i].getUpdatePane())) { + updatePanes[i] = listControlPane.createPaneByCreators(creators[i], el.wrapper.getName()); + } else { + updatePanes[i] = listControlPane.createPaneByCreators(creators[i]); + } + cardPane.add(updatePanes[i], String.valueOf(i)); + } + card.show(cardPane, String.valueOf(i)); + updatePanes[i].populateBean(ob2Populate); + break; + } + } + } + + + public boolean isMulti(Class _class) { + return ComparatorUtils.equals(_class, GlobalMultiTDTableDataPane.class) || ComparatorUtils.equals(_class, MultiTDTableDataPane.class); + } + + public boolean isTree(Class _class) { + return ComparatorUtils.equals(_class, GlobalTreeTableDataPane.class) || ComparatorUtils.equals(_class, TreeTableDataPane.class); + } + + public void update() { + NameableCreator[] creators = listControlPane.creators(); + for (int i = 0; i < updatePanes.length; i++) { + BasicBeanPane pane = updatePanes[i]; + + if (pane != null && pane.isVisible()) { + Object bean = pane.updateBean(); + if (i < creators.length) { + creators[i].saveUpdatedBean(elEditing, bean); + } + } + } + } + + public void checkValid() throws Exception { + if (updatePanes != null) { + for (int i = 0; i < updatePanes.length; i++) { + if (updatePanes[i] != null) { + updatePanes[i].checkValid(); + } + } + } + } +} \ No newline at end of file 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 fcf7b6786c..3eb644c334 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 @@ -1,22 +1,10 @@ package com.fr.design.gui.controlpane; -import com.fr.base.BaseUtils; -import com.fr.base.FRContext; -import com.fr.design.actions.UpdateAction; import com.fr.design.beans.BasicBeanPane; -import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; -import com.fr.design.gui.HyperlinkFilterHelper; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ModNameActionListener; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.menu.LineSeparator; -import com.fr.design.menu.MenuDef; -import com.fr.design.menu.ShortCut; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.IOUtils; @@ -25,24 +13,30 @@ import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.core.PropertyChangeAdapter; -import javax.swing.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.DefaultListModel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import java.awt.*; -import java.awt.event.ActionEvent; +import java.awt.BorderLayout; +import java.awt.Component; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.util.Arrays; -import java.util.Comparator; -public abstract class JListControlPane extends JControlPane { - public static final String LIST_NAME = "JControl_List"; +public abstract class JListControlPane extends JControlPane implements ListControlPaneProvider { + private static final String LIST_NAME = "JControl_List"; protected JNameEdList nameableList; protected int editingIndex; protected String selectedName; private boolean isNameRepeated = false; + private CommonShortCutHandlers commonHandlers; + private ListControlPaneHelper helper; public JListControlPane() { this.initComponentPane(); @@ -50,7 +44,21 @@ public abstract class JListControlPane extends JControlPane { @Override protected JPanel createControlUpdatePane() { - return new JControlUpdatePane(); + return JControlUpdatePane.newInstance(this); + } + + private ListControlPaneHelper getHelper() { + if (helper == null) { + helper = ListControlPaneHelper.newInstance(this); + } + return helper; + } + + private CommonShortCutHandlers getCommonHandlers() { + if (commonHandlers == null) { + commonHandlers = CommonShortCutHandlers.newInstance(this); + } + return commonHandlers; } /** @@ -68,7 +76,6 @@ public abstract class JListControlPane extends JControlPane { nameableList.setName(LIST_NAME); leftPane.add(new UIScrollPane(nameableList), BorderLayout.CENTER); - nameableList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); nameableList.addMouseListener(listMouseListener); nameableList.addListSelectionListener(new ListSelectionListener() { @@ -87,7 +94,7 @@ public abstract class JListControlPane extends JControlPane { }); } - public JNameEdList createJNameList() { + protected JNameEdList createJNameList() { JNameEdList nameEdList = new JNameEdList(new DefaultListModel()) { @Override protected void doAfterLostFocus() { @@ -98,69 +105,13 @@ public abstract class JListControlPane extends JControlPane { return nameEdList; } - public void updateControlUpdatePane() { + private void updateControlUpdatePane() { ((JControlUpdatePane) controlUpdatePane).update(); } - protected void doWhenPopulate(BasicBeanPane beanPane) { - - } - - protected void doBeforePopulate(ListModelElement el, Object obj) { - - } - - @Override - protected ShortCut4JControlPane addItemShortCut() { - ShortCut addItemShortCut; - NameableCreator[] creators = creators(); - if (creators.length == 1) { - addItemShortCut = new AddItemUpdateAction(creators); - } else { - addItemShortCut = new AddItemMenuDef(creators); - } - return new AbsoluteEnableShortCut(addItemShortCut); - } - - @Override - protected ShortCut4JControlPane removeItemShortCut() { - return new NormalEnableShortCut(new RemoveItemAction()); - } - - @Override - protected ShortCut4JControlPane copyItemShortCut() { - return new NormalEnableShortCut(new CopyItemAction()); - } - - @Override - protected ShortCut4JControlPane moveUpItemShortCut() { - return new NormalEnableShortCut(new MoveUpItemAction()); - } - - @Override - protected ShortCut4JControlPane moveDownItemShortCut() { - return new NormalEnableShortCut(new MoveDownItemAction()); - } - - @Override - protected ShortCut4JControlPane sortItemShortCut() { - return new NormalEnableShortCut(new SortItemAction()); - } - - public void setNameListEditable(boolean editable) { - this.nameableList.setEditable(editable); - } - @Override public Nameable[] update() { - java.util.List res = new java.util.ArrayList(); - ((JControlUpdatePane) this.controlUpdatePane).update(); - DefaultListModel listModel = (DefaultListModel) this.nameableList.getModel(); - for (int i = 0, len = listModel.getSize(); i < len; i++) { - res.add(((ListModelElement) listModel.getElementAt(i)).wrapper); - } - - return res.toArray(new Nameable[res.size()]); + return getHelper().update(); } @Override @@ -186,7 +137,7 @@ public abstract class JListControlPane extends JControlPane { * * @param l 名字改变时的监听 */ - public void addModNameActionListener(ModNameActionListener l) { + protected void addModNameActionListener(ModNameActionListener l) { this.nameableList.addModNameActionListener(l); } @@ -195,7 +146,7 @@ public abstract class JListControlPane extends JControlPane { * * @param l 监听 */ - public void addEditingListener(PropertyChangeAdapter l) { + protected void addEditingListener(PropertyChangeAdapter l) { this.nameableList.addEditingListner(l); } @@ -236,9 +187,7 @@ public abstract class JListControlPane extends JControlPane { * 获取选中的名字 */ public String getSelectedName() { - ListModelElement el = (ListModelElement) this.nameableList.getSelectedValue(); - - return el == null ? null : el.wrapper.getName(); + return getHelper().getSelectedName(); } protected boolean isNameRepeated(java.util.List[] list, String name) { @@ -268,15 +217,7 @@ public abstract class JListControlPane extends JControlPane { * @param index 序号 */ public void addNameable(Nameable nameable, int index) { - JNameEdList nameEdList = JListControlPane.this.nameableList; - DefaultListModel model = (DefaultListModel) nameEdList.getModel(); - - ListModelElement el = new ListModelElement(nameable); - model.add(index, el); - nameableList.setSelectedIndex(index); - nameableList.ensureIndexIsVisible(index); - - nameEdList.repaint(); + getHelper().addNameable(nameable, index); } /** @@ -285,7 +226,7 @@ public abstract class JListControlPane extends JControlPane { * @return 是则true */ public boolean isContainsRename() { - String rename = com.fr.design.i18n.Toolkit.i18nText("FR-Please_Rename") + "!"; + String rename = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Please_Rename") + "!"; String[] names = this.nameableList.getAllNames(); for (int i = names.length - 1; i >= 0; i--) { if (ComparatorUtils.equals(names[i], rename)) { @@ -295,314 +236,54 @@ public abstract class JListControlPane extends JControlPane { return false; } - protected DefaultListModel getModel() { + public DefaultListModel getModel() { return (DefaultListModel) JListControlPane.this.nameableList.getModel(); } - private String createUnrepeatedCopyName(String suffix) { - DefaultListModel model = this.getModel(); - String[] names = new String[model.getSize()]; - for (int i = 0; i < model.size(); i++) { - names[i] = ((ListModelElement) model.get(i)).wrapper.getName(); - } - String lastName = "CopyOf" + suffix; - while (ArrayUtils.contains(names, lastName)) { - lastName = "CopyOf" + lastName; - } - return lastName; - } - - /** - * 生成不重复的名字 - * - * @param prefix 名字前缀 - * @return 名字 - */ + * 生成不重复的名字 + * + * @param prefix 名字前缀 + * @return 名字 + */ @Override public String createUnrepeatedName(String prefix) { - DefaultListModel model = this.getModel(); - Nameable[] all = new Nameable[model.getSize()]; - for (int i = 0; i < model.size(); i++) { - all[i] = ((ListModelElement) model.get(i)).wrapper; - } - // richer:生成的名字从1开始. kunsnat: 添加属性从0开始. - int count = all.length + 1; - while (true) { - String name_test = prefix + count; - boolean repeated = false; - for (int i = 0, len = model.size(); i < len; i++) { - Nameable nameable = all[i]; - if (ComparatorUtils.equals(nameable.getName(), name_test)) { - repeated = true; - break; - } - } - - if (!repeated) { - return name_test; - } - - count++; - } + return getCommonHandlers().createUnrepeatedName(prefix); } - /** - * 增加项的UpdateAction - */ - protected class AddItemUpdateAction extends UpdateAction { - final NameableCreator creator; - - public AddItemUpdateAction(NameableCreator[] creators) { - this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - } - - @Override - public void actionPerformed(ActionEvent e) { - Nameable nameable = creator.createNameable(JListControlPane.this); - - JListControlPane.this.addNameable(nameable, getModel().getSize()); - } + @Override + public void onAddItem(NameableCreator creator) { + getCommonHandlers().onAddItem(creator); } - /* - * 增加项的MenuDef - */ - protected class AddItemMenuDef extends MenuDef { - public AddItemMenuDef(NameableCreator[] creators) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - this.setMnemonic('A'); - this.setIconPath("/com/fr/design/images/control/addPopup.png"); - wrapActionListener(creators); - } - - private void wrapActionListener(NameableCreator[] creators) { - for (final NameableCreator creator : creators) { - if (filterNameableCreator(creator)) { - continue; - } - 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()); - } - this.addShortCut(new UpdateAction() { - { - this.setName(creator.menuName()); - Icon icon = creator.menuIcon(); - if (icon != null) { - this.setSmallIcon(icon); - } - } - - @Override - public void actionPerformed(ActionEvent e) { - if (hasInvalid(true)) { - return; - } - - Nameable nameable = creator.createNameable(JListControlPane.this); - - JListControlPane.this.addNameable(nameable, getModel().getSize()); - } - }); - } - } + @Override + public void onRemoveItem() { + getCommonHandlers().onRemoveItem(); } - /* - * 移除item - */ - private class RemoveItemAction extends UpdateAction { - public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); - this.setMnemonic('R'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/base/images/cell/control/remove.png")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - try { - JListControlPane.this.nameableList.getCellEditor() - .stopCellEditing(); - } catch (Exception ignored) { - } - // bug:在选中一个NameObject并删除，会遗留下Name. - doBeforeRemove(); - if (GUICoreUtils.removeJListSelectedNodes(SwingUtilities - .getWindowAncestor(JListControlPane.this), nameableList)) { - checkButtonEnabled(); - doAfterRemove(); - } - } + @Override + public void onCopyItem() { + getCommonHandlers().onCopyItem(); } - /* - * CopyItem - */ - private class CopyItemAction extends UpdateAction { - public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); - this.setMnemonic('C'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/m_edit/copy.png")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - // p:选中的值. - ListModelElement selectedValue = (ListModelElement) nameableList.getSelectedValue(); - if (selectedValue == null) { - return; - } - - ((JControlUpdatePane) controlUpdatePane).update(); - - Nameable selectedNameable = selectedValue.wrapper; - - // p: 用反射机制实现 - try { - Nameable newNameable = (Nameable) BaseUtils.cloneObject(selectedNameable); - newNameable.setName(createUnrepeatedCopyName(selectedNameable.getName())); - - JListControlPane.this.addNameable(newNameable, nameableList.getSelectedIndex() + 1); - } catch (Exception e) { - FRContext.getLogger().error(e.getMessage(), e); - } - } + @Override + public void onMoveUpItem() { + getCommonHandlers().onMoveUpItem(); } - /* - * 上移Item - */ - private class MoveUpItemAction extends UpdateAction { - public MoveUpItemAction() { - 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")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - return; - } - - // 上移 - if (selectedIndex > 0) { - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); - - Object selecteObj1 = listModel.get(selectedIndex - 1); - listModel.set(selectedIndex - 1, listModel.get(selectedIndex)); - listModel.set(selectedIndex, selecteObj1); - - nameableList.setSelectedIndex(selectedIndex - 1); - nameableList.ensureIndexIsVisible(selectedIndex - 1); - } - } + @Override + public void onMoveDownItem() { + getCommonHandlers().onMoveDownItem(); } - /* - * 下移Item - */ - private class MoveDownItemAction extends UpdateAction { - public MoveDownItemAction() { - 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")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - return; - } - - if (selectedIndex < nameableList.getModel().getSize() - 1) { - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); - - Object selecteObj1 = listModel.get(selectedIndex + 1); - listModel.set(selectedIndex + 1, listModel.get(selectedIndex)); - listModel.set(selectedIndex, selecteObj1); - - nameableList.setSelectedIndex(selectedIndex + 1); - nameableList.ensureIndexIsVisible(selectedIndex + 1); - } - } + @Override + public void onSortItem(boolean isAtoZ) { + getCommonHandlers().onSortItem(isAtoZ); } - private class SortItemAction extends UpdateAction { - private boolean isAtoZ = false; - - public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); - this.setMnemonic('S'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/sortAsc.png")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - // p:选中的值. - Object selectedValue = nameableList.getSelectedValue(); - - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); - Nameable[] nameableArray = new Nameable[listModel.getSize()]; - if (nameableArray.length <= 0) { - return; - } - - for (int i = 0; i < listModel.getSize(); i++) { - nameableArray[i] = ((ListModelElement) listModel.getElementAt(i)).wrapper; - } - - // p:排序. - if (isAtoZ) { - Comparator nameableComparator = new Comparator() { - @Override - public int compare(Nameable o1, Nameable o2) { - return -ComparatorUtils.compare(o1.getName(), o2 - .getName()); - } - }; - isAtoZ = !isAtoZ; - Arrays.sort(nameableArray, nameableComparator); - } else { - Comparator nameableComparator = new Comparator() { - @Override - public int compare(Nameable o1, Nameable o2) { - return ComparatorUtils.compare(o1.getName(), o2 - .getName()); - } - }; - isAtoZ = !isAtoZ; - Arrays.sort(nameableArray, nameableComparator); - } - - for (int i = 0; i < nameableArray.length; i++) { - listModel.set(i, new ListModelElement(nameableArray[i])); - } - - // p:需要选中以前的那个值. - if (selectedValue != null) { - nameableList.setSelectedValue(selectedValue, true); - } - - checkButtonEnabled(); - // p:需要repaint. - nameableList.repaint(); - } + @Override + public boolean isItemSelected() { + return getModel().getSize() > 0 && nameableList.getSelectedIndex() != -1; } /* @@ -649,16 +330,7 @@ public abstract class JListControlPane extends JControlPane { */ @Override public void checkButtonEnabled() { - - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - this.cardLayout.show(cardPane, "SELECT"); - } else { - this.cardLayout.show(cardPane, "EDIT"); - } - for (ShortCut4JControlPane sj : getShorts()) { - sj.checkEnable(); - } + getHelper().checkButtonEnabled(); } private class NameableListCellRenderer extends @@ -690,129 +362,13 @@ public abstract class JListControlPane extends JControlPane { } } - public class AbsoluteEnableShortCut extends ShortCut4JControlPane { - public AbsoluteEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(true); - } - } - - public class NormalEnableShortCut extends ShortCut4JControlPane { - public NormalEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel() - .getSize() > 0 - && JListControlPane.this.nameableList.getSelectedIndex() != -1); - } - } - - - private class JControlUpdatePane extends JPanel { - private CardLayout card; - private JPanel cardPane; - private BasicBeanPane[] updatePanes; - - private ListModelElement elEditing; - - public JControlUpdatePane() { - initUpdatePane(); - } - - private void initUpdatePane() { - NameableCreator[] creators = creators(); - if (creators == null) { - return; - } - card = new CardLayout(); - cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - cardPane.setLayout(card); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.add(cardPane); - int len = creators.length; - updatePanes = new BasicBeanPane[len]; - } - - public void populate() { - ListModelElement el = (ListModelElement) JListControlPane.this.nameableList.getSelectedValue(); - if (el == null) { - return; - } - - elEditing = el; - NameableCreator[] creators = creators(); - - for (int i = 0, len = updatePanes.length; i < len; i++) { - Object ob2Populate = creators[i].acceptObject2Populate(el.wrapper); - if (ob2Populate != null) { - if (updatePanes[i] == null) { - if (isMulti(creators[i].getUpdatePane()) || isTree(creators[i].getUpdatePane())) { - updatePanes[i] = createPaneByCreators(creators[i], el.wrapper.getName()); - } else { - updatePanes[i] = createPaneByCreators(creators[i]); - } - cardPane.add(updatePanes[i], String.valueOf(i)); - } - card.show(cardPane, String.valueOf(i)); - doBeforePopulate(el, ob2Populate); - updatePanes[i].populateBean(ob2Populate); - doWhenPopulate(updatePanes[i]); - break; - } - } - } - - public boolean isMulti(Class _class) { - return ComparatorUtils.equals(_class, GlobalMultiTDTableDataPane.class) || ComparatorUtils.equals(_class, MultiTDTableDataPane.class); - } - - public boolean isTree(Class _class) { - return ComparatorUtils.equals(_class, GlobalTreeTableDataPane.class) || ComparatorUtils.equals(_class, TreeTableDataPane.class); - } - - public void update() { - NameableCreator[] creators = creators(); - for (int i = 0; i < updatePanes.length; i++) { - BasicBeanPane pane = updatePanes[i]; - - if (pane != null && pane.isVisible()) { - Object bean = pane.updateBean(); - if (i < creators.length) { - creators[i].saveUpdatedBean(elEditing, bean); - } - } - } - } - - public void checkValid() throws Exception { - if (updatePanes != null) { - for (int i = 0; i < updatePanes.length; i++) { - if (updatePanes[i] != null) { - updatePanes[i].checkValid(); - } - } - } - } - } - - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + @Override + public BasicBeanPane createPaneByCreators(NameableCreator creator) { return Reflect.on(creator.getUpdatePane()).create().get(); } - private BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { + @Override + public BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { return Reflect.on(creator.getUpdatePane()).create(string).get(); } @@ -826,35 +382,9 @@ public abstract class JListControlPane extends JControlPane { ((JControlUpdatePane) this.controlUpdatePane).checkValid(); } - private int getInValidIndex() { - BasicBeanPane[] p = ((JControlUpdatePane) controlUpdatePane).updatePanes; - if (p != null) { - for (int i = 0; i < p.length; i++) { - if (p[i] != null) { - try { - p[i].checkValid(); - } catch (Exception e) { - return i; - } - } - } - } - return -1; - } - @Override - protected boolean hasInvalid(boolean isAdd) { - int idx = JListControlPane.this.getInValidIndex(); - if (isAdd || nameableList.getSelectedIndex() != idx) { - try { - checkValid(); - } catch (Exception exp) { - JOptionPane.showMessageDialog(JListControlPane.this, exp.getMessage()); - nameableList.setSelectedIndex(idx); - return true; - } - } - return false; + public boolean hasInvalid(boolean isAdd) { + return getHelper().hasInvalid(isAdd); } /** @@ -862,16 +392,28 @@ public abstract class JListControlPane extends JControlPane { * * @param index 选中项的序列号 */ + @Override public void setSelectedIndex(int index) { nameableList.setSelectedIndex(index); } + @Override + public int getSelectedIndex() { + return nameableList.getSelectedIndex(); + } - /** - * 用于在list面板中，过滤某些下拉选项 - * @return true：过滤掉这个creator - */ - protected boolean filterNameableCreator(NameableCreator creator) { - return !HyperlinkFilterHelper.whetherAddHyperlink4cell(creator.menuName()); + @Override + public JNameEdList getNameableList() { + return nameableList; + } + + @Override + public ListModelElement getSelectedValue() { + return (ListModelElement) this.nameableList.getSelectedValue(); + } + + @Override + public JControlUpdatePane getControlUpdatePane() { + return (JControlUpdatePane) controlUpdatePane; } } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java new file mode 100644 index 0000000000..5618c407c0 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneHelper.java @@ -0,0 +1,112 @@ +package com.fr.design.gui.controlpane; + +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ilist.JNameEdList; +import com.fr.design.gui.ilist.ListModelElement; +import com.fr.stable.Nameable; +import com.fr.stable.StringUtils; + +import javax.swing.DefaultListModel; +import javax.swing.JOptionPane; +import java.awt.Component; + +/** + * 存放一些公用的方法 + * Created by plough on 2018/8/13. + */ +class ListControlPaneHelper { + private ListControlPaneProvider listControlPane; + + private ListControlPaneHelper(ListControlPaneProvider listControlPane) { + this.listControlPane = listControlPane; + } + + public static ListControlPaneHelper newInstance(ListControlPaneProvider listControlPane) { + return new ListControlPaneHelper(listControlPane); + } + + public boolean hasInvalid(boolean isAdd) { + + int idx = getInValidIndex(); + if (isAdd || listControlPane.getSelectedIndex() != idx) { + try { + listControlPane.checkValid(); + } catch (Exception exp) { + JOptionPane.showMessageDialog((Component) listControlPane, exp.getMessage()); + listControlPane.setSelectedIndex(idx); + return true; + } + } + return false; + } + + private int getInValidIndex() { + BasicBeanPane[] p = listControlPane.getControlUpdatePane().getUpdatePanes(); + if (p != null) { + for (int i = 0; i < p.length; i++) { + if (p[i] != null) { + try { + p[i].checkValid(); + } catch (Exception e) { + return i; + } + } + } + } + return -1; + } + + public Nameable[] update() { + java.util.List res = new java.util.ArrayList(); + listControlPane.getControlUpdatePane().update(); + DefaultListModel listModel = listControlPane.getModel(); + for (int i = 0, len = listModel.getSize(); i < len; i++) { + res.add(((ListModelElement) listModel.getElementAt(i)).wrapper); + } + + return res.toArray(new Nameable[res.size()]); + } + + /** + * 获取选中的名字 + */ + public String getSelectedName() { + ListModelElement el = listControlPane.getSelectedValue(); + return el == null ? StringUtils.EMPTY : el.wrapper.getName(); + } + + /** + * 添加 Nameable + * + * @param nameable 添加的Nameable + * @param index 序号 + */ + public void addNameable(Nameable nameable, int index) { + JNameEdList nameableList = listControlPane.getNameableList(); + DefaultListModel model = listControlPane.getModel(); + + ListModelElement el = new ListModelElement(nameable); + model.add(index, el); + nameableList.setSelectedIndex(index); + nameableList.ensureIndexIsVisible(index); + nameableList.repaint(); + } + + /** + * 检查按钮可用状态 Check button enabled. + */ + public void checkButtonEnabled() { + + int selectedIndex = listControlPane.getSelectedIndex(); + if (selectedIndex == -1) { + listControlPane.showSelectPane(); + } else { + listControlPane.showEditPane(); + } + for (ShortCut4JControlPane sj : listControlPane.getShorts()) { + sj.checkEnable(); + } + } + + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneProvider.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneProvider.java new file mode 100644 index 0000000000..1565f348d0 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ListControlPaneProvider.java @@ -0,0 +1,35 @@ +package com.fr.design.gui.controlpane; + +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ilist.JNameEdList; +import com.fr.design.gui.ilist.ListModelElement; +import com.fr.stable.Nameable; + +import javax.swing.DefaultListModel; + +/** + * Created by plough on 2018/8/13. + */ +public interface ListControlPaneProvider extends UnrepeatedNameHelper { + NameableCreator[] creators(); + BasicBeanPane createPaneByCreators(NameableCreator creator); + BasicBeanPane createPaneByCreators(NameableCreator creator, String string); + DefaultListModel getModel(); + boolean hasInvalid(boolean isAdd); + void addNameable(Nameable nameable, int index); + JNameEdList getNameableList(); + int getSelectedIndex(); + void setSelectedIndex(int idx); + ListModelElement getSelectedValue(); + void checkButtonEnabled(); + JControlUpdatePane getControlUpdatePane(); +// BasicBeanPane[] getUpdatePanes(); + /** + * 检查是否符合规范 + * @throws Exception + */ + void checkValid() throws Exception; + void showSelectPane(); + void showEditPane(); + ShortCut4JControlPane[] getShorts(); +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java index 2fd680a9c5..8ac0aef107 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java @@ -22,9 +22,16 @@ public abstract class ObjectJControlPane extends JListControlPane { } @Override - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { try { - return Reflect.on(creator.getUpdatePane()).create(object).get(); + Class target = creator.getUpdatePane(); + Reflect reflect = Reflect.on(target); + // 判断是否存在对应构造函数 + if (reflect.matchConstructor(object)) { + return reflect.create(object).get(); + } + + return reflect.create().get(); } catch (Exception e) { return super.createPaneByCreators(creator); } diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectUIControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectUIControlPane.java index 3b2a1b0711..c5786b4c64 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectUIControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectUIControlPane.java @@ -10,17 +10,13 @@ import com.fr.design.beans.BasicBeanPane; public abstract class ObjectUIControlPane extends UIListControlPane { private Object object; - public ObjectUIControlPane() { - this(null); - } - public ObjectUIControlPane(Object object) { super(); this.object = object; } @Override - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { try { if (object == null) { return super.createPaneByCreators(creator); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ShortCutListenerProvider.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ShortCutListenerProvider.java new file mode 100644 index 0000000000..5ee93bd47f --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ShortCutListenerProvider.java @@ -0,0 +1,15 @@ +package com.fr.design.gui.controlpane; + +/** + * Created by plough on 2018/8/12. + */ +public interface ShortCutListenerProvider { + void onAddItem(NameableCreator creator); + void onRemoveItem(); + void onCopyItem(); + void onMoveUpItem(); + void onMoveDownItem(); + void onSortItem(boolean isAtoZ); + boolean isItemSelected(); + NameableCreator[] creators(); +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java index d0a4c12c5f..cd3c3a5ba4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java @@ -1,8 +1,7 @@ package com.fr.design.gui.controlpane; -import com.fr.base.chart.BasePlot; import com.fr.design.constants.UIConstants; -import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itoolbar.UIToolBarUI; import com.fr.design.gui.itoolbar.UIToolbar; @@ -11,10 +10,8 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.ShortCut; -import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.stable.ArrayUtils; -import com.fr.stable.Nameable; import com.fr.stable.StringUtils; import javax.swing.BorderFactory; @@ -25,7 +22,6 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import javax.swing.border.EmptyBorder; import java.awt.BorderLayout; -import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; import java.awt.Cursor; @@ -49,85 +45,24 @@ import java.awt.event.WindowEvent; /** * Created by plough on 2017/7/21. */ -public abstract class UIControlPane extends BasicPane implements UnrepeatedNameHelper { - protected static final int SHORT_WIDTH = 30; //每加一个short Divider位置加30 - protected JPanel controlUpdatePane; - private ShortCut4JControlPane[] shorts; - private NameableCreator[] creators; - private ToolBarDef toolbarDef; - private UIToolbar toolBar; +abstract class UIControlPane extends JControlPane { private UIToolbar topToolBar; protected Window popupEditDialog; - // peter:这是整体的一个cardLayout Pane - protected CardLayout cardLayout; - protected JPanel cardPane; - protected BasePlot plot; private static final int TOP_TOOLBAR_HEIGHT = 20; private static final int TOP_TOOLBAR_WIDTH = 156; // 可能因为用了tablelayout，要比其他地方多一个像素，看起来才正常 private static final int TOP_TOOLBAR_WIDTH_SHORT = 76; - public UIControlPane() { - this.initComponentPane(); + UIControlPane() { + super(); } - public UIControlPane(BasePlot plot) { - this.plot = plot; - this.initComponentPane(); - } - - /** - * 生成添加按钮的NameableCreator - * - * @return 按钮的NameableCreator - */ - public abstract NameableCreator[] createNameableCreators(); - - public ShortCut4JControlPane[] getShorts() { - return shorts; - } - - public void setShorts(ShortCut4JControlPane[] shorts) { - this.shorts = shorts; - } - - public void setCreators(NameableCreator[] creators) { - this.creators = creators; - } - - public ToolBarDef getToolbarDef() { - return toolbarDef; - } - - public void setToolbarDef(ToolBarDef toolbarDef) { - this.toolbarDef = toolbarDef; - } - - public UIToolbar getToolBar() { - return toolBar; - } - - public void setToolBar(UIToolbar toolBar) { - this.toolBar = toolBar; - } - - public CardLayout getCardLayout() { - return cardLayout; - } - - public void setCardLayout(CardLayout cardLayout) { - this.cardLayout = cardLayout; - } - - public JPanel getCardPane() { - return cardPane; - } + public abstract void saveSettings(); - public void setCardPane(JPanel cardPane) { - this.cardPane = cardPane; + @Override + protected void initShortCutFactory() { + this.shortCutFactory = ShortCutFactory.newInstance(this); } - public abstract void saveSettings(); - // 是否使用新样式 protected boolean isNewStyle() { return true; @@ -136,16 +71,9 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH protected void initComponentPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.creators = this.createNameableCreators(); - this.controlUpdatePane = createControlUpdatePane(); - - // p: edit card layout - this.cardLayout = new CardLayout(); - cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - cardPane.setLayout(this.cardLayout); - // p:选择的Label - UILabel selectLabel = new UILabel(); - cardPane.add(selectLabel, "SELECT"); - cardPane.add(controlUpdatePane, "EDIT"); + + initCardPane(); + if (isNewStyle()) { getPopupEditDialog(cardPane); this.add(getLeftPane(), BorderLayout.CENTER); @@ -169,11 +97,22 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH this.checkButtonEnabled(); } - protected void getPopupEditDialog(JPanel cardPane) { + private void getPopupEditDialog(JPanel cardPane) { popupEditDialog = new PopupEditDialog(cardPane); } - protected abstract JPanel createControlUpdatePane(); + @Override + protected void initToolBar() { + super.initToolBar(); + toolBar.setUI(new UIToolBarUI() { + @Override + public void paint(Graphics g, JComponent c) { + Graphics2D g2 = (Graphics2D) g; + g2.setColor(Color.WHITE); + g2.fillRect(0, 0, c.getWidth(), c.getHeight()); + } + }); + } protected JPanel getLeftPane() { // LeftPane @@ -188,20 +127,8 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH return leftPane; } - toolbarDef = new ToolBarDef(); - for (ShortCut4JControlPane sj : shorts) { - toolbarDef.addShortCut(sj.getShortCut()); - } - toolBar = ToolBarDef.createJToolBar(); - toolBar.setUI(new UIToolBarUI() { - @Override - public void paint(Graphics g, JComponent c) { - Graphics2D g2 = (Graphics2D) g; - g2.setColor(Color.WHITE); - g2.fillRect(0, 0, c.getWidth(), c.getHeight()); - } - }); - toolbarDef.updateToolBar(toolBar); + initToolBar(); + // 封装一层，加边框 JPanel toolBarPane = new JPanel(new BorderLayout()); toolBarPane.add(toolBar, BorderLayout.CENTER); @@ -220,7 +147,7 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH }); topToolBar.setBorder(null); topToolBar.setLayout(new BorderLayout()); - ShortCut addItem = addItemShortCut().getShortCut(); + ShortCut addItem = shortCutFactory.addItemShortCut().getShortCut(); addItem.intoJToolBar(topToolBar); JPanel leftTopPane = getLeftTopPane(topToolBar); @@ -249,85 +176,22 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH return "add item "; } - /** - * 初始化左边面板 - */ - protected void initLeftPane(JPanel leftPane) { - - } - - protected int getLeftPreferredSize() { - return shorts.length * SHORT_WIDTH; - } - - protected ShortCut4JControlPane[] createShortcuts() { - return new ShortCut4JControlPane[]{ - copyItemShortCut(), - moveUpItemShortCut(), - moveDownItemShortCut(), - sortItemShortCut(), - removeItemShortCut() - }; - } - - protected abstract ShortCut4JControlPane addItemShortCut(); - - protected abstract ShortCut4JControlPane removeItemShortCut(); - - protected abstract ShortCut4JControlPane copyItemShortCut(); - - protected abstract ShortCut4JControlPane moveUpItemShortCut(); - - protected abstract ShortCut4JControlPane moveDownItemShortCut(); - - protected abstract ShortCut4JControlPane sortItemShortCut(); - - public abstract Nameable[] update(); - - - public void populate(Nameable[] nameableArray) { +// return AbstractShortCutFactory.getInstance(this).createNewShortCuts(); + return shortCutFactory.createShortCuts(); } - /** - * 检查按钮可用状态 Check button enabled. - */ - public void checkButtonEnabled() { - } - - protected void doBeforeRemove() { - } - - protected void doAfterRemove() { - } - - public NameableCreator[] creators() { - return creators == null ? new NameableCreator[0] : creators; - } - - protected abstract boolean hasInvalid(boolean isAdd); - /** * 刷新 NameableCreator * * @param creators 生成器 */ public void refreshNameableCreator(NameableCreator[] creators) { - this.creators = creators; - shorts = this.createShortcuts(); - toolbarDef.clearShortCuts(); - for (ShortCut4JControlPane sj : shorts) { - toolbarDef.addShortCut(sj.getShortCut()); - } - - toolbarDef.updateToolBar(toolBar); - toolBar.validate(); - toolBar.repaint(); - + super.refreshNameableCreator(creators); // 顶部按钮 topToolBar.removeAll(); - ShortCut addItem = addItemShortCut().getShortCut(); + ShortCut addItem = shortCutFactory.addItemShortCut().getShortCut(); addItem.intoJToolBar(topToolBar); topToolBar.validate(); this.controlUpdatePane = createControlUpdatePane();//REPORT-4841 刷新一下编辑面板 @@ -337,13 +201,13 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH } // 点击"编辑"按钮，弹出面板 - protected class PopupEditDialog extends JDialog { + class PopupEditDialog extends JDialog { private JComponent editPane; private PopupToolPane popupToolPane; private static final int WIDTH = 570; private static final int HEIGHT = 490; - public PopupEditDialog(JComponent pane) { + PopupEditDialog(JComponent pane) { super(DesignerContext.getDesignerFrame()); setUndecorated(true); pane.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10)); @@ -475,11 +339,11 @@ public abstract class UIControlPane extends BasicPane implements UnrepeatedNameH } }; - public PopupToolPane(JDialog parentDialog) { + PopupToolPane(JDialog parentDialog) { this(StringUtils.EMPTY, parentDialog); } - public PopupToolPane(String title, JDialog parentDialog) { + PopupToolPane(String title, JDialog parentDialog) { super(); this.parentDialog = parentDialog; originColor = UIConstants.DIALOG_TITLEBAR_BACKGROUND; 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 69cd6d020a..0dec124219 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 @@ -1,72 +1,76 @@ package com.fr.design.gui.controlpane; -import com.fr.base.BaseUtils; -import com.fr.base.FRContext; -import com.fr.base.chart.BasePlot; -import com.fr.design.actions.UpdateAction; -import com.fr.design.actions.core.ActionFactory; import com.fr.design.beans.BasicBeanPane; import com.fr.design.constants.UIConstants; -import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; -import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; -import com.fr.design.gui.HyperlinkFilterHelper; -import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; +import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.UINameEdList; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.menu.LineSeparator; -import com.fr.design.menu.MenuDef; -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.stable.ArrayUtils; import com.fr.stable.Nameable; -import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.DefaultListModel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.ListSelectionModel; +import javax.swing.SwingUtilities; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.Window; +import java.awt.event.InputEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.Comparator; /** * Created by plough on 2017/7/19. */ -public abstract class UIListControlPane extends UIControlPane { - public static final String LIST_NAME = "UIControl_List"; +public abstract class UIListControlPane extends UIControlPane implements ListControlPaneProvider { + private static final String LIST_NAME = "UIControl_List"; private static final int EDIT_RANGE = 25; // 编辑按钮的x坐标范围 protected UINameEdList nameableList; - protected int editingIndex; + private int editingIndex; protected String selectedName; - private boolean isNameRepeated = false; protected boolean isPopulating = false; + private CommonShortCutHandlers commonHandlers; + private ListControlPaneHelper helper; public UIListControlPane() { - this.initComponentPane(); + super(); + } - public UIListControlPane(BasePlot plot) { - super(plot); + private ListControlPaneHelper getHelper() { + if (helper == null) { + helper = ListControlPaneHelper.newInstance(this); + } + return helper; + } + + private CommonShortCutHandlers getCommonHandlers() { + if (commonHandlers == null) { + commonHandlers = CommonShortCutHandlers.newInstance(this); + } + return commonHandlers; } @Override protected JPanel createControlUpdatePane() { - return new JControlUpdatePane(); + return JControlUpdatePane.newInstance(this); } /** @@ -87,7 +91,7 @@ public abstract class UIListControlPane extends UIControlPane { nameableList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); - nameableList.addMouseListener(listMouseListener); + nameableList.addMouseListener(getListMouseListener()); nameableList.addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent evt) { // richie:避免多次update和populate大大降低效率 @@ -122,7 +126,7 @@ public abstract class UIListControlPane extends UIControlPane { } } - public UINameEdList createJNameList() { + private UINameEdList createJNameList() { UINameEdList nameEdList = new UINameEdList(new DefaultListModel()) { @Override protected void doAfterLostFocus() { @@ -137,73 +141,17 @@ public abstract class UIListControlPane extends UIControlPane { return nameEdList; } - public void updateControlUpdatePane() { + private void updateControlUpdatePane() { ((JControlUpdatePane) controlUpdatePane).update(); } - protected void doWhenPopulate(BasicBeanPane beanPane) { - - } - - protected void doBeforePopulate(ListModelElement el, Object obj) { - - } - - @Override - protected ShortCut4JControlPane addItemShortCut() { - ShortCut addItemShortCut; - NameableCreator[] creators = creators(); - if (creators.length == 1) { - addItemShortCut = new AddItemUpdateAction(creators); - } else { - addItemShortCut = getAddItemMenuDef(creators); - } - return new AbsoluteEnableShortCut(addItemShortCut); - } - - protected AddItemMenuDef getAddItemMenuDef (NameableCreator[] creators) { - return new AddItemMenuDef(creators); - } - - @Override - protected ShortCut4JControlPane removeItemShortCut() { - return new NormalEnableShortCut(new RemoveItemAction()); - } - - @Override - protected ShortCut4JControlPane copyItemShortCut() { - return new NormalEnableShortCut(new CopyItemAction()); - } - - @Override - protected ShortCut4JControlPane moveUpItemShortCut() { - return new NormalEnableShortCut(new MoveUpItemAction()); - } - - @Override - protected ShortCut4JControlPane moveDownItemShortCut() { - return new NormalEnableShortCut(new MoveDownItemAction()); - } - - @Override - protected ShortCut4JControlPane sortItemShortCut() { - return new NormalEnableShortCut(new SortItemAction()); - } - - public void setNameListEditable(boolean editable) { + protected void setNameListEditable(boolean editable) { this.nameableList.setEditable(editable); } @Override public Nameable[] update() { - java.util.List res = new java.util.ArrayList(); - ((JControlUpdatePane) this.controlUpdatePane).update(); - DefaultListModel listModel = (DefaultListModel) this.nameableList.getModel(); - for (int i = 0, len = listModel.getSize(); i < len; i++) { - res.add(((ListModelElement) listModel.getElementAt(i)).wrapper); - } - - return res.toArray(new Nameable[res.size()]); + return getHelper().update(); } @Override @@ -235,9 +183,7 @@ public abstract class UIListControlPane extends UIControlPane { * 获取选中的名字 */ public String getSelectedName() { - ListModelElement el = (ListModelElement) this.nameableList.getSelectedValue(); - - return el == null ? null : el.wrapper.getName(); + return getHelper().getSelectedName(); } /** @@ -247,86 +193,14 @@ public abstract class UIListControlPane extends UIControlPane { * @param index 序号 */ public void addNameable(Nameable nameable, int index) { - UINameEdList nameEdList = UIListControlPane.this.nameableList; - DefaultListModel model = (DefaultListModel) nameEdList.getModel(); - - ListModelElement el = new ListModelElement(nameable); - model.add(index, el); - nameableList.setSelectedIndex(index); - nameableList.ensureIndexIsVisible(index); - - nameEdList.repaint(); + getHelper().addNameable(nameable, index); popupEditDialog(); } - /** - * 是否重命名 - * - * @return 是则true - */ - public boolean isContainsRename() { - 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)) { - return true; - } - } - return false; - } - - protected DefaultListModel getModel() { + public DefaultListModel getModel() { return (DefaultListModel) UIListControlPane.this.nameableList.getModel(); } - private String createUnrepeatedCopyName(String suffix) { - DefaultListModel model = this.getModel(); - String[] names = new String[model.getSize()]; - for (int i = 0; i < model.size(); i++) { - names[i] = ((ListModelElement) model.get(i)).wrapper.getName(); - } - String lastName = "CopyOf" + suffix; - while (ArrayUtils.contains(names, lastName)) { - lastName = "CopyOf" + lastName; - } - return lastName; - } - - - /** - * 生成不重复的名字 - * - * @param prefix 名字前缀 - * @return 名字 - */ - @Override - public String createUnrepeatedName(String prefix) { - DefaultListModel model = this.getModel(); - Nameable[] all = new Nameable[model.getSize()]; - for (int i = 0; i < model.size(); i++) { - all[i] = ((ListModelElement) model.get(i)).wrapper; - } - // richer:生成的名字从1开始. kunsnat: 添加属性从0开始. - int count = all.length + 1; - while (true) { - String name_test = prefix + count; - boolean repeated = false; - for (int i = 0, len = model.size(); i < len; i++) { - Nameable nameable = all[i]; - if (ComparatorUtils.equals(nameable.getName(), name_test)) { - repeated = true; - break; - } - } - - if (!repeated) { - return name_test; - } - - count++; - } - } - private void popupEditDialog() { popupEditDialog(null); } @@ -378,569 +252,120 @@ public abstract class UIListControlPane extends UIControlPane { } /** - * 增加项的UpdateAction + * 生成不重复的名字 + * + * @param prefix 名字前缀 + * @return 名字 */ - protected class AddItemUpdateAction extends UpdateAction { - final NameableCreator creator; - - public AddItemUpdateAction(NameableCreator[] creators) { - this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - this.setMnemonic('A'); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); - } - - /** - * Gets component on toolbar. - * - * @return the created components on toolbar. - */ - @Override - public JComponent createToolBarComponent() { - Object object = this.getValue(UIButton.class.getName()); - if (!(object instanceof AbstractButton)) { - // 直接使用默认UI - UIButton button = new UIButton(); - // 添加一个名字作为自动化测试用 - button.setName(getName()); - - //设置属性. - Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY); - if (mnemonicInteger != null) { - button.setMnemonic((char) mnemonicInteger.intValue()); - } - - button.setIcon((Icon) this.getValue(Action.SMALL_ICON)); - button.addActionListener(this); - - button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW); - - this.putValue(UIButton.class.getName(), button); - button.setText(StringUtils.EMPTY); - button.setEnabled(this.isEnabled()); - - //peter:产生tooltip - button.setToolTipText(ActionFactory.createButtonToolTipText(this)); - object = button; - } - - return (JComponent) object; - } - - @Override - public void actionPerformed(ActionEvent e) { - Nameable nameable = creator.createNameable(UIListControlPane.this); - - UIListControlPane.this.addNameable(nameable, getModel().getSize()); - } + @Override + public String createUnrepeatedName(String prefix) { + return getCommonHandlers().createUnrepeatedName(prefix); } - /* - * 增加项的MenuDef - */ - protected class AddItemMenuDef extends MenuDef { - public AddItemMenuDef(NameableCreator[] creators) { - super(true); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); - this.setMnemonic('A'); - this.setIconPath("/com/fr/design/images/control/addPopup.png"); - wrapActionListener(creators); - } - - /** - * 生成UIButton - * @return 菜单按钮 - */ - public UIButton createUIButton() { - createdButton = super.createUIButton(); - // 此按钮单独抽出，不应使用工具栏外观 - if (!createdButton.isOpaque()) { - createdButton.setOpaque(true); - createdButton.setNormalPainted(true); - createdButton.setBorderPaintedOnlyWhenPressed(false); - } - return createdButton; - } - - private void wrapActionListener(NameableCreator[] creators) { - for (final NameableCreator creator : creators) { - if (!whetherAdd(creator.menuName())) { - continue; - } - 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()); - } - this.addShortCut(new UpdateAction() { - { - this.setName(creator.menuName()); - Icon icon = creator.menuIcon(); - if (icon != null) { - this.setSmallIcon(icon); - } - } - - @Override - public void actionPerformed(ActionEvent e) { - if (hasInvalid(true)) { - return; - } - - Nameable nameable = creator.createNameable(UIListControlPane.this); - - UIListControlPane.this.addNameable(nameable, getModel().getSize()); - } - }); - } - } - - protected boolean whetherAdd(String itemName){ - return HyperlinkFilterHelper.whetherAddHyperlink4cell(itemName); - } + @Override + public void onAddItem(NameableCreator creator) { + getCommonHandlers().onAddItem(creator); } - /* - * 移除item - */ - private class RemoveItemAction extends UpdateAction { - public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); - this.setMnemonic('R'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/base/images/cell/control/remove.png")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - try { - UIListControlPane.this.nameableList.getCellEditor() - .stopCellEditing(); - } catch (Exception ignored) { - // do nothing - } - // bug:在选中一个NameObject并删除，会遗留下Name. - doBeforeRemove(); - if (GUICoreUtils.removeJListSelectedNodes(SwingUtilities - .getWindowAncestor(UIListControlPane.this), nameableList)) { - checkButtonEnabled(); - doAfterRemove(); - } - } + @Override + public void onRemoveItem() { + getCommonHandlers().onRemoveItem(); } - /* - * CopyItem - */ - private class CopyItemAction extends UpdateAction { - public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); - this.setMnemonic('C'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/m_edit/copy.png")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - // p:选中的值. - ListModelElement selectedValue = (ListModelElement) nameableList.getSelectedValue(); - if (selectedValue == null) { - return; - } - - ((JControlUpdatePane) controlUpdatePane).update(); - - Nameable selectedNameable = selectedValue.wrapper; - - // p: 用反射机制实现 - try { - Nameable newNameable = (Nameable) BaseUtils.cloneObject(selectedNameable); - newNameable.setName(createUnrepeatedCopyName(selectedNameable.getName())); - - UIListControlPane.this.addNameable(newNameable, nameableList.getSelectedIndex() + 1); - } catch (Exception e) { - FRContext.getLogger().error(e.getMessage(), e); - } - } + @Override + public void onCopyItem() { + getCommonHandlers().onCopyItem(); } - /* - * 上移Item - */ - private class MoveUpItemAction extends UpdateAction { - public MoveUpItemAction() { - 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")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - return; - } + @Override + public void onMoveUpItem() { + getCommonHandlers().onMoveUpItem(); + } - // 上移 - if (selectedIndex > 0) { - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); + @Override + public void onMoveDownItem() { + getCommonHandlers().onMoveDownItem(); + } - Object selecteObj1 = listModel.get(selectedIndex - 1); - listModel.set(selectedIndex - 1, listModel.get(selectedIndex)); - listModel.set(selectedIndex, selecteObj1); + @Override + public void onSortItem(boolean isAtoZ) { + getCommonHandlers().onSortItem(isAtoZ); + } - nameableList.setSelectedIndex(selectedIndex - 1); - nameableList.ensureIndexIsVisible(selectedIndex - 1); - } - } + @Override + public boolean isItemSelected() { + return getModel().getSize() > 0 && nameableList.getSelectedIndex() != -1; } /* - * 下移Item + * UINameEdList的鼠标事件 */ - private class MoveDownItemAction extends UpdateAction { - public MoveDownItemAction() { - 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")); - } - - @Override - public void actionPerformed(ActionEvent evt) { - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - return; - } - - if (selectedIndex < nameableList.getModel().getSize() - 1) { - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); - - Object selecteObj1 = listModel.get(selectedIndex + 1); - listModel.set(selectedIndex + 1, listModel.get(selectedIndex)); - listModel.set(selectedIndex, selecteObj1); + private MouseListener getListMouseListener() { + return new MouseAdapter() { + @Override + public void mouseReleased(MouseEvent evt) { + nameableList.stopEditing(); + if (evt.getClickCount() >= 2 + && SwingUtilities.isLeftMouseButton(evt) && evt.getX() > EDIT_RANGE) { + editingIndex = nameableList.getSelectedIndex(); + selectedName = nameableList.getNameAt(editingIndex); + nameableList.editItemAt(nameableList.getSelectedIndex()); + } else if (SwingUtilities.isLeftMouseButton(evt) && evt.getX() <= EDIT_RANGE) { + editingIndex = nameableList.getSelectedIndex(); + selectedName = nameableList.getNameAt(editingIndex); + popupEditDialog(evt.getPoint()); + } - nameableList.setSelectedIndex(selectedIndex + 1); - nameableList.ensureIndexIsVisible(selectedIndex + 1); - } - } - } + // peter:处理右键的弹出菜单 + if (!SwingUtilities.isRightMouseButton(evt)) { + return; + } - private class SortItemAction extends UpdateAction { - private boolean isAtoZ = false; + // peter: 注意,在checkButtonEnabled()方法里面,设置了所有的Action的Enabled. + checkButtonEnabled(); - public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); - this.setMnemonic('S'); - this.setSmallIcon(BaseUtils - .readIcon("/com/fr/design/images/control/sortAsc.png")); - } + // p:右键菜单. + JPopupMenu popupMenu = new JPopupMenu(); - @Override - public void actionPerformed(ActionEvent evt) { - // p:选中的值. - Object selectedValue = nameableList.getSelectedValue(); + for (ShortCut4JControlPane sj : getShorts()) { + sj.getShortCut().intoJPopupMenu(popupMenu); + } - DefaultListModel listModel = (DefaultListModel) nameableList - .getModel(); - Nameable[] nameableArray = new Nameable[listModel.getSize()]; - if (nameableArray.length <= 0) { - return; + // peter: 只有弹出菜单有子菜单的时候,才需要弹出来. + GUICoreUtils.showPopupMenu(popupMenu, nameableList, evt.getX() - 1, + evt.getY() - 1); } - for (int i = 0; i < listModel.getSize(); i++) { - nameableArray[i] = ((ListModelElement) listModel.getElementAt(i)).wrapper; + @Override + public void mouseClicked(MouseEvent e) { + JList list = (JList) e.getSource(); + if (list.locationToIndex(e.getPoint()) == -1 && !e.isShiftDown() + && !isMenuShortcutKeyDown(e)) { + list.clearSelection(); + } } - // p:排序. - if (isAtoZ) { - Comparator nameableComparator = new Comparator() { - @Override - public int compare(Nameable o1, Nameable o2) { - return -ComparatorUtils.compare(o1.getName(), o2 - .getName()); - } - }; - isAtoZ = !isAtoZ; - Arrays.sort(nameableArray, nameableComparator); - } else { - Comparator nameableComparator = new Comparator() { - @Override - public int compare(Nameable o1, Nameable o2) { - return ComparatorUtils.compare(o1.getName(), o2 - .getName()); - } - }; - isAtoZ = !isAtoZ; - Arrays.sort(nameableArray, nameableComparator); + private boolean isMenuShortcutKeyDown(InputEvent event) { + return (event.getModifiers() & Toolkit.getDefaultToolkit() + .getMenuShortcutKeyMask()) != 0; } - for (int i = 0; i < nameableArray.length; i++) { - listModel.set(i, new ListModelElement(nameableArray[i])); - } + @Override + public void mouseMoved(MouseEvent e) { - // p:需要选中以前的那个值. - if (selectedValue != null) { - nameableList.setSelectedValue(selectedValue, true); } - - checkButtonEnabled(); - // p:需要repaint. - nameableList.repaint(); - } + }; } - /* - * UINameEdList的鼠标事件 - */ - private MouseListener listMouseListener = new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent evt) { - nameableList.stopEditing(); - if (evt.getClickCount() >= 2 - && SwingUtilities.isLeftMouseButton(evt) && evt.getX() > EDIT_RANGE) { - editingIndex = nameableList.getSelectedIndex(); - selectedName = nameableList.getNameAt(editingIndex); - nameableList.editItemAt(nameableList.getSelectedIndex()); - } else if (SwingUtilities.isLeftMouseButton(evt) && evt.getX() <= EDIT_RANGE) { - editingIndex = nameableList.getSelectedIndex(); - selectedName = nameableList.getNameAt(editingIndex); - popupEditDialog(evt.getPoint()); - } - - // peter:处理右键的弹出菜单 - if (!SwingUtilities.isRightMouseButton(evt)) { - return; - } - - // peter: 注意,在checkButtonEnabled()方法里面,设置了所有的Action的Enabled. - checkButtonEnabled(); - - // p:右键菜单. - JPopupMenu popupMenu = new JPopupMenu(); - - for (ShortCut4JControlPane sj : getShorts()) { - sj.getShortCut().intoJPopupMenu(popupMenu); - } - - // peter: 只有弹出菜单有子菜单的时候,才需要弹出来. - GUICoreUtils.showPopupMenu(popupMenu, nameableList, evt.getX() - 1, - evt.getY() - 1); - } - - @Override - public void mouseClicked(MouseEvent e) { - JList list = (JList) e.getSource(); - if (list.locationToIndex(e.getPoint()) == -1 && !e.isShiftDown() - && !isMenuShortcutKeyDown(e)) { - list.clearSelection(); - } - } - - private boolean isMenuShortcutKeyDown(InputEvent event) { - return (event.getModifiers() & Toolkit.getDefaultToolkit() - .getMenuShortcutKeyMask()) != 0; - } - - @Override - public void mouseMoved(MouseEvent e) { - - } - }; - /** * 检查按钮可用状态 Check button enabled. */ @Override public void checkButtonEnabled() { - - int selectedIndex = nameableList.getSelectedIndex(); - if (selectedIndex == -1) { - this.cardLayout.show(cardPane, "SELECT"); - } else { - this.cardLayout.show(cardPane, "EDIT"); - } - for (ShortCut4JControlPane sj : getShorts()) { - sj.checkEnable(); - } - } - - - public class AbsoluteEnableShortCut extends ShortCut4JControlPane { - public AbsoluteEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(true); - } - } - - public class NormalEnableShortCut extends ShortCut4JControlPane { - public NormalEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel() - .getSize() > 0 - && UIListControlPane.this.nameableList.getSelectedIndex() != -1); - } - } - - public class SortEnableShortCut extends ShortCut4JControlPane { - public SortEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1); - } - - } - - public class MoveUpEnableShortCut extends ShortCut4JControlPane { - public MoveUpEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1 - && UIListControlPane.this.nameableList.getSelectedIndex() > 0); - } - - } - - public class MoveDownEnableShortCut extends ShortCut4JControlPane { - public MoveDownEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1 - && UIListControlPane.this.nameableList.getSelectedIndex() < UIListControlPane.this.nameableList.getModel().getSize() - 1); - } - - } - - - protected Object getob2Populate (Object ob2Populate) { - return ob2Populate; - } - - private class JControlUpdatePane extends JPanel { - private CardLayout card; - private JPanel cardPane; - private BasicBeanPane[] updatePanes; - - private ListModelElement elEditing; - - public JControlUpdatePane() { - initUpdatePane(); - } - - private void initUpdatePane() { - NameableCreator[] creators = creators(); - if (creators == null) { - return; - } - card = new CardLayout(); - cardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - cardPane.setLayout(card); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - this.add(cardPane); - int len = creators.length; - updatePanes = new BasicBeanPane[len]; - } - - public void populate() { - ListModelElement el = (ListModelElement) UIListControlPane.this.nameableList.getSelectedValue(); - if (el == null) { - return; - } - - elEditing = el; - NameableCreator[] creators = creators(); - - for (int i = 0, len = updatePanes.length; i < len; i++) { - Object ob2Populate = creators[i].acceptObject2Populate(el.wrapper); - ob2Populate = getob2Populate(ob2Populate); - if (ob2Populate != null) { - if (updatePanes[i] == null) { - if (isMulti(creators[i].getUpdatePane()) || isTree(creators[i].getUpdatePane())) { - updatePanes[i] = createPaneByCreators(creators[i], el.wrapper.getName()); - } else { - updatePanes[i] = createPaneByCreators(creators[i]); - } - cardPane.add(updatePanes[i], String.valueOf(i)); - } - card.show(cardPane, String.valueOf(i)); - doBeforePopulate(el, ob2Populate); - updatePanes[i].populateBean(ob2Populate); - doWhenPopulate(updatePanes[i]); - break; - } - } - } - - - public boolean isMulti(Class _class) { - return ComparatorUtils.equals(_class, GlobalMultiTDTableDataPane.class) || ComparatorUtils.equals(_class, MultiTDTableDataPane.class); - } - - public boolean isTree(Class _class) { - return ComparatorUtils.equals(_class, GlobalTreeTableDataPane.class) || ComparatorUtils.equals(_class, TreeTableDataPane.class); - } - - public void update() { - NameableCreator[] creators = creators(); - for (int i = 0; i < updatePanes.length; i++) { - BasicBeanPane pane = updatePanes[i]; - - if (pane != null && pane.isVisible()) { - Object bean = pane.updateBean(); - if (i < creators.length) { - creators[i].saveUpdatedBean(elEditing, bean); - } - } - } - } - - public void checkValid() throws Exception { - if (updatePanes != null) { - for (int i = 0; i < updatePanes.length; i++) { - if (updatePanes[i] != null) { - updatePanes[i].checkValid(); - } - } - } - } + getHelper().checkButtonEnabled(); } - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { try { return creator.getUpdatePane().newInstance(); } catch (InstantiationException e) { @@ -950,7 +375,7 @@ public abstract class UIListControlPane extends UIControlPane { } } - protected BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { + public BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { Constructor constructor = null; try { constructor = creator.getUpdatePane().getDeclaredConstructor(new Class[]{String.class}); @@ -965,21 +390,6 @@ public abstract class UIListControlPane extends UIControlPane { } catch (InvocationTargetException e) { throw new RuntimeException(e); } - - } - - // 选项添加个数有限制等情况下 要求能控制快捷按钮的状态 - protected void setToolbarDefEnable(int shortCutIndex, int itemIndex, boolean enabled) { - ToolBarDef toolbarDef = getToolbarDef(); - if (toolbarDef.getShortCutCount() > shortCutIndex) { - ShortCut sc = toolbarDef.getShortCut(shortCutIndex); - if (sc instanceof AddItemMenuDef) { - AddItemMenuDef am = (AddItemMenuDef) sc; - if (am.getShortCutCount() > itemIndex) { - am.getShortCut(itemIndex).setEnabled(enabled); - } - } - } } /** @@ -992,35 +402,9 @@ public abstract class UIListControlPane extends UIControlPane { ((JControlUpdatePane) this.controlUpdatePane).checkValid(); } - private int getInValidIndex() { - BasicBeanPane[] p = ((JControlUpdatePane) controlUpdatePane).updatePanes; - if (p != null) { - for (int i = 0; i < p.length; i++) { - if (p[i] != null) { - try { - p[i].checkValid(); - } catch (Exception e) { - return i; - } - } - } - } - return -1; - } - @Override - protected boolean hasInvalid(boolean isAdd) { - int idx = UIListControlPane.this.getInValidIndex(); - if (isAdd || nameableList.getSelectedIndex() != idx) { - try { - checkValid(); - } catch (Exception exp) { - JOptionPane.showMessageDialog(UIListControlPane.this, exp.getMessage()); - nameableList.setSelectedIndex(idx); - return true; - } - } - return false; + public boolean hasInvalid(boolean isAdd) { + return getHelper().hasInvalid(isAdd); } /** * 设置选中项 @@ -1031,4 +415,23 @@ public abstract class UIListControlPane extends UIControlPane { nameableList.setSelectedIndex(index); } + @Override + public int getSelectedIndex() { + return nameableList.getSelectedIndex(); + } + + @Override + public ListModelElement getSelectedValue() { + return (ListModelElement) this.nameableList.getSelectedValue(); + } + + @Override + public JControlUpdatePane getControlUpdatePane() { + return (JControlUpdatePane) controlUpdatePane; + } + + @Override + public JNameEdList getNameableList() { + return nameableList; + } } 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 f5da7e2f8f..29c8c0602b 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 @@ -228,7 +228,7 @@ public class UISimpleListControlPane extends BasicPane { */ private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); this.setMnemonic('D'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/down.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java new file mode 100644 index 0000000000..8d837fcc09 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/AbstractShortCutFactory.java @@ -0,0 +1,178 @@ +package com.fr.design.gui.controlpane.shortcutfactory; + +import com.fr.base.BaseUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; +import com.fr.design.gui.controlpane.ShortCutListenerProvider; +import com.fr.design.menu.ShortCut; + +import java.awt.event.ActionEvent; + +/** + * 生成 ShortCut 的抽象工厂 + * Created by plough on 2018/8/2. + */ +public abstract class AbstractShortCutFactory { + protected ShortCutListenerProvider listener; + + AbstractShortCutFactory(ShortCutListenerProvider listener) { + setListener(listener); + } + + /** + * 生成一组默认的 ShortCut + */ + abstract public ShortCut4JControlPane[] createShortCuts(); + + abstract public ShortCut createAddItemUpdateAction(NameableCreator[] creator); + + abstract public ShortCut createAddItemMenuDef(NameableCreator[] creator); + + public ShortCut4JControlPane addItemShortCut() { + ShortCut addItemShortCut; + NameableCreator[] creators = listener.creators(); + if (creators.length == 1) { + addItemShortCut = createAddItemUpdateAction(creators); + } else { + addItemShortCut = createAddItemMenuDef(creators); + } + return new AbsoluteEnableShortCut(addItemShortCut); + } + + public ShortCut4JControlPane removeItemShortCut() { + return new NormalEnableShortCut(new RemoveItemAction()); + } + + public ShortCut4JControlPane copyItemShortCut() { + return new NormalEnableShortCut(new CopyItemAction()); + } + + public ShortCut4JControlPane moveUpItemShortCut() { + return new NormalEnableShortCut(new MoveUpItemAction()); + } + + public ShortCut4JControlPane moveDownItemShortCut() { + return new NormalEnableShortCut(new MoveDownItemAction()); + } + + public ShortCut4JControlPane sortItemShortCut() { + return new NormalEnableShortCut(new SortItemAction()); + } + + public void setListener(ShortCutListenerProvider listener) { + this.listener = listener; + } + + private class AbsoluteEnableShortCut extends ShortCut4JControlPane { + AbsoluteEnableShortCut(ShortCut shortCut) { + this.shortCut = shortCut; + } + + /** + * 检查是否可用 + */ + @Override + public void checkEnable() { + this.shortCut.setEnabled(true); + } + } + + private class NormalEnableShortCut extends ShortCut4JControlPane { + NormalEnableShortCut(ShortCut shortCut) { + this.shortCut = shortCut; + } + + /** + * 检查是否可用 + */ + @Override + public void checkEnable() { + this.shortCut.setEnabled(listener.isItemSelected()); + } + } + + /* + * 移除item + */ + private class RemoveItemAction extends UpdateAction { + RemoveItemAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Remove"))); + this.setMnemonic('R'); + this.setSmallIcon(BaseUtils + .readIcon("/com/fr/base/images/cell/control/remove.png")); + } + + @Override + public void actionPerformed(ActionEvent evt) { + listener.onRemoveItem(); + } + } + + /* + * CopyItem + */ + private class CopyItemAction extends UpdateAction { + CopyItemAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); + this.setMnemonic('C'); + this.setSmallIcon(BaseUtils + .readIcon("/com/fr/design/images/m_edit/copy.png")); + } + + @Override + public void actionPerformed(ActionEvent evt) { + listener.onCopyItem(); + } + } + + /* + * 上移Item + */ + private class MoveUpItemAction extends UpdateAction { + MoveUpItemAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); + this.setMnemonic('U'); + this.setSmallIcon(BaseUtils + .readIcon("/com/fr/design/images/control/up.png")); + } + + @Override + public void actionPerformed(ActionEvent evt) { + listener.onMoveUpItem(); + } + } + + /* + * 下移Item + */ + private class MoveDownItemAction extends UpdateAction { + MoveDownItemAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); + this.setMnemonic('D'); + this.setSmallIcon(BaseUtils + .readIcon("/com/fr/design/images/control/down.png")); + } + + @Override + public void actionPerformed(ActionEvent evt) { + listener.onMoveDownItem(); + } + } + + private class SortItemAction extends UpdateAction { + private boolean isAtoZ = false; + + SortItemAction() { + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); + this.setMnemonic('S'); + this.setSmallIcon(BaseUtils + .readIcon("/com/fr/design/images/control/sortAsc.png")); + } + + @Override + public void actionPerformed(ActionEvent evt) { + listener.onSortItem(isAtoZ); + } + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java new file mode 100644 index 0000000000..a7608e2bdf --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java @@ -0,0 +1,112 @@ +package com.fr.design.gui.controlpane.shortcutfactory; + +import com.fr.base.BaseUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.gui.HyperlinkFilterHelper; +import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; +import com.fr.design.gui.controlpane.ShortCutListenerProvider; +import com.fr.design.menu.LineSeparator; +import com.fr.design.menu.MenuDef; +import com.fr.design.menu.ShortCut; +import com.fr.general.ComparatorUtils; +import com.fr.general.Inter; + +import javax.swing.Icon; +import java.awt.event.ActionEvent; + +/** + * Created by plough on 2018/8/13. + */ +public class OldShortCutFactory extends AbstractShortCutFactory { + + private OldShortCutFactory(ShortCutListenerProvider listenerProvider) { + super(listenerProvider); + } + + public static OldShortCutFactory newInstance(ShortCutListenerProvider listenerProvider) { + return new OldShortCutFactory(listenerProvider); + } + + @Override + public ShortCut4JControlPane[] createShortCuts() { + return new ShortCut4JControlPane[]{ + addItemShortCut(), + removeItemShortCut(), + copyItemShortCut(), + moveUpItemShortCut(), + moveDownItemShortCut(), + sortItemShortCut() + }; + } + + @Override + public ShortCut createAddItemUpdateAction(NameableCreator[] creators) { + return new AddItemUpdateAction(creators); + } + + @Override + public ShortCut createAddItemMenuDef(NameableCreator[] creators) { + return new AddItemMenuDef(creators); + } + + + /** + * 增加项的UpdateAction + */ + protected class AddItemUpdateAction extends UpdateAction { + final NameableCreator creator; + + public AddItemUpdateAction(NameableCreator[] creators) { + this.creator = creators[0]; + this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add"))); + this.setMnemonic('A'); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); + } + + @Override + public void actionPerformed(ActionEvent e) { + listener.onAddItem(creator); + } + } + + /* + * 增加项的MenuDef + */ + private class AddItemMenuDef extends MenuDef { + AddItemMenuDef(NameableCreator[] creators) { + this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add"))); + this.setMnemonic('A'); + this.setIconPath("/com/fr/design/images/control/addPopup.png"); + wrapActionListener(creators); + } + + private void wrapActionListener(NameableCreator[] creators) { + for (final NameableCreator creator : creators) { + if (!HyperlinkFilterHelper.whetherAddHyperlink4cell(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")); + if (isTrue) { + this.addShortCut(new LineSeparator()); + } + this.addShortCut(new UpdateAction() { + { + this.setName(creator.menuName()); + Icon icon = creator.menuIcon(); + if (icon != null) { + this.setSmallIcon(icon); + } + } + + @Override + public void actionPerformed(ActionEvent e) { + listener.onAddItem(creator); + } + }); + } + } + } + +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java new file mode 100644 index 0000000000..b561c28bac --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java @@ -0,0 +1,171 @@ +package com.fr.design.gui.controlpane.shortcutfactory; + +import com.fr.base.BaseUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.actions.core.ActionFactory; +import com.fr.design.gui.HyperlinkFilterHelper; +import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; +import com.fr.design.gui.controlpane.ShortCutListenerProvider; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.menu.LineSeparator; +import com.fr.design.menu.MenuDef; +import com.fr.design.menu.ShortCut; +import com.fr.general.ComparatorUtils; +import com.fr.stable.StringUtils; + +import javax.swing.AbstractButton; +import javax.swing.Action; +import javax.swing.Icon; +import javax.swing.JComponent; +import java.awt.event.ActionEvent; + +/** + * Created by plough on 2018/8/13. + */ +public class ShortCutFactory extends AbstractShortCutFactory { + + protected ShortCutFactory(ShortCutListenerProvider listenerProvider) { + super(listenerProvider); + } + + public static ShortCutFactory newInstance(ShortCutListenerProvider listenerProvider) { + return new ShortCutFactory(listenerProvider); + } + + @Override + public ShortCut4JControlPane[] createShortCuts() { + return new ShortCut4JControlPane[]{ + copyItemShortCut(), + moveUpItemShortCut(), + moveDownItemShortCut(), + sortItemShortCut(), + removeItemShortCut() + }; + } + + @Override + public ShortCut createAddItemUpdateAction(NameableCreator[] creators) { + return new AddItemUpdateAction(creators); + } + + @Override + public ShortCut createAddItemMenuDef(NameableCreator[] creators) { + return new AddItemMenuDef(creators); + } + + /** + * 增加项的UpdateAction + */ + protected class AddItemUpdateAction extends UpdateAction { + final NameableCreator creator; + + public AddItemUpdateAction(NameableCreator[] creators) { + this.creator = creators[0]; + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); + this.setMnemonic('A'); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); + } + + /** + * Gets component on toolbar. + * + * @return the created components on toolbar. + */ + @Override + public JComponent createToolBarComponent() { + Object object = this.getValue(UIButton.class.getName()); + if (!(object instanceof AbstractButton)) { + // 直接使用默认UI + UIButton button = new UIButton(); + // 添加一个名字作为自动化测试用 + button.setName(getName()); + + //设置属性. + Integer mnemonicInteger = (Integer) this.getValue(Action.MNEMONIC_KEY); + if (mnemonicInteger != null) { + button.setMnemonic((char) mnemonicInteger.intValue()); + } + + button.setIcon((Icon) this.getValue(Action.SMALL_ICON)); + button.addActionListener(this); + + button.registerKeyboardAction(this, this.getAccelerator(), JComponent.WHEN_IN_FOCUSED_WINDOW); + + this.putValue(UIButton.class.getName(), button); + button.setText(StringUtils.EMPTY); + button.setEnabled(this.isEnabled()); + + //peter:产生tooltip + button.setToolTipText(ActionFactory.createButtonToolTipText(this)); + object = button; + } + + return (JComponent) object; + } + + @Override + public void actionPerformed(ActionEvent e) { + listener.onAddItem(creator); + } + } + + /* + * 增加项的MenuDef + */ + protected class AddItemMenuDef extends MenuDef { + public AddItemMenuDef(NameableCreator[] creators) { + super(true); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); + this.setMnemonic('A'); + this.setIconPath("/com/fr/design/images/control/addPopup.png"); + wrapActionListener(creators); + } + + /** + * 生成UIButton + * @return 菜单按钮 + */ + public UIButton createUIButton() { + createdButton = super.createUIButton(); + // 此按钮单独抽出，不应使用工具栏外观 + if (!createdButton.isOpaque()) { + createdButton.setOpaque(true); + createdButton.setNormalPainted(true); + createdButton.setBorderPaintedOnlyWhenPressed(false); + } + return createdButton; + } + + private void wrapActionListener(NameableCreator[] creators) { + for (final NameableCreator creator : creators) { + if (!whetherAdd(creator.menuName())) { + continue; + } + 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("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database")); + if (isTrue) { + this.addShortCut(new LineSeparator()); + } + this.addShortCut(new UpdateAction() { + { + this.setName(creator.menuName()); + Icon icon = creator.menuIcon(); + if (icon != null) { + this.setSmallIcon(icon); + } + } + + @Override + public void actionPerformed(ActionEvent e) { + listener.onAddItem(creator); + } + }); + } + } + + protected boolean whetherAdd(String itemName){ + return HyperlinkFilterHelper.whetherAddHyperlink4cell(itemName); + } + } +} 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 409a598865..02f6a37866 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 @@ -55,24 +55,24 @@ public class WidgetConstants { public static final int MULTI_FILE = 19; // 默认控件 - public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config"); + public static final String DEFAULT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Config"); // 报表控件，与默认控件不同，比如label，table,SEARCH等，这里是不需要的 - public static final String REPORT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Default_Widget_Config"); + public static final String REPORT_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Default_Widget_Config"); - public static final String FORM_CHARTWIDGET = com.fr.design.i18n.Toolkit.i18nText("Widget-Chart_Widget_Config"); + public static final String FORM_CHARTWIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Chart_Widget_Config"); // 表单容器控件 - public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); + public static final String FORM_WIDGETCONTAINER = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Container"); - public static final String POLY_REPORT_WIDGET = com.fr.design.i18n.Toolkit.i18nText("Poly-Report_Component"); + public static final String POLY_REPORT_WIDGET = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Poly_Report_Component"); // 服务器预定义控件 - public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config"); + public static final String USER_DEFINED_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config"); // 服务器组合控件 - public static final String COMB_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Comb_Widget_Config"); + public static final String COMB_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Comb_Widget_Config"); // 服务器自定义控件 - public static final String CUSTOM_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Widget-Custom_Widget_Config"); + public static final String CUSTOM_WIDGETCONFIG = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ec165b5a6a..e3bf61e9dc 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 @@ -130,10 +130,10 @@ public abstract class WidgetOption implements Serializable { BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"), DateEditor.class); - public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree"), + public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class); - 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"), + public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"), TreeComboBoxEditor.class); public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass( @@ -192,7 +192,7 @@ public abstract class WidgetOption implements Serializable { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class); - 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"), + public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), IframeEditor.class); } 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 b7e989ad35..5a3fb62b50 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 @@ -30,7 +30,7 @@ public class CalendarNumberField extends UINumberField { setValue(getIntValue()); } }); - this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12)); + this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 9a8f1c0116..c97b671dec 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 @@ -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(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 Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"),0,12); + private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, 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") + String[] strWeeks = new String[] {StringUtils.EMPTY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mon"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tue"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Wed"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Thu"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Fri"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Time") + ":"); + UILabel timeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Time") + ":"); timeLabel.setBorder(BorderFactory.createEmptyBorder(0,9,0,5)); timeLabel.setFont(FONT_SONG); sPane.add(timeLabel); @@ -769,4 +769,4 @@ public class UICalendarPanel extends JPanel { frame.getContentPane().add(calendarPanel); frame.setVisible(true); } -} \ No newline at end of file +} 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 8d38c9e4eb..0ba64b3f64 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 @@ -1,11 +1,12 @@ package com.fr.design.gui.date; -import java.awt.*; +import com.fr.design.gui.ilable.UILabel; + +import java.awt.Dimension; +import java.awt.Font; import java.text.SimpleDateFormat; import java.util.Date; -import com.fr.design.gui.ilable.UILabel; - public class UIDayLabel extends UILabel { @@ -27,13 +28,13 @@ public class UIDayLabel extends UILabel { public UIDayLabel(Date date, boolean isSmallLabel) { setHorizontalAlignment(UILabel.CENTER); - setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"), 0, 12)); + setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"), 0, 12)); this.date = date; setPreferredSize(new Dimension(30, 18)); if (isSmallLabel) { setText(dayFormat.format(date)); } else { - setText(com.fr.design.i18n.Toolkit.i18nText("Today")+":" + dateFormat.format(new Date())); + setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Today")+":" + dateFormat.format(new Date())); } } 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 6cdd9571dc..85dbdbe5c4 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 @@ -211,7 +211,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous } private String createName(){ - String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Submit"); + String prefix = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_SureToDelete")+ "?", com.fr.design.i18n.Toolkit.i18nText("FR-Designer-CommitTab_Remove") + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CommitTab_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 4b326dd951..d3370a7c07 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 @@ -1,13 +1,11 @@ package com.fr.design.gui.frpane; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.design.utils.gui.JListUtils; +import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; @@ -20,14 +18,14 @@ import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; 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.stable.StringUtils; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.design.utils.gui.JListUtils; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; public abstract class EditingStringListPane extends BasicBeanPane> { @@ -57,11 +55,11 @@ public abstract class EditingStringListPane extends BasicBeanPane> }); - 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")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Modify")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); + moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); + moveDownButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Down")); JPanel eastPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); eastPane.add(editButton); @@ -151,7 +149,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), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete") + selected.toString() + "?"); + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete") + selected.toString() + "?"); if (re == JOptionPane.OK_OPTION) { JListUtils.removeSelectedListItems(jlist); } @@ -205,4 +203,4 @@ public abstract class EditingStringListPane extends BasicBeanPane> } return lists; } -} \ No newline at end of file +} 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 1fd5b8f4f1..3f4ae9b2a5 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 @@ -82,12 +82,12 @@ public abstract class HyperlinkGroupPane extends UIListControlPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"); } @Override protected String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 225d5bcdf7..58f0e8f837 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 @@ -34,7 +34,7 @@ public class ImgChoosePane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel previewContainner = new JPanel(); - previewContainner.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"))); + previewContainner.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); previewPane = new ImagePreviewPane(); previewContainner.add(previewPane); @@ -73,7 +73,7 @@ public class ImgChoosePane extends BasicPane { } private void initButton() { - chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); chooseButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -91,7 +91,7 @@ public class ImgChoosePane extends BasicPane { } }); - clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Clear")); + clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear")); clearButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { previewPane.setImage(null); @@ -115,6 +115,6 @@ public class ImgChoosePane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } } 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 32a706fc5f..36183f1078 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 @@ -148,7 +148,7 @@ public class ImgChooseWrapper { imageSizeLabel.setText(StringUtils.EMPTY); } else { imageSizeLabel.setText(selectImage.getWidth(null) + "x" - + selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("px")); + + selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 49402b9504..46cdae35bd 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 @@ -51,7 +51,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe */ public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_A_Tree_DataSource_To_Build") + ": "); treeTableDataComboBox = new TreeTableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); treeTableDataComboBox.setPreferredSize(new Dimension(180, 20)); selectTreeDataPanel = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -78,9 +78,9 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), valuePane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), textPane}}; double p = TableLayout.PREFERRED; @@ -108,10 +108,10 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe 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, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } } @@ -230,4 +230,4 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe valuePane.populate(1); } -} \ No newline at end of file +} 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 59bce3944b..0c266b81ac 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root")); + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root")); defaultTreeModel = new DefaultTreeModel(rootNode); - DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new TreeNodeAttr())); + DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Performance_First")); + isPerformanceFirst = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), treeNodeAttr[i])); + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), 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); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; } @@ -267,4 +267,4 @@ public class JTreeControlPane extends ControlPane { return this; } }; -} \ No newline at end of file +} 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 28025844e6..9f5101ae63 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 @@ -29,7 +29,7 @@ public abstract class ListenerUpdatePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"); } @Override 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 a379360533..372a37be86 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 @@ -31,7 +31,7 @@ public class LoadingBasicPaneTest { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Test") ; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 b57ed131e6..e946ad4f94 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 @@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property")); + this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Remove")); + cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); this.add(cancel); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name")+":")); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name")+":")); this.nameField = new UITextField(6); this.add(this.nameField); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")+ ":")); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 20f28fb087..5d37fb4a96 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")); + UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 34f1883110..2df45f8923 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 @@ -76,7 +76,7 @@ public class RegPane extends BasicPane { regComboBox.setRenderer(listCellRender); JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; + private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data_Type")); + UILabel dataTypeLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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")); + UILabel minLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reg_Min_Length")); + UILabel maxLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("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("Fine-Design_Basic_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM); this.add(panel); } @@ -490,24 +490,24 @@ public class RegPane extends BasicPane { int index, boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); if (value instanceof NoneReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None")); } else if (value instanceof LengthReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Length")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length")); } else if (value instanceof MailReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email")); } else if (value instanceof PhoneReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Phone")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone")); } else if (value instanceof MobileReg) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_MobilePhone")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Phone")); } else if (value instanceof IDCardReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_IDCard")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ID_Card")); } else if (value instanceof PostCardReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PostCode")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Post_Code")); } else if (value instanceof CustomReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")); } return this; } }; -} \ No newline at end of file +} 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 e18d04b94e..37bd82bfc5 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 @@ -95,7 +95,7 @@ public class ReportletParameterViewPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 4d2eb918d0..6702319b78 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 @@ -1,20 +1,19 @@ package com.fr.design.gui.frpane; -import java.awt.BorderLayout; -import java.awt.Component; - -import javax.swing.BorderFactory; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.Parameter; +import com.fr.design.dialog.BasicPane; +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.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; 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 javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; /** @@ -30,7 +29,7 @@ public class TemplateParameterPane extends BasicPane { } public void initComponents() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Parameter"))); + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))); this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -39,8 +38,8 @@ public class TemplateParameterPane extends BasicPane { JPanel defaultPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); northPane.add(defaultPane, BorderLayout.CENTER); - UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":"); - UILabel valueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value") + ":"); + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"); + UILabel valueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") + ":"); nameTextField = new UITextField(12); valuePane = ValueEditorPaneFactory.createBasicValueEditorPane(); @@ -55,7 +54,7 @@ public class TemplateParameterPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"); } public void populate(Parameter parameter) { @@ -82,7 +81,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(com.fr.design.i18n.Toolkit.i18nText("ParameterD-Parameter_name_cannot_be_null") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 58164e7f60..ba75cce9df 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 @@ -42,8 +42,8 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { */ private static final long serialVersionUID = 1762889323082827111L; - 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")}; + private String[] buildWay = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DataTable_Build"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Auto_Build"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Build-Way") + " ："); + UILabel buildWayLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Create_Tree"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Create_Tree"); } @Override @@ -108,7 +108,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI { } NameableCreator treeNode = new NameObjectCreator( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 40039deb20..c3dda67741 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 @@ -142,7 +142,7 @@ public class UIAdvancedTextPane extends UITextPane { private class CutAction extends UpdateAction { public CutAction() { - setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); + setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 79ed963094..a1f92ddd0e 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"), + UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class); data.add(reportlet); data.add(email); @@ -411,4 +411,4 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} 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 e8ea9fdaf5..3a23a478c3 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 @@ -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 = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; + final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 eb63c0b64f..b1958a8c19 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")); + spinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); this.setLayout(new BorderLayout(4, 0)); this.add(spinner, BorderLayout.EAST); this.add(dragBar, BorderLayout.CENTER); @@ -137,4 +137,4 @@ public class UINumberDragPane extends BasicBeanPane implements GlobalNam public boolean shouldResponseNameListener() { return true; } -} \ No newline at end of file +} 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 288396c29a..92ad39559e 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 @@ -113,10 +113,10 @@ public class UITabbedPane extends JTabbedPane{ * @param i tab索引 */ public void doRemoveTab(int i){ - int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("sure_to_delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove") + int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove") , JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (re == JOptionPane.OK_OPTION) { super.removeTabAt(i); } } -} \ No newline at end of file +} 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 858e7f53c2..128adca1f1 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 @@ -47,10 +47,10 @@ public class LayerDataControlPane extends ControlPane { configPane = new LayerDataConfigPane(); //创建树结构及树控件 JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Root")); + DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root")); defaultTreeModel = new DefaultTreeModel(rootNode); tree = new JTree(defaultTreeModel); - DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new LayerConfig(1))); + DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + nodeCount, new LayerConfig(nodeCount)); + NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(), 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); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), layerConfigs[i].clone())); + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3975c2d435..2c0612e024 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 @@ -69,8 +69,8 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener { tableDataDictPane.tableDataNameComboBox.addItemListener(this); //初始化按钮对象 - addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("add")); - delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); + delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_layerIndex"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Index"); } else { - name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_filedChosen"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Filed_Chosen"); } 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 364e68d211..cd135a1db2 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 @@ -3,9 +3,6 @@ */ package com.fr.design.gui.icombobox; -import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icombobox.UIComboBoxRenderer; - import com.fr.stable.Constants; import com.fr.stable.StringUtils; @@ -50,17 +47,17 @@ public class AlignmentComboBox extends UIComboBox { public static String getAlignDescription(int alignment) { if (alignment == Constants.CENTER) {//0 - return com.fr.design.i18n.Toolkit.i18nText("Center"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"); } else if (alignment == Constants.TOP) {//1 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"); } else if (alignment == Constants.LEFT) {//2 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"); } else if (alignment == Constants.BOTTOM) {//3 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"); } else if (alignment == Constants.RIGHT) { //4 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"); } else if (alignment == Constants.DISTRIBUTED) { //added by Kevin Wang 6 - return com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Distibuted"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Distibuted"); } else { return StringUtils.EMPTY; } @@ -80,4 +77,4 @@ public class AlignmentComboBox extends UIComboBox { return this; } } -} \ No newline at end of file +} 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 69af3a7299..d865fdb690 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 @@ -18,15 +18,15 @@ public class DictionaryConstants { public final static String[] regexpsDisplays = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_MobilePhone"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_IDCard"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_PostCode"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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[]{ - com.fr.design.i18n.Toolkit.i18nText("Form-Comma"), - com.fr.design.i18n.Toolkit.i18nText("Form-Semicolon"), - com.fr.design.i18n.Toolkit.i18nText("Form-Colon") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Comma"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Semicolon"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Colon") }; public static final String[] symbols = new String[]{ @@ -56,8 +56,8 @@ public class DictionaryConstants { public static final String[] symbolDisplays = new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), - com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"), - com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Single_Quote"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Double_Quotes") }; // richer:文件类型选择器 public static final String[] fileTypes = new String[]{ @@ -77,10 +77,10 @@ public class DictionaryConstants { }; public static final String[] fileTypeDisplays = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Form-All_Files"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_All_Files"), "txt", "pdf", "jpg,png,gif", "doc,xls,ppt" }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java index a5da615b0c..74db09f921 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/FunctionComboBox.java @@ -3,13 +3,13 @@ */ package com.fr.design.gui.icombobox; -import java.awt.Component; +import com.fr.data.core.DataCoreUtils; +import com.fr.data.util.function.DataFunction; +import com.fr.design.utils.gui.FunctionClassMappingUtils; import javax.swing.DefaultComboBoxModel; import javax.swing.JList; - -import com.fr.data.core.DataCoreUtils; -import com.fr.data.util.function.DataFunction; +import java.awt.Component; /** * DataFunction combobox. @@ -60,7 +60,8 @@ public class FunctionComboBox extends UIComboBox { if (value instanceof DataFunction) { DataFunction function = (DataFunction) value; - this.setText(" " + DataCoreUtils.getFunctionDisplayName(function)); + String functionBriefName = DataCoreUtils.getFunctionBriefName(function); + this.setText(com.fr.design.i18n.Toolkit.i18nText(FunctionClassMappingUtils.getLocaleKey(functionBriefName))); } return this; 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 e4c25470ad..75dabb56d2 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 @@ -3,12 +3,11 @@ */ package com.fr.design.gui.icombobox; -import java.awt.Component; +import com.fr.data.util.SortOrder; import javax.swing.DefaultComboBoxModel; import javax.swing.JList; - -import com.fr.data.util.SortOrder; +import java.awt.Component; /** @@ -53,11 +52,11 @@ public class SortOrderComboBox extends UIComboBox { SortOrder sortOrder = (SortOrder) value; if (sortOrder.getOrder() == SortOrder.ASC) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Ascending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Ascending")); } else if (sortOrder.getOrder() == SortOrder.DESC) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Descending")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Descending")); } else if (sortOrder.getOrder() == SortOrder.ORIGINAL) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Sort-Original")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sort_Original")); } } @@ -70,4 +69,4 @@ public class SortOrderComboBox extends UIComboBox { new SortOrder(SortOrder.DESC), new SortOrder(SortOrder.ORIGINAL) }; -} \ No newline at end of file +} 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 51bdba9859..eadb94109f 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 @@ -1,16 +1,28 @@ package com.fr.design.gui.icontainer; -import com.fr.base.BaseUtils; import com.fr.base.vcs.DesignerMode; 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.design.utils.gui.GUICoreUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JLayeredPane; +import javax.swing.JPanel; +import java.awt.AlphaComposite; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Composite; +import java.awt.Container; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.LayoutManager; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; @@ -263,7 +275,7 @@ public class UIModeControlContainer extends JLayeredPane { public HidePane() { setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3)); setBackground(UIConstants.NORMAL_BACKGROUND); - add(new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Parameter Panel") + "")); + add(new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 90aeff3dd3..0efa74cec7 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 @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Vector; public class JNameEdList extends UIList implements CellEditorListener { - private static final int TEST_LIST_LENTH = 20; private static final int ICON_WIDTH = 20; private boolean editable = true; @@ -232,7 +231,7 @@ public class JNameEdList extends UIList implements CellEditorListener { } Rectangle rect = this.getCellBounds(index, index); // alex:所有的JNameEdList都有Icon,空出前面20 * 20的位置就是放的Icon - rect.setRect(createRect(rect, ICON_WIDTH)); + rect.setRect(createRect(rect, getIconWidth())); editorComp.setBounds(rect); add(editorComp); @@ -247,6 +246,10 @@ public class JNameEdList extends UIList implements CellEditorListener { return true; } + public int getIconWidth() { + return ICON_WIDTH; + } + public Rectangle createRect(Rectangle rect, int iconWidth) { return new Rectangle(rect.x + iconWidth, rect.y, rect.width - iconWidth, rect.height); } @@ -301,9 +304,14 @@ public class JNameEdList extends UIList implements CellEditorListener { String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString(); setNameAt(name, editingIndex); removeComp(); + doAfterStopEditing(); } } + protected void doAfterStopEditing() { + // default: do nothing + } + public String[] getAllNames() { int length = this.getModel().getSize(); String[] names = new String[length]; @@ -335,53 +343,4 @@ public class JNameEdList extends UIList implements CellEditorListener { editorComp = null; repaint(cellRect); } - - /** - * 主函数 - * - * @param args 参数 - */ - public static void main(String... args) { - JFrame f = new JFrame(); - JPanel c = (JPanel) f.getContentPane(); - c.setLayout(new BorderLayout()); - ListModelElement[] data = new ListModelElement[TEST_LIST_LENTH]; - for (int i = 0; i < TEST_LIST_LENTH; i++) { - data[i] = new ListModelElement(new NameObject(i + 1 + "", i)); - } - final JNameEdList list = new JNameEdList(data); - list.setEditable(true); - list.addMouseListener(new MouseAdapter() { - public void mouseReleased(MouseEvent evt) { - list.stopEditing(); - if (evt.getClickCount() >= 2 - && SwingUtilities.isLeftMouseButton(evt)) { - list.editItemAt(list.getSelectedIndex()); - } - } - }) - ; - - list.setCellEditor(new DefaultListCellEditor(new UITextField())); - list.setCellRenderer(new NameableListCellRenderer()); - c.add(list, BorderLayout.CENTER); - f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - f.setSize(400, 600); - f.setVisible(true); - } - - private static class NameableListCellRenderer extends 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 Nameable) { - Nameable wrappee = (Nameable) value; - this.setText(wrappee.getName()); - } - return this; - } - } - } \ No newline at end of file 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 c9e3f1d687..131adbed7a 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 @@ -1,163 +1,21 @@ package com.fr.design.gui.ilist; -import com.fr.base.Utils; -import com.fr.design.gui.itextfield.UITextField; - 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 javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; -import java.util.Vector; +import javax.swing.ListModel; +import java.awt.Point; /** * Created by plough on 2017/7/23. */ -public class UINameEdList extends UIList implements CellEditorListener { - private static final int TEST_LIST_LENTH = 20; +public class UINameEdList extends JNameEdList { private static final int BUTTON_WIDTH = 25; - private boolean editable = true; - - // kunsnat: 是否强制ListName是数字 (int型) - private boolean isNameShouldNumber = false; - transient protected ListCellEditor cellEditor; - transient protected Component editorComp; - transient protected int editingIndex; - private PropertyChangeAdapter editingListner; - private java.util.List ll = new ArrayList(); - - public UINameEdList(ListModel dataModel) { + protected UINameEdList(ListModel dataModel) { super(dataModel); } - public UINameEdList(final Object[] listData) { - super(listData); - } - - public UINameEdList(final Vector listData) { - super(listData); - } - - public UINameEdList() { - super(); - } - - /* - * Sets是否可编辑 - */ - public void setEditable(boolean editable) { - this.editable = editable; - } - - /** - * 是否可编辑 - * - * @return 是则返回true - */ - public boolean isEditable() { - return this.editable; - } - - public void setNameShouldNumber(boolean isNameShouldNumber) { - this.isNameShouldNumber = isNameShouldNumber; - } - - /** - * 是否强制ListName是数字 (int型) - * - * @return 是则返回true - */ - public boolean isNameShouldNumber() { - return isNameShouldNumber; - } - - /** - * 添加名字改变时的listener - * - * @param l 监听器 - */ - public void addModNameActionListener(ModNameActionListener l) { - ll.add(l); - } - - /** - * 编辑时的监听器 - * - * @param l 监听器 - */ - public void addEditingListner(PropertyChangeAdapter l) { - this.editingListner = l; - } - - /** - * 移除某名字改变时的listener - * - * @param l 监听器 - */ - public void removeModNameActionListener(ModNameActionListener l) { - ll.remove(l); - } - - public ListCellEditor getCellEditor() { - if (cellEditor == null) { - UITextField editField = new UITextField(); - if (editingListner != null) { - editField.addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - editingListner.propertyChange(); - - } - - @Override - public void focusGained(FocusEvent e) { - // TODO Auto-generated method stub - - } - }); - } - cellEditor = new DefaultListCellEditor(editField) { - public boolean stopCellEditing() { - boolean isTrue = super.stopCellEditing(); - stopEditing(); - - return isTrue; - } - }; - cellEditor.addCellEditorListener(this); - } - - return cellEditor; - } - - protected void doAfterLostFocus() { - - } - - public void setCellEditor(ListCellEditor editor) { - this.cellEditor = editor; - } - - /* - * 取得index节点的名字 - */ - public String getNameAt(int index) { - Nameable nameable = ((ListModelElement) getModel().getElementAt(index)).wrapper; - if (nameable != null) { - return nameable.getName(); - } - - return null; - } - public Object getType(int index) { Nameable nameable = ((ListModelElement) getModel().getElementAt(index)).wrapper; if (nameable != null && nameable instanceof NameObject) { @@ -166,177 +24,8 @@ public class UINameEdList extends UIList implements CellEditorListener { return null; } - /* - * 设置index节点的名字 - */ - // b:edit改变name的时候怎么办？ - public void setNameAt(String name, int index) { - Nameable nameable = ((ListModelElement) getModel().getElementAt(index)).wrapper; - if (nameable != null) { - String oldName = nameable.getName(); - - if (isNameShouldNumber()) { - // kunsnat: 限制只能是数字(int型) - Number number = Utils.string2Number(name); - if (number == null) { - nameable.setName(oldName); - } else { - int newName = number.intValue(); - nameable.setName(String.valueOf(newName)); - } - } else { - nameable.setName(name); - } - - for (int i = 0, len = ll.size(); i < len; i++) { - ll.get(i).nameModed(index, oldName, name); - } - } - } - - /* - * 编辑第index个item - */ - private String oldName; - - /** - * 编辑第index项 - * - * @param index 序号 - * @return 成功返回true - */ - public boolean editItemAt(int index) { - // 如果不可编辑,返回 - if (!this.editable) { - return false; - } - - if (cellEditor != null && !cellEditor.stopCellEditing()) { - return false; - } - if (index < 0 || index >= this.getModel().getSize()) { - return false; - } - - ListCellEditor editor = getCellEditor(); - Object value = editor.getCellEditorValue(); - if (!StringUtils.isBlank(value.toString())) { - oldName = value.toString(); - } - editorComp = prepareEditor(editor, index); - if (editorComp == null) { - return false; - } - Rectangle rect = this.getCellBounds(index, index); - // alex:所有的UINameEdList都有Icon,空出前面20 * 20的位置就是放的Icon - rect.setRect(createRect(rect, BUTTON_WIDTH)); - - editorComp.setBounds(rect); - add(editorComp); - editorComp.validate(); - editorComp.requestFocus(); - if (editorComp instanceof UITextField) { - ((UITextField) editorComp).selectAll(); - } - - setEditingIndex(index); - - return true; - } - - public Rectangle createRect(Rectangle rect, int iconWidth) { - return new Rectangle(rect.x + iconWidth, rect.y, rect.width - iconWidth, rect.height); - } - - public String getEditingName() { - return (String) getCellEditor().getCellEditorValue(); - } - - /* - * 根据ListCellEditor取得编辑器的Component - */ - private Component prepareEditor(ListCellEditor cellEditor, int index) { - String name = getNameAt(index); - boolean isSelected = this.isSelectedIndex(index); - Component comp = cellEditor.getListCellEditorComponent(this, name, isSelected, index); - - return comp; - } - - /* - * 记录正在编辑的index - */ - private void setEditingIndex(int idx) { - editingIndex = idx; - } - - /** - * 编辑取消 - * - * @param e 事件 - */ - public void editingCanceled(ChangeEvent e) { - removeComp(); - } - - /** - * 编辑结束 - * - * @param e 事件 - */ - public void editingStopped(ChangeEvent e) { - doAfterLostFocus(); - stopEditing(); - } - - /** - * 停止编辑事件 - */ - public void stopEditing() { - ListCellEditor editor = getCellEditor(); - if (editor != null && editorComp != null) { - Object value = editor.getCellEditorValue(); - String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString(); - setNameAt(name, editingIndex); - removeComp(); - doAfterStopEditing(); - } - } - - protected void doAfterStopEditing() { - // default: do nothing - } - - public String[] getAllNames() { - int length = this.getModel().getSize(); - String[] names = new String[length]; - for (int i = 0; i < length; i++) { - names[i] = getNameAt(i); - } - return names; - } - - public Object[] getAllTypes() { - int length = this.getModel().getSize(); - Object[] types = new Object[length]; - for (int i = 0; i < length; i++) { - types[i] = getType(i); - } - return types; - } - - - /* - * 移除编辑器的Component - */ - private void removeComp() { - if (editorComp != null) { - remove(editorComp); - } - Rectangle cellRect = this.getCellBounds(editingIndex, editingIndex); - setEditingIndex(-1); - editorComp = null; - repaint(cellRect); + public int getIconWidth() { + return BUTTON_WIDTH; } @Override @@ -349,67 +38,4 @@ public class UINameEdList extends UIList implements CellEditorListener { return index; } } - - /** - * 主函数 - * - * @param args 参数 - */ - public static void main(String... args) { - JFrame f = new JFrame(); - JPanel c = (JPanel) f.getContentPane(); - c.setLayout(new BorderLayout()); - ListModelElement[] data = new ListModelElement[TEST_LIST_LENTH]; - for (int i = 0; i < TEST_LIST_LENTH; i++) { - data[i] = new ListModelElement(new NameObject(i + 1 + "", i)); - } - final UINameEdList list = new UINameEdList(data); - list.setEditable(true); - list.addMouseListener(new MouseAdapter() { - public void mouseReleased(MouseEvent evt) { - list.stopEditing(); - if (evt.getClickCount() >= 2 - && SwingUtilities.isLeftMouseButton(evt)) { - list.editItemAt(list.getSelectedIndex()); - } - } - - @Override - public void mouseClicked(MouseEvent e) { - JList list = (JList) e.getSource(); - if (list.locationToIndex(e.getPoint()) == -1 && !e.isShiftDown() - && !isMenuShortcutKeyDown(e)) { - list.clearSelection(); - } - } - - private boolean isMenuShortcutKeyDown(InputEvent event) { - return (event.getModifiers() & Toolkit.getDefaultToolkit() - .getMenuShortcutKeyMask()) != 0; - } - }) - ; - - list.setCellEditor(new DefaultListCellEditor(new UITextField())); - list.setCellRenderer(new NameableListCellRenderer()); - c.add(list, BorderLayout.CENTER); - f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - f.setSize(400, 600); - f.setVisible(true); - } - - private static class NameableListCellRenderer extends 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 Nameable) { - Nameable wrappee = (Nameable) value; - this.setText(wrappee.getName()); - } - return this; - } - } - } \ No newline at end of file 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 4bcba97961..d950e91ed7 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 @@ -45,13 +45,13 @@ public class UIMenuTable extends JTable { public void editingEvent(int rowIndex, int mouseY) { selectedRowIndex = rowIndex; repaint(); - + final UIMenuNameableCreator nameObject = UIMenuTable.this.getLine(rowIndex); - + final BasicBeanPane baseShowPane = nameObject.getPane(); - + final Object showValue = nameObject.getObj(); - + baseShowPane.populateBean(showValue); UIDialog dialog = baseShowPane.showUnsizedWindow(SwingUtilities.getWindowAncestor(new JPanel()), new DialogActionAdapter() { @@ -60,13 +60,13 @@ public class UIMenuTable extends JTable { fireTargetChanged(); } }); - + dialog.setSize(500, 600); GUICoreUtils.centerWindow(dialog); - + dialog.setVisible(true); } - + protected Color getRenderBackground(int row) { if(selectedRowIndex == row ) { return UIConstants.SKY_BLUE; @@ -76,7 +76,7 @@ public class UIMenuTable extends JTable { } /** - * + * * @param value 该行列的值(字符串) * @param row * @param column @@ -113,7 +113,7 @@ public class UIMenuTable extends JTable { public void removeLine(int rowIndex) { ((UIMenuTableDataModel)dataModel).removeLine(rowIndex); } - + /** * 清除所有的内容 */ @@ -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(com.fr.design.i18n.Toolkit.i18nText("Reportlet"), + UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class ); data.add(reportlet); data.add(email); @@ -229,4 +229,4 @@ public class UIMenuTable extends JTable { jf.setSize(400, 400); jf.setVisible(true); } -} \ No newline at end of file +} 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 61633fa6ae..8dc90f10bb 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 @@ -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(), 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); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { uiTable.removeLine(table.rowAtPoint(e.getPoint())); uiTable.fireTargetChanged(); @@ -121,4 +121,4 @@ public class UIMenuTableUI extends UITableUI{ } }; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java index 56dfbbdae2..a6ba742830 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java +++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java @@ -106,7 +106,7 @@ public class UISBChooser extends JDialog { JButton b = new JButton("Cancel"); b.addActionListener(new CancelAction()); p3.add(b); - b = new JButton("Fine-Design_Report_OK"); + b = new JButton("OK"); getRootPane().setDefaultButton(b); b.addActionListener(new OKAction()); p3.add(b); 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 72f6a135ba..4367d8f6b5 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 @@ -15,7 +15,6 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableModel; import com.fr.general.ComparatorUtils; @@ -255,9 +254,9 @@ public abstract class AbstractPropertyTable extends JTable { @Override public String getColumnName(int column) { if (column == 0) { - return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Property"); } else { - return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 531a58cd43..370ceacb8f 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 @@ -132,8 +132,8 @@ public class UITableUI extends BasicTableUI { return; } if (!table.isEditing()) { - 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); + int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val == JOptionPane.OK_OPTION) { ((UITable) table).removeLine(table.rowAtPoint(e.getPoint())); ((UITable) table).fireTargetChanged(); @@ -222,4 +222,4 @@ public class UITableUI extends BasicTableUI { installKeyboardActions(); } -} \ No newline at end of file +} 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 a941980ea5..1b1471d40e 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 @@ -35,7 +35,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(int paraUseType) { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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[] { com.fr.design.i18n.Toolkit.i18nText("Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Set-Parameter-Name")); + disableLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Paramete_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 fcc976c53b..d6973f6bb4 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 @@ -106,7 +106,7 @@ public class UITableEditorPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("TableData_Dynamic_Parameter_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData_Dynamic_Parameter_Setting"); } public void populate(T[] objs) { @@ -153,4 +153,4 @@ public class UITableEditorPane extends BasicPane { tableModel.stopCellEditing(); } -} \ No newline at end of file +} 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 b73618fd50..aa44b14ac5 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 @@ -182,7 +182,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class AddTableRowAction extends UITableEditAction { public AddTableRowAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Insert")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); } @@ -207,7 +207,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(), com.fr.design.i18n.Toolkit.i18nText("no-alternatives")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No-Alternatives")); return; } stopCellEditing(); @@ -220,12 +220,12 @@ public abstract class UITableModelAdapter extends AbstractTabl private Component component = null; public DeleteAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } public DeleteAction(Component component){ - this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); this.component = component; } @@ -252,7 +252,7 @@ public abstract class UITableModelAdapter extends AbstractTabl component = DesignerContext.getDesignerFrame(); } int val = JOptionPane.showConfirmDialog(component, - com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (val != JOptionPane.OK_OPTION) { return; @@ -281,7 +281,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveUpAction extends UITableEditAction { public MoveUpAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); } @@ -305,7 +305,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected class MoveDownAction extends UITableEditAction { public MoveDownAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d2f4451c84..b3cc839a34 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Search")); + private UILabel infoLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Search")); - clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Clear")); + iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Search")); + clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f7d42885b3..1ade707d49 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 @@ -43,7 +43,7 @@ public class JFileTree extends AbstractFileTree { private void init(FileFilter filter) { this.fileFilter = filter; - DefaultTreeModel m_model = new DefaultTreeModel(new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("My_Computer"))); + DefaultTreeModel m_model = new DefaultTreeModel(new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 08afafcbf2..7d12a013ed 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 @@ -33,7 +33,7 @@ public class ReportletPane extends BasicPane { textPane.setLineWrap(true); textPane.setFont(FRContext.getDefaultValues().getFRFont().deriveFont(Font.BOLD, 12)); - textPane.setText(com.fr.design.i18n.Toolkit.i18nText("Schedule-The_selected_file_must_be_end_with_filter")); + textPane.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Utils-Switch_To_Template_Reportlet")); + switchButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Switch_To_Template_Reportlet")); } else { card.show(cardPane, "TEMPLATE"); - switchButton.setText(com.fr.design.i18n.Toolkit.i18nText("Utils-Switch_To_Class_Reportlet")); + switchButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Function-The_selected_file_cannot_be_null")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Selected_File_Cannot_Be_Null")); } } @@ -96,7 +96,7 @@ public class ReportletPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Reportlet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 c55a69a79d..bb754716f6 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 @@ -1,17 +1,14 @@ package com.fr.design.gui.itree.refreshabletree; -import java.awt.Color; +import com.fr.data.impl.TreeAttr; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.BorderFactory; import javax.swing.BoxLayout; -import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; -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; - public class TreeRootPane extends BasicPane { @@ -31,7 +28,7 @@ public class TreeRootPane extends BasicPane { JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")); + checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")); checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkTypePane.add(checkTypeCheckBox); @@ -39,7 +36,7 @@ public class TreeRootPane extends BasicPane { JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0(); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")); + loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async")); loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); loadTypePane.add(loadTypeCheckBox); @@ -47,14 +44,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(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only"))); + leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path"))); + returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path"))); returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.add(returnFullPathPane); @@ -82,4 +79,4 @@ public class TreeRootPane extends BasicPane { return treeAttr; } -} \ No newline at end of file +} 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 163fe922dc..11fbaf8c84 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 @@ -54,11 +54,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 = {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[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")}; - 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 static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")}; private JPanel hPaneContainer; private JPanel vPaneContainer; @@ -101,8 +101,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[]{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")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Right"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Distributed"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_DEFAULT")}); hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); @@ -111,7 +111,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[]{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")}); + vAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Tooltips_Bottom")}); initOtherComponent(); initAllNames(); @@ -173,7 +173,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private void initTextRotationCombox() { ArrayList selectOption = new ArrayList(); - selectOption.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom-Angle")); + selectOption.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Angle")); VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG, DefaultVerticalTextProcessor.class); selectOption.addAll(Arrays.asList(processor.getComboxOption())); @@ -181,25 +181,25 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private void initAllNames() { - 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")); + hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal")); + vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical")); + imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout")); + textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style")); + textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); + rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")); + leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent")); + rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent")); + spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before")); + spaceAfterSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After")); + lineSpaceSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing")); } private JPanel createPane() { JPanel jp1 = new JPanel(new BorderLayout()); basicPane = new JPanel(); seniorPane = new JPanel(); - 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()); + basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane()); + seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane()); jp1.add(basicPane, BorderLayout.NORTH); jp1.add(seniorPane, BorderLayout.CENTER); @@ -212,9 +212,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer}, new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, new Component[]{null, null} }; double[] rowSize = {p, p, p, p, p, p}; @@ -229,11 +229,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout")) + " ", SwingConstants.LEFT), imageLayoutComboBox}, + new Component[]{new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout")) + " ", SwingConstants.LEFT), imageLayoutComboBox}, new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox}, new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox}, new Component[]{null, rotationBarCC}, new Component[]{null, null}, }; @@ -257,23 +257,23 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO lineSpaceSpinner.setPreferredSize(SPINNER_DIMENSION); JPanel indentationPane = new JPanel(new BorderLayout()); - indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Indentation")), SwingConstants.LEFT)); + indentationPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Indentation")), SwingConstants.LEFT)); indentationPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); JPanel partSpacingPane = new JPanel(new BorderLayout()); - partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_PartSpacing")), SwingConstants.LEFT)); + partSpacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Part_Spacing")), SwingConstants.LEFT)); partSpacingPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, GAP)); JPanel spacingPane = new JPanel(new BorderLayout()); - spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Spacing")), SwingConstants.LEFT)); + spacingPane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_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((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, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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((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, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Front")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Behind")), SwingConstants.CENTER)}, new Component[]{null, null, null}, new Component[]{null, null, null}, new Component[]{spacingPane, creatSpinnerPane(lineSpaceSpinner), null}, @@ -296,7 +296,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Style_Alignment"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Style_Alignment"); } /** @@ -358,18 +358,18 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO return style; } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) { Integer h = this.hAlignmentPane.getSelectedItem(); style = style.deriveHorizontalAlignment(h == null ? -1 : h); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"))) { Integer vAlign = this.vAlignmentPane.getSelectedItem(); if (vAlign != null) { style = style.deriveVerticalAlignment(vAlign); } } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_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])) { @@ -389,7 +389,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private Style updateImageLayout(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Layout"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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])) { @@ -405,7 +405,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private Style updateTextRotation(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))) { if (this.textRotationComboBox.getSelectedIndex() != 0) { style = style.deriveVerticalText(Style.VERTICALTEXT); style = style.deriveRotation(0); @@ -419,21 +419,21 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } private Style updateOther(Style style) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Left_Indent"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"))) { style = style.derivePaddingLeft(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.leftIndentSpinner.getValue()))); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Right_Indent"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"))) { style = style.derivePaddingRight(indentationUnitProcessor.paddingUnitGainFromSpinner((int) (this.rightIndentSpinner.getValue()))); } //间距 - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_Before"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"))) { style = style.deriveSpacingBefore((int) (this.spaceBeforeSpinner.getValue())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Spacing_After"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After"))) { style = style.deriveSpacingAfter((int) (this.spaceAfterSpinner.getValue())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style_Line_Spacing"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing"))) { style = style.deriveLineSpacing((int) (this.lineSpaceSpinner.getValue())); } return style; @@ -462,4 +462,4 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO */ public void setGlobalName(String name) { } -} \ No newline at end of file +} 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 a0b4b243e3..3ad75044c2 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 @@ -1,11 +1,9 @@ package com.fr.design.gui.style; -import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.design.ExtraDesignClassManager; import com.fr.design.constants.LayoutConstants; import com.fr.design.fun.BackgroundQuickUIProvider; -import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.TableLayout; @@ -74,7 +72,7 @@ public class BackgroundPane extends AbstractBasicStylePane { double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill") + " ", SwingConstants.LEFT),typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill") + " ", SwingConstants.LEFT),typeComboBox}, new Component[]{null, centerPane} }; double[] rowSize = {p, p, p}; @@ -133,7 +131,7 @@ public class BackgroundPane extends AbstractBasicStylePane { * @return 名称 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f1aa26093c..ce3940bf2a 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 @@ -18,8 +18,6 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; 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.stable.Constants; import com.fr.stable.CoreConstants; @@ -78,14 +76,14 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Style") + " ", SwingConstants.LEFT), currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style") + " ", SwingConstants.LEFT), currentLineCombo}, new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + " ", SwingConstants.LEFT), currentLineColorPane}, new Component[]{null, null}, - 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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Out_Border") + " ", 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(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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_In_Border") + " ", 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 +91,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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border"), 280, 24, panel); + borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel); this.add(borderPanel, BorderLayout.NORTH); backgroundPane = new BackgroundPane(); - backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), 280, 24, backgroundPane); + backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundPane); this.add(backgroundPanel, BorderLayout.CENTER); initAllNames(); outerToggleButton.addChangeListener(outerToggleButtonChangeListener); @@ -150,7 +148,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"); } @Override @@ -252,4 +250,4 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse public void setGlobalName(String name) { } -} \ No newline at end of file +} 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 feed40bd33..39d1f64e2b 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 @@ -43,7 +43,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 = {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 final String[] fontSizeStyles = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Plain"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bolditalic")}; private JPanel buttonPane; private JPanel isSuperOrSubPane; private UIComboBox fontNameComboBox; @@ -83,7 +83,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_FRFont"); } /** @@ -133,20 +133,20 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse */ public FRFont update(FRFont frFont) { - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name"))) { frFont = frFont.applyName((String) fontNameComboBox.getSelectedItem()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style"))) { frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex()); } if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"))) { frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString())); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground"))) { frFont = frFont.applyForeground(this.colorSelectPane.getColor()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline"))) { int line = underline.isSelected() ? this.underlineCombo.getSelectedLineStyle() : Constants.LINE_NONE; frFont = frFont.applyUnderline(line); @@ -157,10 +157,10 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough"))) { frFont = frFont.applyStrikethrough(isStrikethroughCheckBox.isSelected()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow"))) { frFont = frFont.applyShadow(isShadowCheckBox.isSelected()); } @@ -178,7 +178,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(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript"))) { //如果上标没有选中,点击则选中上标，并且下标一定是不选中状态 //如果上标选中，点击则取消选中上标，字体回复正常 if (superPane.isSelected() && !isSuper) { @@ -189,7 +189,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse frFont = frFont.applySuperscript(false); } } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Subscript"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript"))) { if (subPane.isSelected() && !isSub) { frFont = frFont.applySubscript(true); frFont = frFont.applySuperscript(false); @@ -264,29 +264,29 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse } private void initAllNames() { - fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style")); - fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name")); + fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Style")); + fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name")); fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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")); + colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground")); + italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic")); + bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold")); + underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline")); underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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")); + isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough")); + isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow")); + superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript")); + subPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Subscript")); } private void setToolTips() { - 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")); + colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Foreground")); + italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Italic")); + bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Bold")); + underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Underline")); + isStrikethroughCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Strikethrough")); + isShadowCheckBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Shadow")); + superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_Superscript")); + subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FR_Font_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 f32adb9376..795c6d455a 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 @@ -108,7 +108,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs frFontPane = new FRFontPane(); - UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont"), SwingConstants.LEFT); + UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT); JPanel fontPane = new JPanel(new BorderLayout()); fontPane.add(font, BorderLayout.NORTH); @@ -197,7 +197,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 e10e8f8cef..ab210acd58 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 @@ -9,6 +9,17 @@ */ package com.fr.design.gui.syntax.ui.rsyntaxtextarea; +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 javax.swing.JComponent; +import javax.swing.ToolTipManager; +import javax.swing.UIManager; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.text.BadLocationException; import java.awt.Color; import java.awt.Component; import java.awt.Cursor; @@ -24,18 +35,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ResourceBundle; -import javax.swing.JComponent; -import javax.swing.ToolTipManager; -import javax.swing.UIManager; -import javax.swing.event.CaretEvent; -import javax.swing.event.CaretListener; -import javax.swing.text.BadLocationException; - -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; @@ -288,7 +287,7 @@ public class ErrorStrip extends JComponent { String text = null; int line = yToLine(e.getY()); if (line>-1) { - text = com.fr.design.i18n.Toolkit.i18nText("Line"); + text = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line"); text = MessageFormat.format(text, Integer.valueOf(line+1)); } return text; @@ -674,7 +673,7 @@ public class ErrorStrip extends JComponent { try { String word = textArea.getText(range.getStartOffset(), getLength()); - text = com.fr.design.i18n.Toolkit.i18nText("OccurrenceOf"); + text = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_OccurrenceOf"); text = MessageFormat.format(text, word); } catch (BadLocationException ble) { UIManager.getLookAndFeel().provideErrorFeedback(textArea); @@ -765,7 +764,7 @@ public class ErrorStrip extends JComponent { } else { // > 1 StringBuilder sb = new StringBuilder(""); - sb.append(com.fr.design.i18n.Toolkit.i18nText("MultipleMarkers")); + sb.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Markers")); sb.append("
"); for (int i=0; i extends BasicB } }); JPanel targetFramePanel = new JPanel(); - targetFramePanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Link_Opened_in"))); + targetFramePanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ": ")); + newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ": ")); heightTextFiled = new UINumberField(); heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); heightTextFiled.setPreferredSize(new Dimension(40, 20)); newWindowConfPane.add(heightTextFiled); - newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ": ")); + newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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[]{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")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_New_Window"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Dialog"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Self_Window")}; } protected abstract JPanel setHeaderPanel(); @@ -142,4 +142,4 @@ public abstract class AbstractHyperNorthPane extends BasicB link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); } -} \ No newline at end of file +} 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 3e9d65c357..d35c70a822 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 @@ -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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), BorderLayout.NORTH); + headerPane.add(GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH); headerPane.add(urlWithHelp, BorderLayout.CENTER); } else { headerPane.add(urlWithHelp, BorderLayout.NORTH); @@ -106,4 +105,4 @@ public class WebHyperNorthPane extends AbstractHyperNorthPane { return new JPanel(); } -} \ No newline at end of file +} 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 adc49ec850..89663ba7a5 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 @@ -42,16 +42,16 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { parameterViewPane = new ReportletParameterViewPane(getChartParaType(), getValueEditorPane(), getValueEditorPane()); this.add(parameterViewPane, BorderLayout.CENTER); - parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameters"), null)); + parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"), null)); - 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")); + useCJKCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Use_CJK_To_Encode_Parameter")); + extendParametersCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters")); this.add(GUICoreUtils.createFlowPane(new Component[]{useCJKCheckBox, extendParametersCheckBox}, FlowLayout.LEFT), BorderLayout.SOUTH); } @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"); } @Override @@ -125,4 +125,4 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { public void setExtendParametersCheckBox(UICheckBox extendParametersCheckBox) { this.extendParametersCheckBox = extendParametersCheckBox; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java new file mode 100644 index 0000000000..176d6ec3c1 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java @@ -0,0 +1,71 @@ +package com.fr.design.i18n; + +import com.fr.general.GeneralContext; +import com.fr.general.log.MessageFormatter; +import com.fr.locale.DesignI18nProvider; +import com.fr.locale.InterProviderFactory; +import com.fr.locale.LocaleBundle; +import com.fr.locale.LocaleFiles; +import com.fr.locale.LocaleManager; +import com.fr.locale.impl.FineLocaleManager; + +import java.util.List; +import java.util.Locale; + +public class DesignI18nImpl implements DesignI18nProvider { + + private static DesignI18nImpl instance = new DesignI18nImpl(); + + public static DesignI18nImpl getInstance() { + return instance; + } + + private LocaleManager localeManager = FineLocaleManager.create(); + + private DesignI18nImpl() { + addResource("com/fr/design/i18n/main"); + InterProviderFactory.registerDesignI18nProvider(this); + } + + @Override + public String i18nText(String key) { + return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key); + } + + @Override + public String i18nText(String key, Object... args) { + String format = this.i18nText(key); + MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args); + return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage()); + } + + @Override + public void addResource(String path) { + localeManager.addResource(path); + } + + @Override + public void removeResource(String path) { + localeManager.removeResource(path); + } + + @Override + public LocaleBundle getLocalBundle(Locale locale) { + return localeManager.getLocalBundle(locale); + } + + @Override + public List getReverseList() { + return localeManager.getReverseList(); + } + + @Override + public List getList() { + return localeManager.getList(); + } + + @Override + public void clear() { + localeManager.clear(); + } +} 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 index 79bb37bb09..18a7074342 100644 --- a/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java +++ b/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java @@ -1,27 +1,12 @@ package com.fr.design.i18n; -import com.fr.general.GeneralContext; -import com.fr.general.log.MessageFormatter; import com.fr.locale.InterProviderFactory; -import com.fr.locale.LocaleManager; -import com.fr.locale.impl.FineLocaleManager; /** * 设计器国际化类，后面会不再依赖InterProviderFactory */ public class Toolkit { - private static LocaleManager localeManager = FineLocaleManager.create(); - - static { - addResource("com/fr/design/i18n/main"); - } - - public static void addResource(String path) { - - localeManager.addResource(path); - } - /** * 设计器国际化方法 * @@ -29,7 +14,7 @@ public class Toolkit { * @return 国际化值 */ public static String i18nText(String key) { - return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key); + return DesignI18nImpl.getInstance().i18nText(key); } /** @@ -41,9 +26,7 @@ public class Toolkit { * @return 国际化值 */ public static String i18nText(String key, Object... args) { - String format = InterProviderFactory.getProvider().getLocText(key); - MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args); - return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage()); + return DesignI18nImpl.getInstance().i18nText(key, args); } /** @@ -54,4 +37,14 @@ public class Toolkit { public static String i18nTextArray(String[] keys) { return InterProviderFactory.getProvider().getLocText(keys); } + + /** + * 兼容设计器里，插件管理的部分。 + * 下一个版本将会废弃。 + * + * @deprecated + */ + public static String i18nCompatibleServerText(String key) { + return InterProviderFactory.getProvider().getLocText(key); + } } 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 c25430f077..dbccb7c50c 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 @@ -94,7 +94,7 @@ public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane { tipsPane1 = new UILabel(); tipsPane1.setHorizontalAlignment(SwingConstants.RIGHT); tipsPane1.setForeground(Color.pink); - tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-tips")); + tipsPane2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Tips")); - UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-mailContent") + ":"); + UILabel mainTextLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Content") + ":"); 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(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - 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()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Bcc"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_EmailPane_Mail_Subject"), 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 : com.fr.design.i18n.Toolkit.i18nText("FR-Designer_EmailPane-warnings")); + tipsPane1.setText(valid ? StringUtils.BLANK : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Email_Sent_Email"); } /** @@ -151,4 +151,4 @@ public class EmailPane extends FurtherBasicBeanPane { return ob instanceof EmailJavaScript; } -} \ No newline at end of file +} 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 18904224ac..be8cd97411 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 @@ -1,32 +1,29 @@ package com.fr.design.javascript; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; - -import javax.swing.BorderFactory; - -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.Parameter; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; +import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; 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.js.FormSubmitJavaScript; import com.fr.stable.ParameterProvider; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.List; + public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane { - 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"); + public static final String ASYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Asynch"); + public static final String SYNCH = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_JavaScript_Synch"); private UITextField urlTextField; private UIComboBox asynComboBox; private ReportletParameterViewPane pViewPane; @@ -40,7 +37,7 @@ public class FormSubmitJavaScriptPane extends FurtherBasicBeanPane { * @return 返回按钮对象 */ public UIButton createCallButton() { - UIButton callButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function")); + UIButton callButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function")); callButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { final JavaScriptActionPane callPane = new JavaScriptActionPane() { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function"); } @Override @@ -152,7 +152,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Callback_Function"); } @Override @@ -180,7 +180,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 89d7d8cf72..23a33976b2 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 @@ -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), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"))); + parameterPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))); parameterPane.addTableEditorListener(new TableModelListener() { public void tableChanged(TableModelEvent e) { List list = parameterPane.update(); @@ -72,7 +72,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }); - OneListTableModel model = new OneListTableModel(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), this) { + OneListTableModel model = new OneListTableModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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), com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"))); + importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))); importedJsPane.setPreferredSize(new Dimension(265, 150)); jsPane = new JSContentPane(defaultArgs); - jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"))); + jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"); } /** @@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { itemNameTextField = new UITextField(); JPanel topPane = GUICoreUtils.createBorderLayoutPane( - GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Name") + ":"), BorderLayout.NORTH, + GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 e1147bd294..b5ed73850d 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 @@ -29,13 +29,13 @@ public class ParameterJavaScriptPane extends AbstractHyperLinkPane(); // 有序map // 单元格元素 - PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Element"), + PropertyItem cellElement = new PropertyItem(KEY_CELL_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell_Attributes"), + PropertyItem cellAttr = new PropertyItem(KEY_CELL_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Float_Element"), + PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"), + PropertyItem widgetSettings = new PropertyItem(KEY_WIDGET_SETTINGS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes"), + PropertyItem conditionAttr = new PropertyItem(KEY_CONDITION_ATTR, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"), + PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Library"), + PropertyItem widgetLib = new PropertyItem(KEY_WIDGET_LIB, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Library"), "widgetlib", new PropertyMode[]{PropertyMode.FORM}, new PropertyMode[]{PropertyMode.FORM}); // 权限编辑 - PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Permissions_Edition"), + PropertyItem authorityEdition = new PropertyItem(KEY_AUTHORITY_EDITION, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edition"), "authorityedit", new PropertyMode[]{PropertyMode.AUTHORITY_EDITION_DISABLED}, new PropertyMode[]{PropertyMode.AUTHORITY_EDITION}); // 已配置角色 - PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Configured_Roles"), + PropertyItem configuredRoles = new PropertyItem(KEY_CONFIGURED_ROLES, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); + defaultPane = getDefaultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No_Settings_Available")); } public void showDefaultPane() { @@ -1107,4 +1107,4 @@ public class EastRegionContainerPane extends UIEastResizableContainer { }); } } -} \ No newline at end of file +} 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 3ed4bba8a9..60b34a099d 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 @@ -134,7 +134,7 @@ public class JFormSliderPane extends JPanel { slider.setPreferredSize(new Dimension(220, 20)); //去掉虚线框 slider.setFocusable(false); - slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider")); + slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider")); } private void initShowValSpinner() { @@ -156,7 +156,7 @@ public class JFormSliderPane extends JPanel { }; downButton.setOpaque(false); downButton.setBorderPainted(false); - downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down")); + downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up")); + upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade")); + showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton")); + selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Self_Adapt_Button")); selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); - customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton")); + customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Custom_Button")); 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(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce")); + UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce")); upLabel.setOpaque(false); JPanel septPane = new JPanel(new BorderLayout()); JSeparator sept = new JSeparator(); @@ -445,4 +445,4 @@ class FormPopupPane extends JPopupMenu { } -} \ No newline at end of file +} 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 239a02f7f1..4c8f307d69 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 @@ -140,7 +140,7 @@ public class JSliderPane extends JPanel { slider.setPreferredSize(new Dimension(220, 20)); //去掉虚线框 slider.setFocusable(false); - slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Slider")); + slider.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Slider")); } private void initShowValSpinner() { @@ -163,7 +163,7 @@ public class JSliderPane extends JPanel { }; downButton.setOpaque(false); downButton.setBorderPainted(false); - downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Down")); + downButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Up")); + upButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_Grade")); + showValButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_selfAdaptButton")); + selfAdaptButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Self_Adapt_Button")); selfAdaptButton.setFont(new Font("SimSun", Font.PLAIN, FONT_SIZE)); - customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_customButton")); + customButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_Custom_Button")); 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(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Scale_EnlargeOrReduce")); + UILabel upLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce")); upLabel.setOpaque(false); JPanel septPane = new JPanel(new BorderLayout()); JSeparator sept = new JSeparator(); @@ -513,4 +513,4 @@ class PopupPane extends UIPopupMenu { public Insets getInsets() { return new Insets(INSERT_TOPBOTTOM, INSERT_LEFTRIGHT, INSERT_TOPBOTTOM, INSERT_LEFTRIGHT); } -} \ No newline at end of file +} 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 8718abaff9..bf4eb0d0c3 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 @@ -536,7 +536,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE); return false; } collectInfo(); @@ -586,7 +586,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Message"), JOptionPane.WARNING_MESSAGE); return false; } editingFILE = fileChooser.getSelectedFILE(); @@ -717,10 +717,10 @@ public abstract class JTemplate> */ @Override public MenuDef[] menus4Target() { - MenuDef tplMenu = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template"), 'T'); + MenuDef tplMenu = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template"), 'T'); tplMenu.setAnchor(MenuHandler.TEMPLATE); if (!DesignerMode.isAuthorityEditing()) { - tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WorkBook"))); + tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_WorkBook"))); tplMenu.addShortCut(new TableDataSourceAction(this)); tplMenu.addShortCut(shortcut4TemplateMenu()); } @@ -866,9 +866,9 @@ public abstract class JTemplate> public boolean isNewDesigner() { String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); if (isLowerThanHBB(xmlDesignerVersion)) { - 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(); + String info = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open-New_Form_Tip"); + String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info"); + new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show(); return true; } return false; @@ -883,8 +883,8 @@ public abstract class JTemplate> String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); if (isHigherThanCurrent(xmlDesignerVersion)) { String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(); + String moreInfo = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Version_Tip_More_Info"); + new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).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 4b2b6445c1..4577f5a0b3 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 @@ -40,7 +40,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { private JPanel createTextPane() { JPanel panel = new JPanel(new BorderLayout()); - UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("not_support_authority_edit")); + UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 697a7b3ab3..452c876ff9 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 @@ -108,7 +108,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(com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace")); + editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace")); this.add(new UILabel(" "), BorderLayout.WEST); this.add(editButton, BorderLayout.EAST); editButton.addActionListener(new ActionListener() { @@ -170,7 +170,7 @@ public class TemplatePane extends JPanel implements MouseListener { null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } catch (RegistEditionException e) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } catch (Exception exception) { FineLoggerFactory.getLogger().error(exception.getMessage(), exception); 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 62cfb7fd09..92de00dbcb 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 @@ -1,7 +1,6 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.vcs.DesignerMode; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; @@ -44,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(), 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); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Undo_All_Authority_Operations") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 93999b3eaa..8309a802d2 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 @@ -84,7 +84,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane { * @return 同上 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 cfa9f0b75f..09be6771cf 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 @@ -39,7 +39,7 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { } private void constructPane(){ - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction")), directionPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } @Override @@ -134,4 +134,4 @@ public class GradientBackgroundQuickPane extends BackgroundQuickPane { } } -} \ No newline at end of file +} 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 fcc1f53606..7f794b708b 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 @@ -64,7 +64,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { this.add(contentPane, BorderLayout.CENTER); - UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Select_Picture")); selectPictureButton.addActionListener(selectPictureActionListener); if (hasImageLayout) { 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 2de084a7eb..6b9882397f 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 @@ -60,7 +60,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre public void paintComponent(Graphics g) { super.paintComponent(g); if (isLoading) { - g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); return; } // draw image. 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 461a2e1542..d965151cb8 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 @@ -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(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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"); } @Override @@ -222,4 +222,4 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { foregroundColorPane.setSelectObject(null); backgroundColorPane.setSelectObject(null); } -} \ No newline at end of file +} 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 d861d80bed..877a322cb8 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 @@ -38,6 +38,7 @@ public class DesignerLogHandler { protected static final int INFO_INT = Level.INFO.toInt(); protected static final int ERROR_INT = Level.ERROR.toInt(); protected static final int WARN_INT = Level.WARN.toInt(); + protected static final int DEBUG_INT = Level.DEBUG.toInt(); private static final int GAP_X = -150; private static final int INFO_GAP_Y = -60; private static final int ERRO_GAP_Y = -40; @@ -60,7 +61,7 @@ public class DesignerLogHandler { public DesignerLogHandler() { logHandlerArea = new LogHandlerArea(); - caption = new LogHandlerBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Log")); + caption = new LogHandlerBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log")); caption.addClearListener(new ActionListener() { @@ -148,17 +149,17 @@ public class DesignerLogHandler { jTextArea.setBackground(Color.WHITE); popup = new JPopupMenu(); - selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All")); + selectAll = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_All")); selectAll.addActionListener(popupListener); selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png")); popup.add(selectAll); - copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Copy")); + copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy")); copy.addActionListener(popupListener); copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); popup.add(copy); - clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All")); + clear = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear_All")); clear.addActionListener(popupListener); clear.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/clear.png")); popup.add(clear); @@ -209,12 +210,15 @@ public class DesignerLogHandler { public void printStackTrace(String message, Level level, Date date) { int intLevel = level.toInt(); + int logLevel = Log4jConfig.getInstance().getRootLevel().toInt(); if (intLevel == INFO_INT && showInfo.isSelected()) { printMessage(message, intLevel, date); } else if (intLevel == ERROR_INT && showError.isSelected()) { printMessage(message, intLevel, date); } else if (intLevel == WARN_INT && showServer.isSelected()) { printMessage(message, intLevel, date); + } else if (intLevel == DEBUG_INT && logLevel == DEBUG_INT){ + printMessage(message, intLevel, date); } } @@ -263,11 +267,11 @@ public class DesignerLogHandler { private String appendLocaleMark(String str, int style) { if (style == ERROR_INT) { - str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":" + str + "\n"; } else if (style == WARN_INT) { - str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Seriously") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n"; } else { - str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Normal") + ":" + str + "\n"; + str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 9eb7a69919..ddb16de04c 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 @@ -3,8 +3,6 @@ package com.fr.design.mainframe.loghandler; import com.fr.base.BaseUtils; import com.fr.design.gui.ibutton.UIButton; -import com.fr.stable.script.Atom; - import javax.swing.*; import java.awt.*; import java.awt.event.ActionListener; @@ -39,17 +37,17 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { clear.setMargin(null); clear.setOpaque(false); clear.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - clear.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Clear_All")); + clear.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_All")); + selectedall.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); + set.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set")); this.add(clear); this.add(selectedall); @@ -183,4 +181,4 @@ public class LogHandlerBar extends JPanel implements ItemSelectable { private static final int SET_OFFSET = 70; } -} \ No newline at end of file +} 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 4c16af9330..5a4ba1edaf 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 @@ -100,9 +100,9 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus g.drawString(button.getText(), textLeadingGap, 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); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); } /** @@ -155,4 +155,4 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus */ public void focusGained(FocusEvent e) { } -} \ No newline at end of file +} 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 dd76e2a714..73f9ce9bdf 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 @@ -56,7 +56,7 @@ public class LogMessageBar extends JPanel { if (message == null) { return; } - messageLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Log") + " | " + message); + messageLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f75b9c1960..4f7920d1e9 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 @@ -10,9 +10,12 @@ import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; import com.fr.design.actions.community.BBSAction; import com.fr.design.actions.community.BugAction; +import com.fr.design.actions.community.CenterAction; +import com.fr.design.actions.community.CusDemandAction; import com.fr.design.actions.community.NeedAction; import com.fr.design.actions.community.QuestionAction; import com.fr.design.actions.community.SignAction; +import com.fr.design.actions.community.TechSolutionAction; import com.fr.design.actions.community.UpAction; import com.fr.design.actions.community.VideoAction; import com.fr.design.actions.file.CloseCurrentTemplateAction; @@ -47,6 +50,7 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; +import com.fr.design.onlineupdate.actions.SoftwareUpdateAction; import com.fr.design.remote.action.RemoteDesignAuthorityManagerAction; import com.fr.design.utils.ThemeUtils; import com.fr.general.ComparatorUtils; @@ -334,7 +338,7 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.FILE); return menuDef; } - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F'); ShortCut[] scs = new ShortCut[0]; if (!DesignerMode.isAuthorityEditing()) { @@ -408,7 +412,7 @@ public abstract class ToolBarMenuDock { } protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Server"), 'S'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic__M_Server"), 'S'); if (!DesignerMode.isAuthorityEditing()) { menuDef.addShortCut( @@ -469,6 +473,10 @@ public abstract class ToolBarMenuDock { shortCuts.add(new VideoAction()); shortCuts.add(new TutorialAction()); } + //远程不使用更新升级 +// if(WorkContext.getCurrent().isLocal()) { +// shortCuts.add(new SoftwareUpdateAction()); +// } if (AlphaFineConfigManager.isALPHALicAvailable()) { shortCuts.add(new AlphaFineAction()); } @@ -488,15 +496,17 @@ public abstract class ToolBarMenuDock { shortCuts.add(new VideoAction()); shortCuts.add(new TutorialAction()); shortCuts.add(new QuestionAction()); - shortCuts.add(new UpAction()); - shortCuts.add(new NeedAction()); + shortCuts.add(new TechSolutionAction()); shortCuts.add(new BugAction()); + shortCuts.add(new NeedAction()); + shortCuts.add(new CusDemandAction()); + shortCuts.add(new CenterAction()); shortCuts.add(new SignAction()); return shortCuts.toArray(new ShortCut[shortCuts.size()]); } public MenuDef createHelpMenuDef() { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help"), 'H'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); for (ShortCut shortCut : otherHelpShortCuts) { menuDef.addShortCut(shortCut); @@ -506,7 +516,7 @@ public abstract class ToolBarMenuDock { } public MenuDef createCommunityMenuDef() { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY"), 'C'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); for (ShortCut shortCut : otherCommunityShortCuts) { menuDef.addShortCut(shortCut); @@ -548,7 +558,7 @@ public abstract class ToolBarMenuDock { return toolBar; } else { - return polyToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Polyblock_Edit")); + return polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Polyblock_Edit")); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java index 34fed3a86b..863a5d6a19 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java @@ -1,6 +1,5 @@ package com.fr.design.mainframe.toolbar; -import com.fr.base.BaseUtils; import com.fr.base.vcs.DesignerMode; import com.fr.design.actions.edit.RedoAction; import com.fr.design.actions.edit.UndoAction; @@ -18,7 +17,7 @@ import com.fr.stable.ArrayUtils; public class VcsScene { public static MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F'); ShortCut[] scs = new ShortCut[0]; if (!ArrayUtils.isEmpty(scs)) { 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 e821f34524..d675aceb22 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 @@ -56,14 +56,14 @@ public class BasicPropertyPane extends BasicPane { } } }; - widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Name")), widgetName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 7405eaf5f2..fdd6cbb32c 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 790841dea9..018bc75aeb 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 @@ -15,7 +15,6 @@ import com.fr.data.TableDataSource; import com.fr.design.data.datapane.TableDataComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; 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; @@ -58,7 +57,7 @@ public class DataBindingEditor extends Editor { public DataBindingEditor() { this.initCompontents(); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Field")); } @@ -148,4 +147,4 @@ public class DataBindingEditor extends Editor { public String getIconName() { return "bind_ds_column"; } -} \ No newline at end of file +} 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 0e506490dd..d64cd4105a 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 @@ -70,7 +70,7 @@ public class FormattedEditor extends AbstractPropertyEditor { try { format.parseObject(textField.getText()); } catch (ParseException ex) { - throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Format-Error") + "!"); + throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 30307a4b2d..4f5c7f28f3 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 @@ -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, com.fr.design.i18n.Toolkit.i18nText("Date")); + return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 1f88ee7d90..599e16a081 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 @@ -25,17 +25,17 @@ public class BackgroundWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v instanceof ColorBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"); } else if (v instanceof TextureBackground) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"); } else if (v instanceof PatternBackground) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"); } else if (v instanceof ImageFileBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); } else if (v instanceof GradientBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } else { - return com.fr.design.i18n.Toolkit.i18nText("None"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_None"); } } @@ -47,4 +47,4 @@ public class BackgroundWrapper implements Encoder, Decoder { @Override public void validate(String txt) throws ValidationException { } -} \ No newline at end of file +} 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 d0c38fe922..8a2489407c 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 @@ -18,14 +18,14 @@ public class TreeModelWrapper implements Encoder, Decoder { return StringUtils.EMPTY; } if (v instanceof TreeNodeAttr[]) { - return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""}); + return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Total_N_Grade"), new String[]{"N"}, new String[]{((TreeNodeAttr[]) v).length + ""}); } else if (v instanceof TreeNodeWrapper) { TreeNodeAttr[] treeNodeAttrs = ((TreeNodeWrapper) v).getTreeNodeAttrs(); - return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""}); + return TemplateUtils.render(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Total_N_Grade"), new String[]{"N"}, new String[]{treeNodeAttrs.length + ""}); } else if (v instanceof NameObject) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DataTable-Build"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DataTable_Build"); } else { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto-Build"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 15c03e3203..f220b46a0b 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 @@ -29,7 +29,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-Open_Report"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Open_Report"); } @Override @@ -47,7 +47,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-Open_Recent"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Open_Recent"); } @Override @@ -64,7 +64,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Close"); } @Override @@ -81,7 +81,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Save"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"); } @Override @@ -98,7 +98,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-Save_As"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Save_As"); } @Override @@ -115,7 +115,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Undo"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Undo"); } @Override @@ -132,7 +132,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Redo"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Redo"); } @Override @@ -149,7 +149,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export"); } @Override @@ -166,7 +166,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Excel"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_Excel"); } @Override @@ -184,7 +184,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-Page"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Export_Excel_Page"); } @Override @@ -202,7 +202,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-Simple"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Export_Excel_Simple"); } @Override @@ -220,7 +220,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Excel-PageToSheet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Export_Excel_PageToSheet"); } @Override @@ -237,7 +237,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-PDF"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_PDF"); } @Override @@ -255,7 +255,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Word"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_Word"); } @Override @@ -273,7 +273,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-SVG"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_SVG"); } @Override @@ -291,7 +291,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-CSV"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_CSV"); } @Override @@ -309,7 +309,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-Export-Text"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_Export_Text"); } @Override @@ -327,7 +327,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_File-ExportT-Template(embedded_data)"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_File_ExportT_Template(embedded_data)"); } @Override @@ -345,7 +345,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Window-Preference"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Window_Preference"); } @Override @@ -362,7 +362,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-SwitchWorkspace"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Switch_Workspace"); } @Override @@ -379,7 +379,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Exit"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit"); } @Override @@ -397,7 +397,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Template"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Template"); } @Override @@ -415,7 +415,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData"); } @Override @@ -432,7 +432,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Report-Web_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Web_Attributes"); } @Override @@ -450,7 +450,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"); } @Override @@ -467,7 +467,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Report_Report_Parameter"); } @Override @@ -485,7 +485,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-Page_Setup"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Page_Setup"); } @Override @@ -502,7 +502,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Header"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Report_Report_Header"); } @Override @@ -519,7 +519,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Footer"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Report_Report_Footer"); } @Override @@ -551,7 +551,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"); } @Override @@ -569,7 +569,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Report-Write_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Write_Attributes"); } @Override @@ -586,7 +586,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Report-Report_Columns"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Report_Report_Columns"); } @Override @@ -603,7 +603,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ReportColumns-Columns"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportColumns_Columns"); } @Override @@ -621,7 +621,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_M-Repeat-Freeze"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Repeat_Freeze"); } @Override @@ -639,7 +639,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Frozen"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Frozen"); } @Override @@ -691,7 +691,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"); } @Override @@ -708,7 +708,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Expand"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Expand"); } @Override @@ -725,7 +725,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Settings"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings_Duplicate"); } @Override @@ -742,7 +742,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Format-Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Format_Style"); } @Override @@ -759,7 +759,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"); } @Override @@ -776,7 +776,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } @Override @@ -793,7 +793,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Format-Data_Map"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Format_Data_Map"); } @Override @@ -810,7 +810,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"); } @Override @@ -827,7 +827,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Insert_Barcode"); } @Override @@ -844,7 +844,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Currency_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"); } @Override @@ -862,7 +862,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_No_Present"); } @Override @@ -896,7 +896,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Merge_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Merge_Cell"); } @Override @@ -913,7 +913,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Edit-Unmerge_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Unmerge_Cell"); } @Override @@ -930,7 +930,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"); } @Override @@ -947,7 +947,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Insert_Cell"); } @Override @@ -964,7 +964,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Data_Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Insert_Data_Column"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java b/designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java new file mode 100644 index 0000000000..d076cc01e0 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java @@ -0,0 +1,118 @@ +package com.fr.design.onlineupdate.actions; + +import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.locale.InterProviderFactory; +import com.fr.log.FineLoggerFactory; +import com.fr.design.onlineupdate.domain.DownloadItem; +import com.fr.stable.ArrayUtils; +import com.fr.stable.StableUtils; + +import javax.swing.JOptionPane; +import javax.swing.SwingWorker; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.concurrent.ExecutionException; + +/** + * Created by XINZAI on 2018/8/21. + */ +public abstract class FileDownloader extends SwingWorker { + private static final int REPEAT_DOWNLOAD_TIMES = 3; + private DownloadItem[] files; + private String saveDir; + //已经完成的大小 + private long completeSize; + + public FileDownloader(DownloadItem[] files, String saveDir) { + this.files = files; + this.saveDir = saveDir; + } + + @Override + protected Boolean doInBackground() throws Exception { + if (ArrayUtils.isNotEmpty(files)) { + setCompleteSize(0L); + for (DownloadItem item : files) { + for (int i = 0; i < REPEAT_DOWNLOAD_TIMES; i++) { + item.setTotalLength(0); + item.setDownloadLength(0); + download(item); + if (item.getTotalLength() == item.getDownloadLength()) { + break; + } + } + if (item.getTotalLength() != item.getDownloadLength()) { + JOptionPane.showMessageDialog(null, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Download_Failed"), + InterProviderFactory.getProvider().getLocText("Fine-Design_Updater_Alert"), JOptionPane.ERROR_MESSAGE); + return false; + } else { + item.setDownloadLength(0); + completeSize += item.getTotalLength(); + } + } + } + return true; + } + + @Override + protected void done() { + boolean success = false; + try { + success = get(); + } catch (InterruptedException e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } catch (ExecutionException e) { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + if (success) { + onDownloadSuccess(); + } else { + onDownloadFailed(); + } + } + + private void download(DownloadItem item) throws Exception { + URL url = new URL(item.getUrl()); + URLConnection connection = url.openConnection(); + int total = connection.getContentLength(); + item.setTotalLength(total); + InputStream reader = connection.getInputStream(); + File tempFile = new File(StableUtils.pathJoin(saveDir, item.getName())); + StableUtils.makesureFileExist(tempFile); + FileOutputStream writer = new FileOutputStream(tempFile); + byte[] buffer = new byte[UpdateConstants.BYTE]; + int bytesRead = 0; + int totalBytesRead = 0; + while ((bytesRead = reader.read(buffer)) != -1) { + writer.write(buffer, 0, bytesRead); + buffer = new byte[UpdateConstants.BYTE]; + totalBytesRead += bytesRead; + item.setDownloadLength(totalBytesRead); + publish(item); + } + reader.close(); + writer.close(); + } + + /** + * 下载成功 + */ + public abstract void onDownloadSuccess(); + + /** + * 下载失败 + */ + public abstract void onDownloadFailed(); + + public long getCompleteSize() { + return completeSize; + } + + public void setCompleteSize(long completeSize) { + this.completeSize = completeSize; + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java b/designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java new file mode 100644 index 0000000000..1b14f5f0b0 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java @@ -0,0 +1,34 @@ +package com.fr.design.onlineupdate.actions; + +import com.fr.base.BaseUtils; +import com.fr.design.actions.UpdateAction; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.onlineupdate.ui.dialog.UpdateMainDialog; +import com.fr.locale.InterProviderFactory; + +import java.awt.event.ActionEvent; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class SoftwareUpdateAction extends UpdateAction { + + + public SoftwareUpdateAction() { + setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade")); + setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/update/update_new.png")); + + } + + /** + * 事件响应 + * + * @param e 事件 + */ + @Override + public void actionPerformed(ActionEvent e) { + UpdateMainDialog dialog = new UpdateMainDialog(DesignerContext.getDesignerFrame()); + dialog.showDialog(); + } +} + diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java new file mode 100644 index 0000000000..6871190aab --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java @@ -0,0 +1,102 @@ +package com.fr.design.onlineupdate.domain; + +import com.fr.general.ComparatorUtils; +import com.fr.json.JSONObject; + +import java.util.Date; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class DownloadItem { + + //显示为百分比 + private static final int PERCENTAGE_RATIO = 100; + //显示kB + private static final int BYTETOKB_RATIO = 1000; + + private String name; + private String url; + private long size; + + private int totalLength; + private int downloadLength; + + public DownloadItem(JSONObject json) { + this(json.optString("name"), json.optString("url"), json.optLong("size")); + } + + public DownloadItem(String name, String url, long size) { + this.name = name; + this.url = url; + this.size = size; + } + + public String getName() { + return name; + } + + public String getUrl() { + return url + "?v=" + new Date().getTime(); + } + + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public int getTotalLength() { + return totalLength; + } + + public int getDownloadLength() { + return downloadLength; + } + + public void setTotalLength(int totalLength) { + this.totalLength = totalLength; + } + + public void setDownloadLength(int downloadLength) { + this.downloadLength = downloadLength; + } + + public int getProgressValue() { + return (int) ((downloadLength / (double) totalLength) * PERCENTAGE_RATIO); + } + + public String getProgressString() { + return downloadLength / BYTETOKB_RATIO + "KB/" + totalLength / BYTETOKB_RATIO + "KB"; + } + + /** + * 转化为字符串 + * + * @return 字符串 + */ + @Override + public String toString() { + return "name:" + name + ";download:" + getProgressString(); + } + + @Override + public boolean equals(Object obj) { + return obj instanceof DownloadItem + && ComparatorUtils.equals(((DownloadItem) obj).name, name) + && ComparatorUtils.equals(((DownloadItem) obj).url, url); + } + + /** + * 返回一个hash码 + * + * @return hash码 + */ + @Override + public int hashCode() { + return name.hashCode(); + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java new file mode 100644 index 0000000000..c132dcc03f --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java @@ -0,0 +1,56 @@ +package com.fr.design.onlineupdate.domain; + +/** + * Created by XINZAI on 2018/8/21. + */ + +import java.awt.Color; + +/** + * 更新升级的常量 + */ +public interface UpdateConstants { + + String APPS_FOLDER_NAME = "webapps"; + + int CONNECTION_TIMEOUT = 1000 * 5; + Color BAR_COLOR = new Color(0x3384F0); + + String CHANGELOG_X_START = "2018-07-11"; + + String DEFAULT_APP_NAME = "FineReport"; + String DOWNLOAD_DIR = "update"; + String DESIGNER_BACKUP_DIR = "designerbackup"; + + String UPDATE_CACHE_CONFIG_X = "updateCacheConfig10"; + String UPDATE_CACHE_INFO_X = "updateCacheInfo10"; + + + int BYTE = 153600; + + String[] JARS_FOR_SERVER_X = new String[]{ + "fine-activator-10.0.jar", + "fine-core-10.0.jar", + "fine-report-engine-10.0.jar", + "fine-decision-10.0.jar", + "fine-decision-report-10.0.jar", + "fine-schedule-10.0.jar", + "fine-schedule-report-10.0.jar", + "fine-swift-log-adaptor-10.0.jar", + "fine-webui-10.0.jar", + "fine-datasource-10.0.jar", + "fine-third-10.0.jar", + "fine-accumulator-10.0.jar" + }; + + String[] JARS_FOR_DESIGNER_X = new String[]{ + "fine-report-designer-10.0.jar", + "aspectjrt.jar" + }; + + + String[] LOG_TYPE = new String[]{ + "REPORT", "MOBILE", "CHART", "PFC", "BI" + }; + +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java new file mode 100644 index 0000000000..7895c69138 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java @@ -0,0 +1,41 @@ +package com.fr.design.onlineupdate.domain; + +import com.fr.log.FineLoggerFactory; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Properties; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateInfoCachePropertyManager { + private Properties prop; + private String filePath; + + public UpdateInfoCachePropertyManager(String filePath) { + this.filePath = filePath; + prop = new Properties(); + try { + prop.load(new FileInputStream(filePath)); + } catch (Exception ignored) { + + } + } + + public void updateProperty(String keyName, String keyValue) { + try { + OutputStream fos = new FileOutputStream(filePath); + prop.setProperty(keyName, keyValue); + prop.store(fos, null); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + + public String readProperty(String keyName) { + return prop.getProperty(keyName); + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java b/designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java new file mode 100644 index 0000000000..9d929c095e --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java @@ -0,0 +1,132 @@ +package com.fr.design.onlineupdate.factory; + +import com.fr.log.FineLoggerFactory; +import com.fr.stable.ArrayUtils; +import com.fr.stable.StableUtils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Arrays; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class DirectoryOperationFactory { + /** + * 新建一个目录 + * + * @param dirPath 目录路径 + */ + public static void createNewDirectory(String dirPath) { + try { + File newDirPath = new File(dirPath); + if (!newDirPath.exists()) { + StableUtils.mkdirs(newDirPath); + } + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + + /** + * 删除目录 + * + * @param dirPath 目录路径 + */ + public static void deleteDirectory(String dirPath) { + try { + File dir = new File(dirPath); + if (dir.isDirectory()) { + File[] file = dir.listFiles(); + for (File fileTemp : file) { + deleteDirectory(fileTemp.toString()); + fileTemp.delete(); + } + } else { + dir.delete(); + } + dir.delete(); + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + + /** + * 复制目录 + * + * @param oldDirPath 被复制目录 + * @param newDirPath 新目录 + */ + public static void copyDirectory(String oldDirPath, String newDirPath) { + File oldDir = new File(oldDirPath); + if (oldDir.isDirectory()) { + StableUtils.mkdirs(new File(newDirPath)); + File[] files = oldDir.listFiles(); + for (File fileTemp : files) { + copyDirectory(fileTemp.toString(), newDirPath + "/" + fileTemp.getName()); + } + } else { + try { + copy(oldDirPath, newDirPath); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + } + + private static void copy(String path1, String path2) throws IOException { + DataInputStream in = new DataInputStream(new BufferedInputStream(new FileInputStream(path1))); + DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path2))); + byte[] date = new byte[in.available()]; + + in.read(date); + out.write(date); + + in.close(); + out.close(); + } + + /** + * 移动目录 + * + * @param oldDirPath 被移动目录 + * @param newDirPath 新目录 + */ + public static void moveDirectory(String oldDirPath, String newDirPath) { + copyDirectory(oldDirPath, newDirPath); + deleteDirectory(oldDirPath); + } + + /** + * 列出过滤后的文件 + * + * @param installHome 安装目录 + * @param backupdir 备份目录 + * @return String数组 + */ + public static String[] listFilteredFiles(String installHome, String backupdir) { + File backupDir = new File(StableUtils.pathJoin(installHome, backupdir)); + StableUtils.mkdirs(backupDir); + File[] fileNames = backupDir.listFiles(new FileFilter() { + @Override + public boolean accept(File pathname) { + return pathname.isDirectory(); + } + }); + String[] jarFileName = new String[fileNames.length]; + int j = 0; + for (File fileName : fileNames) { + if ((fileName.isDirectory()) && (ArrayUtils.getLength(fileName.listFiles()) > 0)) {//判断备份文件夹中是否为空，为空不显示 + jarFileName[j++] = fileName.getName(); + } + } + return Arrays.copyOf(jarFileName, j); + } +} diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java new file mode 100644 index 0000000000..c316311ab7 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java @@ -0,0 +1,122 @@ +package com.fr.design.onlineupdate.ui.dialog; + +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.design.onlineupdate.factory.DirectoryOperationFactory; +import com.fr.design.onlineupdate.ui.widget.ColorfulCellRender; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.locale.InterProviderFactory; +import com.fr.stable.ArrayUtils; +import com.fr.stable.StableUtils; + +import javax.swing.BoxLayout; +import javax.swing.JDialog; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; +import java.awt.BorderLayout; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.Arrays; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class RestoreDialog extends JDialog { + private static final int LISTCELLHEIGHT = 30; + private static final Dimension RESTOREJAR = new Dimension(523, 480); + private static final Dimension RESTOREJAR_NORTHPANE = new Dimension(500, 392); + //一个页面上最少显示13个元素 + private static final int NUMOFCELL_LEAST = 13; + + private UIButton okButton; + private UIButton cancelButton; + private JPanel buttonPanel; + private String jarSelected; + + public RestoreDialog(Dialog parent, boolean modal) { + super(parent, modal); + initComponents(); + } + + public RestoreDialog(Frame parent, boolean modal) { + super(parent, modal); + initComponents(); + } + + private void initButton() { + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Ok")); + cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Cancel")); + + okButton.setEnabled(false); + okButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + RestoreResultDialog dialog = new RestoreResultDialog(DesignerContext.getDesignerFrame(), true, jarSelected); + dialog.showDialog(); + } + }); + cancelButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + } + + private void initComponents() { + + this.setResizable(false); + JPanel pane = FRGUIPaneFactory.createBorderLayout_L_Pane(); + this.setContentPane(pane); + + initButton(); + + buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); + buttonPanel.add(okButton); + buttonPanel.add(cancelButton); + pane.add(buttonPanel, BorderLayout.SOUTH); + + JPanel jarListPane = new JPanel(); + jarListPane.setLayout(new BoxLayout(jarListPane, BoxLayout.Y_AXIS)); + String[] jarBackupFiles = DirectoryOperationFactory.listFilteredFiles(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR); + + ArrayUtils.reverse(jarBackupFiles); + String[] jarFilesList = ((jarBackupFiles.length < NUMOFCELL_LEAST) ? Arrays.copyOf(jarBackupFiles, NUMOFCELL_LEAST) : jarBackupFiles); + final JList jarList = new JList(jarFilesList); + jarList.setFixedCellHeight(LISTCELLHEIGHT); + jarList.setCellRenderer(new ColorfulCellRender()); + jarList.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent e) { + super.mousePressed(e); + jarSelected = (String) jarList.getSelectedValue(); + okButton.setEnabled((jarSelected != null)); + } + }); + + JScrollPane jsp = new JScrollPane(jarList, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + jsp.setPreferredSize(RESTOREJAR_NORTHPANE); + pane.add(jsp, BorderLayout.NORTH); + + } + + /** + * 显示窗口 + */ + public void showDialog() { + this.setSize(RESTOREJAR); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Jar_Restore")); + GUICoreUtils.centerWindow(this); + this.setVisible(true); + } + +} diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java new file mode 100644 index 0000000000..787a88ea87 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java @@ -0,0 +1,182 @@ +package com.fr.design.onlineupdate.ui.dialog; + +import com.fr.base.FRContext; +import com.fr.design.RestartHelper; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.ComparatorUtils; +import com.fr.locale.InterProviderFactory; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; +import com.fr.stable.project.ProjectConstants; + +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import java.awt.BorderLayout; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class RestoreResultDialog extends JDialog { + private static final Dimension RESTORE = new Dimension(340, 100); + + private static final Dimension RESTORE_OLD_VERSION = new Dimension(340, 135); + + private String jarRestoreDir; + + public RestoreResultDialog(Dialog parent, boolean modal) { + super(parent, modal); + initCommonComponents(); + } + + public RestoreResultDialog(Frame parent, boolean modal, String jarDir) { + super(parent, modal); + this.jarRestoreDir = jarDir; + if (ComparatorUtils.equals(jarDir, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restore_Old_Version"))) { + initOldVersionRestoreComps(); + } else { + initCommonComponents(); + } + } + + private void initCommonComponents() { + this.setResizable(false); + JPanel pane = new JPanel(); + pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 5, 10)); + pane.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setContentPane(pane); + + UIButton restartButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restart_Designer")); + UIButton restartLaterButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restart_Later")); + + restartButton.setFont(new Font("Default", Font.PLAIN, 12)); + restartButton.setEnabled(false); + restartButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + RestartHelper.restart(); + } + }); + restartLaterButton.setFont(new Font("Default", Font.PLAIN, 12)); + restartLaterButton.setEnabled(false); + restartLaterButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + JPanel buttonPane = new JPanel(); + buttonPane.add(restartLaterButton); + buttonPane.add(restartButton); + pane.add(buttonPane, BorderLayout.SOUTH); + + JPanel progressLabelPane = new JPanel(new BorderLayout()); + UILabel jarProgressLabel = new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restore_To")) + " " + jarRestoreDir + " " + (com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_WorksAfterRestart"))); + jarProgressLabel.setFont(new Font("Default", Font.PLAIN, 12)); + jarProgressLabel.setVisible(true); + progressLabelPane.add(jarProgressLabel); + pane.add(progressLabelPane, BorderLayout.CENTER); + + UpdateMainDialog.deletePreviousPropertyFile(); + + putJarBackupFiles(); + restartButton.setEnabled(true); + restartLaterButton.setEnabled(true); + this.setSize(RESTORE); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Jar_Restore")); + } + + private void initOldVersionRestoreComps() { + this.setResizable(false); + JPanel pane = new JPanel(); + pane.setBorder(BorderFactory.createEmptyBorder(10, 10, 5, 10)); + pane.setLayout(FRGUIPaneFactory.createBorderLayout()); + this.setContentPane(pane); + + UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Ok")); + okButton.setFont(new Font("Default", Font.PLAIN, 12)); + okButton.addActionListener(new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + dispose(); + } + }); + + JPanel buttonPane = new JPanel(); + buttonPane.add(okButton); + pane.add(buttonPane, BorderLayout.SOUTH); + + JPanel infoPane = new JPanel(new BorderLayout()); + JTextArea jTextArea = new JTextArea( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Already_Backup_Old_Project") + + StringUtils.BLANK + + StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNER_BACKUP_DIR) + + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Unzip_Replace_Restore") + ); + jTextArea.setLineWrap(true); + jTextArea.setEditable(false); + jTextArea.setBackground(null); + jTextArea.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); + jTextArea.setFont(new Font("Default", Font.PLAIN, 12)); + infoPane.add(jTextArea); + pane.add(infoPane, BorderLayout.CENTER); + + this.setSize(RESTORE_OLD_VERSION); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Updater_Restore_to_V8")); + } + + + /** + * 显示窗口 + */ + public void showDialog() { + GUICoreUtils.centerWindow(this); + this.setVisible(true); + } + + private void putJarBackupFiles() { + Map map = new HashMap(); + java.util.List list = new ArrayList(); + String installHome = StableUtils.getInstallHome(); + + putJarBackupFilesToInstallLib(installHome, map, list); + putJarBackupFilesToInstallEnv(installHome, map, list); + RestartHelper.saveFilesWhichToMove(map); + RestartHelper.saveFilesWhichToDelete(list.toArray(new String[list.size()])); + } + + private void putJarBackupFilesToInstallLib(String installHome, Map map, java.util.List list) { + String[] files = UpdateConstants.JARS_FOR_DESIGNER_X; + String backupDir = UpdateConstants.DESIGNER_BACKUP_DIR; + for (String file : files) { + map.put(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, file), + StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file)); + list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file)); + } + } + + private void putJarBackupFilesToInstallEnv(String installHome, Map map, java.util.List list) { + String[] files = UpdateConstants.JARS_FOR_SERVER_X; + String backupDir = UpdateConstants.DESIGNER_BACKUP_DIR; + for (String file : files) { + map.put(StableUtils.pathJoin(installHome, backupDir, jarRestoreDir, file), + StableUtils.pathJoin(installHome, UpdateConstants.APPS_FOLDER_NAME, FRContext.getCommonOperator().getAppName(), ProjectConstants.WEBINF_NAME, ProjectConstants.LIB_NAME, file)); + list.add(StableUtils.pathJoin(installHome, UpdateConstants.APPS_FOLDER_NAME, FRContext.getCommonOperator().getAppName(), ProjectConstants.WEBINF_NAME, ProjectConstants.LIB_NAME, file)); + } + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java new file mode 100644 index 0000000000..3f99543a37 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java @@ -0,0 +1,821 @@ +package com.fr.design.onlineupdate.ui.dialog; + +import com.fr.base.FRContext; +import com.fr.design.RestartHelper; +import com.fr.design.constants.LayoutConstants; +import com.fr.design.dialog.UIDialog; +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.gui.itextfield.UITextField; +import com.fr.design.layout.TableLayout; +import com.fr.design.layout.TableLayoutHelper; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.onlineupdate.actions.FileDownloader; +import com.fr.design.onlineupdate.domain.DownloadItem; +import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.design.onlineupdate.domain.UpdateInfoCachePropertyManager; +import com.fr.design.onlineupdate.factory.DirectoryOperationFactory; +import com.fr.design.onlineupdate.ui.widget.LoadingLabel; +import com.fr.design.onlineupdate.ui.widget.UpdateActionLabel; +import com.fr.design.onlineupdate.ui.widget.UpdateInfoTable; +import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableCellRender; +import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableModel; +import com.fr.design.onlineupdate.ui.widget.UpdateInfoTextAreaCellRender; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.ComparatorUtils; +import com.fr.general.DateUtils; +import com.fr.general.GeneralUtils; +import com.fr.general.IOUtils; +import com.fr.general.SiteCenter; +import com.fr.general.http.HttpClient; +import com.fr.json.JSONArray; +import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; +import com.fr.stable.ArrayUtils; +import com.fr.stable.ProductConstants; +import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; +import com.fr.stable.project.ProjectConstants; +import com.fr.workspace.WorkContext; +import com.sun.java.swing.plaf.motif.MotifProgressBarUI; + +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.RowSorter; +import javax.swing.SortOrder; +import javax.swing.SwingConstants; +import javax.swing.SwingWorker; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.table.TableRowSorter; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ExecutionException; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateMainDialog extends UIDialog { + public static final Dimension DEFAULT = new Dimension(660, 620); + + private static final Dimension PROGRESSBAR = new Dimension(120, 15); + private static final Dimension UPDATE_BUTTON = new Dimension(80, 24); + private static final int UPDATE_PANE_ROW_SIZE = 30; + private static final int UPDATE_CONTENT_PANE_ROW_SIZE = 10; + private static final int UPDATE_CONTENT_PANE_COLUMN_SIZE = 10; + private static final int UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE = 100; + private static final int SEARCH_PANE_ROW_SIZE = 50; + private static final int SEARCH_PANE_TEXT_COLUMN = 130; + private static final int SEARCH_PANE_COLUMN_GAP = 3; + private static final int UPDATE_INFO_TABLE_HEADER_TIME_WIDTH = 120; + private static final int UPDATE_CONTENT_PANE_BORDER_COLOR = 0xCCCCCC; + private static final int RESTORE_LABEL_COLOR = 0x3384F0; + + private static final String UPDATE_CACHE_STATE_FAIL = "fail"; + private static final String UPDATE_CACHE_STATE_SUCCESS = "success"; + + private static final SimpleDateFormat CHANGELOG_FORMAT = new SimpleDateFormat("M/d/y, h:m:s a", Locale.ENGLISH); + private static final SimpleDateFormat UPDATE_INFO_TABLE_FORMAT = new SimpleDateFormat("yyyy.MM.dd"); + + private Set downloadItems = new HashSet(); + private JSONObject downloadFileConfig; + //最新版本标签 + private LoadingLabel loadingLabel; + //更新按钮 + private UIButton updateButton; + //有新版本提示标签 + private UILabel updateLabel; + + //jar包版本信息面板，包括当前版本和最新版本 + private JPanel jarVersionInfoPane; + //jar包更新信息面板，包括每个版本更新的信息 + private JPanel jarUpdateInfoPane; + //jar包更新操作面板，包括更新重启按钮和进度条 + private JPanel updateActionPane; + //进度条 + private JProgressBar progressBar; + //更新版本提示面板 + private JPanel updateVersionReminderPane; + //jar包版本标签 + private UILabel jarCurrentLabel; + //jar包还原标签 + private UILabel jarRestoreLabel; + //更新信息搜索按钮 + private UIButton searchUpdateInfoBtn; + //搜索更新信息关键词文本框 + private UITextField searchUpdateInfoKeyword; + + private boolean updateSuccessful; + + private UpdateInfoTable updateInfoTable; + + private ArrayList updateInfoList; + + private boolean getUpdateInfoSuccess; + + private UpdateInfoCachePropertyManager cacheProperty; + private String lastUpdateCacheTime; + private String lastUpdateCacheState = UPDATE_CACHE_STATE_FAIL; + + public UpdateMainDialog(Dialog parent) { + super(parent); + initComponents(); + } + + public UpdateMainDialog(Frame parent) { + super(parent); + setModal(true); + initComponents(); + } + + private void initUpdateActionPane() { + double[] rowUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_ROW_SIZE, TableLayout.PREFERRED, UPDATE_CONTENT_PANE_ROW_SIZE}; + double[] rowUpdateContentPaneSize = {TableLayout.PREFERRED}; + double[] columnUpdateSubContentPaneProgressSize = {TableLayout.FILL, TableLayout.PREFERRED}; + double[] columnUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_COLUMN_SIZE, TableLayout.FILL, TableLayout.PREFERRED}; + JPanel progressBarPane = new JPanel(new BorderLayout()); + + progressBar = new JProgressBar(); + progressBar.setUI(new MotifProgressBarUI()); + progressBar.setForeground(UpdateConstants.BAR_COLOR); + progressBar.setVisible(false); + progressBar.setStringPainted(true); + progressBar.setPreferredSize(PROGRESSBAR); + + updateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_New_Version_Available")); + updateLabel.setHorizontalAlignment(SwingConstants.RIGHT); + updateLabel.setVisible(false); + + progressBarPane.add(GUICoreUtils.createBorderLayoutPane( + progressBar, BorderLayout.CENTER, + updateLabel, BorderLayout.EAST + ), BorderLayout.CENTER); + + updateActionPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{ + new Component[]{new UILabel(), new UILabel(), new UILabel()}, + new Component[]{new UILabel(), initPaneContent(getBackground(), rowUpdateContentPaneSize, columnUpdateSubContentPaneProgressSize, progressBarPane, updateButton), new UILabel()}, + new Component[]{new UILabel(), new UILabel(), new UILabel()} + }, rowUpdateSubContentPaneSize, columnUpdateSubContentPaneSize, LayoutConstants.VGAP_LARGE); + } + + private JPanel initPaneContent(Color color, double[] row, double[] column, Component... var) { + JPanel paneContent = TableLayoutHelper.createTableLayoutPane(new Component[][]{var}, row, column); + paneContent.setBackground(color); + return paneContent; + } + + private void initJarVersionInfoPane() { + double[] rowUpdatePaneSize = {UPDATE_PANE_ROW_SIZE, TableLayout.PREFERRED, TableLayout.PREFERRED}; + double[] columnUpdatePaneSize = {TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED}; + double[] rowUpdateContentPaneSize = {TableLayout.PREFERRED}; + double[] columnUpdateContentPaneSize = {TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED}; + double[] rowUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_ROW_SIZE, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.PREFERRED, UPDATE_CONTENT_PANE_ROW_SIZE}; + double[] columnUpdateSubContentPaneSize = {UPDATE_CONTENT_PANE_COLUMN_SIZE, TableLayout.FILL, TableLayout.PREFERRED}; + double[] columnUpdateSubContentPaneLabelSize = {UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE, TableLayout.PREFERRED}; + + JPanel jarUpdateContentPane = new JPanel(); + jarUpdateContentPane.setLayout(new BorderLayout()); + jarUpdateContentPane.setBorder(BorderFactory.createLineBorder(new Color(UPDATE_CONTENT_PANE_BORDER_COLOR))); + + JPanel jarUpdateContentPane2 = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{ + new Component[]{new UILabel(), new UILabel(), new UILabel()}, + new Component[]{new UILabel(), updateVersionReminderPane, new UILabel()}, + new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JAR_Version")), jarCurrentLabel), new UILabel()}, + new Component[]{new UILabel(), initPaneContent(Color.WHITE, rowUpdateContentPaneSize, columnUpdateSubContentPaneLabelSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Latest_JAR")), loadingLabel), new UILabel()}, + new Component[]{new UILabel(), new UILabel(), new UILabel()} + }, rowUpdateSubContentPaneSize, columnUpdateSubContentPaneSize, LayoutConstants.VGAP_LARGE); + jarUpdateContentPane2.setBackground(Color.WHITE); + jarUpdateContentPane.add(jarUpdateContentPane2); + jarVersionInfoPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{ + new Component[]{new UILabel(), new UILabel(), new UILabel()}, + new Component[]{new UILabel(), initPaneContent(getBackground(), rowUpdateContentPaneSize, columnUpdateContentPaneSize, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_JarUpdate")), new UILabel(), jarRestoreLabel), new UILabel()}, + new Component[]{new UILabel(), jarUpdateContentPane, new UILabel()} + }, rowUpdatePaneSize, columnUpdatePaneSize, LayoutConstants.VGAP_LARGE); + } + + private void initJarUpdateInfoPane() { + double[] rowUpdatePaneSize = {SEARCH_PANE_ROW_SIZE, TableLayout.FILL}; + double[] columnUpdatePaneSize = {TableLayout.PREFERRED, TableLayout.FILL, TableLayout.PREFERRED}; + + double[] searchRow = {UPDATE_CONTENT_PANE_ROW_SIZE, TableLayout.PREFERRED, SEARCH_PANE_COLUMN_GAP * 2}; + double[] searchColumn = {TableLayout.FILL, SEARCH_PANE_TEXT_COLUMN, TableLayout.PREFERRED}; + initUpdateInfoSearchPane(); + JPanel searchPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{ + new Component[]{new UILabel(), new UILabel(), new UILabel()}, + new Component[]{new UILabel(), searchUpdateInfoKeyword, searchUpdateInfoBtn}, + new Component[]{new UILabel(), new UILabel(), new UILabel()} + }, searchRow, searchColumn, LayoutConstants.VGAP_LARGE); + + String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Date"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Content"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_SignHeader")}; + initUpdateInfoTable(columnNames); + + UIScrollPane uiScrollPane = new UIScrollPane(updateInfoTable); + jarUpdateInfoPane = TableLayoutHelper.createCommonTableLayoutPane(new Component[][]{ + new Component[]{new UILabel(), searchPane, new UILabel()}, + new Component[]{new UILabel(), uiScrollPane, new UILabel()} + }, rowUpdatePaneSize, columnUpdatePaneSize, LayoutConstants.VGAP_LARGE); + } + + private void initUpdateInfoTable(String[] columnNames) { + int updateTimeColIndex = 0; + int updateTitleColIndex = 1; + int updateSignColIndex = 2; + + updateInfoTable = new UpdateInfoTable(columnNames); + + updateInfoTable.setShowGrid(false); + updateInfoTable.setCellSelectionEnabled(false); + TableRowSorter sorter = new TableRowSorter(updateInfoTable.getDataModel()); + sorter.setSortable(updateTimeColIndex, true); + sorter.setSortable(updateTitleColIndex, false); + sorter.setSortable(updateSignColIndex, false); + updateInfoTable.setRowSorter(sorter); + List sortKeys = new ArrayList(); + sortKeys.add(new RowSorter.SortKey(updateTimeColIndex, SortOrder.DESCENDING)); + sorter.setSortKeys(sortKeys); + + updateInfoTable.getTableHeader().setReorderingAllowed(false); + updateInfoTable.getColumnModel().getColumn(updateTimeColIndex).setMaxWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH); + updateInfoTable.getColumnModel().getColumn(updateTimeColIndex).setMinWidth(UPDATE_INFO_TABLE_HEADER_TIME_WIDTH); + updateInfoTable.getColumnModel().getColumn(updateSignColIndex).setMaxWidth(0); + updateInfoTable.getColumnModel().getColumn(updateSignColIndex).setMinWidth(0); + updateInfoTable.getTableHeader().getColumnModel().getColumn(updateSignColIndex).setMaxWidth(0); + updateInfoTable.getTableHeader().getColumnModel().getColumn(updateSignColIndex).setMinWidth(0); + updateInfoTable.getColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Date")).setCellRenderer(new UpdateInfoTableCellRender()); + updateInfoTable.getColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Content")).setCellRenderer(new UpdateInfoTextAreaCellRender()); + } + + private void initUpdateInfoSearchPane() { + searchUpdateInfoKeyword = new UITextField(); + searchUpdateInfoKeyword.getDocument().addDocumentListener(new DocumentListener() { + @Override + public void insertUpdate(DocumentEvent e) { + } + + @Override + public void removeUpdate(DocumentEvent e) { + String keyword = searchUpdateInfoKeyword.getText(); + if (ComparatorUtils.equals(keyword, StringUtils.EMPTY) && getUpdateInfoSuccess) { + updateInfoList.clear(); + getUpdateInfo(keyword).execute(); + } + } + + @Override + public void changedUpdate(DocumentEvent e) { + } + }); + searchUpdateInfoBtn = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Search")); + searchUpdateInfoBtn.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (getUpdateInfoSuccess) { + updateInfoList.clear(); + getUpdateInfo(searchUpdateInfoKeyword.getText()).execute(); + } + } + }); + } + + private void initButtonAndLabel() { + loadingLabel = new LoadingLabel(); + loadingLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Checking_Jar_Update")); + updateButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Update")); + updateButton.setPreferredSize(UPDATE_BUTTON); + updateButton.setEnabled(false); + + double[] rowSize = {TableLayout.PREFERRED}; + + double[] colSize = {UPDATE_CONTENT_PANE_LABEL_COLUMN_SIZE, TableLayout.PREFERRED}; + updateVersionReminderPane = initPaneContent( + Color.WHITE, rowSize, colSize, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Designer_Version")), + new UILabel(UpdateConstants.DEFAULT_APP_NAME + StringUtils.BLANK + ProductConstants.VERSION) + ); + + + jarCurrentLabel = new UILabel(StringUtils.isEmpty(GeneralUtils.readBuildNO()) ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Not_Install_Version") : GeneralUtils.readBuildNO(), SwingConstants.CENTER); + UILabel noJarPreviousRevision = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_No_Previous_Version")); + UpdateActionLabel jarRestorePreviousRevision = new UpdateActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restore"), false); + jarRestorePreviousRevision.setForeground(new Color(RESTORE_LABEL_COLOR)); + jarRestorePreviousRevision.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + RestoreDialog dialog = new RestoreDialog(DesignerContext.getDesignerFrame(), true); + dialog.showDialog(); + } + }); + //choose RestoreLabel to show + boolean isNeedRestore = ArrayUtils.isNotEmpty(DirectoryOperationFactory.listFilteredFiles(StableUtils.getInstallHome(), getBackupDirectory())); + jarRestoreLabel = isNeedRestore ? jarRestorePreviousRevision : noJarPreviousRevision; + } + + private void initComponents() { + JPanel contentPane = (JPanel) getContentPane(); + contentPane.setLayout(new BorderLayout()); + + + initButtonAndLabel(); + + initJarVersionInfoPane(); + initJarUpdateInfoPane(); + initUpdateActionPane(); + + add(jarVersionInfoPane, BorderLayout.NORTH); + add(jarUpdateInfoPane, BorderLayout.CENTER); + add(updateActionPane, BorderLayout.SOUTH); + + addActionListenerForUpdateBtn(); + + new SwingWorker() { + @Override + protected JSONObject doInBackground() throws Exception { + HttpClient hc = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("jar10.update")); + hc.setTimeout(UpdateConstants.CONNECTION_TIMEOUT); + return new JSONObject(hc.getResponseText()); + } + + @Override + protected void done() { + try { + downloadFileConfig = get(); + showDownLoadInfo(); + } catch (InterruptedException e) { + stopLoading(); + } catch (ExecutionException e) { + stopLoading(); + } finally { + getUpdateInfo(StringUtils.EMPTY).execute(); + } + } + }.execute(); + } + + private SwingWorker getUpdateInfo(final String keyword) { + updateInfoList = new ArrayList(); + lastUpdateCacheTime = UpdateConstants.CHANGELOG_X_START; + String cacheConfigPath = getUpdateCacheConfig(); + cacheProperty = new UpdateInfoCachePropertyManager(StableUtils.pathJoin(WorkContext.getCurrent().getPath(), "resources", "offlineres", cacheConfigPath)); + String recordUpdateTime = cacheProperty.readProperty("updateTime"); + if (StringUtils.isNotEmpty(recordUpdateTime)) { + lastUpdateCacheTime = recordUpdateTime; + } + String recordUpdateState = cacheProperty.readProperty("updateState"); + if (StringUtils.isNotEmpty(recordUpdateState)) { + lastUpdateCacheState = recordUpdateState; + } + return new SwingWorker() { + @Override + protected JSONArray doInBackground() { + try { + getUpdateInfoSuccess = false; + //step1:read from cache file + getCachedUpdateInfo(keyword); + //step2:read from website,start from cacheRecordTime + if (downloadFileConfig == null) { + throw new Exception("network error."); + } + HttpClient hc = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("changelog10") + "&start=" + lastUpdateCacheTime + "&end=" + getLatestJARTimeStr()); + hc.asGet(); + hc.setTimeout(UpdateConstants.CONNECTION_TIMEOUT * 2); + String responseText = hc.getResponseText(); + JSONArray array = JSONArray.create(); + //假如返回"-1"，说明socket出错了 + if (!ComparatorUtils.equals(responseText, "-1")) { + array = new JSONArray(responseText); + } + hc.release(); + return array; + } catch (Exception e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + return JSONArray.create(); + } + + @Override + protected void done() { + try { + JSONArray jsonArray = get(); + //step3:generateInfoTableList + updateInfoTable.getDataModel().populateBean(generateUpdateInfoList(jsonArray, keyword)); + + getUpdateInfoSuccess = true; + //step4:update cache file,start from cacheRecordTime,end latest server jartime + updateCachedInfoFile(jsonArray); + } catch (Exception e) { + getUpdateInfoSuccess = true; + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + }; + } + + //从文件中读取缓存的更新信息 + private void getCachedUpdateInfo(String keyword) throws Exception { + String cacheInfoPath = getUpdateCacheInfo(); + File cacheFile = new File(StableUtils.pathJoin(WorkContext.getCurrent().getPath(), "resources", "offlineres", cacheInfoPath)); + if (!ComparatorUtils.equals(lastUpdateCacheState, "success")) { + cacheFile.delete(); + return; + } + if (cacheFile.exists()) { + FileReader reader = new FileReader(cacheFile); + BufferedReader br = new BufferedReader(reader); + String readStr, updateTimeStr; + + while ((readStr = br.readLine()) != null) { + String[] updateInfo = readStr.split("\\t"); + if (updateInfo.length == 2) { + updateTimeStr = updateInfo[0]; + Date updateTime = CHANGELOG_FORMAT.parse(updateTimeStr); + //形如 Build#release-2018.07.31.03.03.52.80 + String currentNO = GeneralUtils.readBuildNO(); + Date curJarDate = UPDATE_INFO_TABLE_FORMAT.parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1)); + if (!ComparatorUtils.equals(keyword, StringUtils.EMPTY)) { + if (!containsKeyword(UPDATE_INFO_TABLE_FORMAT.format(updateTime), keyword) && !containsKeyword(updateInfo[1], keyword)) { + continue; + } + } + if (isValidLogInfo(updateInfo[1])) { + updateInfoList.add(new Object[]{UPDATE_INFO_TABLE_FORMAT.format(updateTime), updateInfo[1], updateTime.after(curJarDate)}); + } + } + } + br.close(); + reader.close(); + } + } + + private void updateCachedInfoFile(JSONArray jsonArray) throws Exception { + String cacheDirPath = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), "resources", "offlineres"); + File cacheFileDir = new File(cacheDirPath); + if (!StableUtils.mkdirs(cacheFileDir)) { + FineLoggerFactory.getLogger().error("make dir error."); + return; + } + final File cacheFile = new File(StableUtils.pathJoin(cacheDirPath, getUpdateCacheInfo())); + if (!cacheFile.exists()) { + cacheFile.createNewFile(); + lastUpdateCacheTime = UpdateConstants.CHANGELOG_X_START; + lastUpdateCacheState = UPDATE_CACHE_STATE_FAIL; + } + if (downloadFileConfig == null) { + return; + } + String endTime = getLatestJARTimeStr(); + if (endTime.equals(lastUpdateCacheTime) || jsonArray.length() == 0 || ComparatorUtils.compare(endTime, lastUpdateCacheTime) <= 0) { + return; + } + FileWriter fileWriter = new FileWriter(cacheFile, true); + BufferedWriter bufferWriter = new BufferedWriter(fileWriter); + for (int i = 0; i < jsonArray.length(); i++) { + JSONObject jo = (JSONObject) jsonArray.get(i); + bufferWriter.write((String) jo.get("update") + '\t' + jo.get("title")); + bufferWriter.newLine(); + bufferWriter.flush(); + } + bufferWriter.close(); + fileWriter.close(); + lastUpdateCacheState = UPDATE_CACHE_STATE_SUCCESS; + lastUpdateCacheTime = endTime; + cacheProperty.updateProperty("updateTime", lastUpdateCacheTime); + cacheProperty.updateProperty("updateState", lastUpdateCacheState); + } + + private ArrayList generateUpdateInfoList(JSONArray jsonArray, String keyword) throws Exception { + for (int i = 0; i < jsonArray.length(); i++) { + JSONObject jo = (JSONObject) jsonArray.get(i); + String updateTitle = (String) jo.get("title"); + String updateTimeStr = (String) jo.get("update"); + Date updateTime = CHANGELOG_FORMAT.parse(updateTimeStr); + //形如 Build#release-2018.07.31.03.03.52.80 + String currentNO = GeneralUtils.readBuildNO(); + Date curJarDate = UPDATE_INFO_TABLE_FORMAT.parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1)); + if (!ComparatorUtils.equals(keyword, StringUtils.EMPTY)) { + if (!containsKeyword(UPDATE_INFO_TABLE_FORMAT.format(updateTime), keyword) && !containsKeyword(updateTitle, keyword)) { + continue; + } + } + if (isValidLogInfo(updateTitle)) { + updateInfoList.add(new Object[]{UPDATE_INFO_TABLE_FORMAT.format(updateTime), updateTitle, updateTime.after(curJarDate)}); + } + } + return new ArrayList(updateInfoList); + } + + private boolean containsKeyword(String str, String keyword) { + return str.toUpperCase().contains(keyword.toUpperCase()); + } + + private void stopLoading() { + loadingLabel.stopLoading(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Connect_VersionUpdateServer_Failed")); + } + + + private void showDownLoadInfo() { + //形如 Build#release-2018.07.31.03.03.52.80 + String buildNO = downloadFileConfig.optString("buildNO"); + Date jarDate = (new SimpleDateFormat("yyyy.MM.dd")).parse(buildNO, new ParsePosition(buildNO.indexOf("-") + 1)); + String serverVersionNO = downloadFileConfig.optString("versionNO"); + String currentVersionNO = ProductConstants.RELEASE_VERSION; + String[] serverVersionSplitStr = serverVersionNO.split("\\."); + String[] currentVersionSplitStr = currentVersionNO.split("\\."); + int index = 0; + int compareResult; + int versionLength = Math.min(serverVersionSplitStr.length, currentVersionSplitStr.length); + + //形如 Build#release-2018.07.31.03.03.52.80 + String currentNO = GeneralUtils.readBuildNO(); + if (!".".equals(StableUtils.getInstallHome())) { + Date currentDate = (new SimpleDateFormat("yyyy.MM.dd")).parse(currentNO, new ParsePosition(currentNO.indexOf("-") + 1)); + if (DateUtils.subtractDate(jarDate, currentDate, DateUtils.DAY) > 0) { + updateButton.setEnabled(true); + updateLabel.setVisible(true); + loadingLabel.stopLoading(buildNO.contains("-") ? buildNO.substring(buildNO.lastIndexOf("-") + 1) : buildNO); + } else { + loadingLabel.stopLoading(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Already_Latest_Version")); + } + } else { + updateButton.setEnabled(true); + updateLabel.setVisible(true); + loadingLabel.stopLoading(buildNO.contains("-") ? buildNO.substring(buildNO.lastIndexOf("-") + 1) : buildNO); + } + + while (index < versionLength) { + compareResult = serverVersionSplitStr[index].length() - currentVersionSplitStr[index].length(); + if (0 == compareResult) { + compareResult = serverVersionSplitStr[index].compareTo(currentVersionSplitStr[index]); + if (0 == compareResult) { + ++index; + continue; + } + break; + } + break; + } + + initMapWithInfo(downloadFileConfig); + } + + public void initMapWithInfo(JSONObject result) { + addJarNameToMap(result, "designer"); + addJarNameToMap(result, "server"); + } + + private void addJarNameToMap(JSONObject result, String category) { + JSONArray jsonArray = result.optJSONArray(category); + if (jsonArray != null) { + for (int i = 0, len = jsonArray.length(); i < len; i++) { + JSONObject jo = jsonArray.optJSONObject(i); + String downloadName = jo.optString("name"); + String downloadUrl = jo.optString("url"); + long downloadSize = jo.optLong("size"); + if (ComparatorUtils.equals(category, "server")) { + File currentJAR = new File(StableUtils.pathJoin(WorkContext.getCurrent().getPath(), ProjectConstants.LIB_NAME, downloadName)); + if (currentJAR.exists() && ComparatorUtils.equals(currentJAR.length(), downloadSize)) { + //假如大小一样的jar包就不要下载了 + continue; + } + } + downloadItems.add(new DownloadItem(downloadName, downloadUrl, downloadSize)); + } + } + } + + /** + * jar包更新按钮监听器 + */ + private void addActionListenerForUpdateBtn() { + updateButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + if (updateSuccessful) { + RestartHelper.restart(); + } else { + deletePreviousPropertyFile(); + updateButton.setEnabled(false); + progressBar.setVisible(true); + updateLabel.setVisible(false); + + new FileDownloader( + downloadItems.toArray(new DownloadItem[downloadItems.size()]), + StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DOWNLOAD_DIR)) { + @Override + protected void process(java.util.List chunks) { + DownloadItem fileInfo = chunks.get(chunks.size() - 1); + progressBar.setString(fileInfo.getName() + " " + fileInfo.getProgressString()); + progressBar.setValue(fileInfo.getProgressValue()); + } + + @Override + public void onDownloadSuccess() { + updateButton.setEnabled(true); + progressBar.setVisible(false); + backup(); + putNewFiles(); + updateSuccessful = true; + updateButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_Restart_Designer")); + } + + @Override + public void onDownloadFailed() { + progressBar.setVisible(false); + } + }.execute(); + } + } + }); + } + + /** + * 确保升级更新之前删除以前的配置文件 + */ + public static void deletePreviousPropertyFile() { + //在进行更新升级之前确保move和delete.properties删除 + File moveFile = new File(RestartHelper.MOVE_FILE); + File delFile = new File(RestartHelper.RECORD_FILE); + if ((moveFile.exists()) && (!moveFile.delete())) { + FineLoggerFactory.getLogger().error(RestartHelper.MOVE_FILE + "delete failed!"); + } + if ((delFile.exists()) && (!delFile.delete())) { + FineLoggerFactory.getLogger().error(RestartHelper.RECORD_FILE + "delete failed!"); + } + } + + /** + * JAR包更新的时候备份老的jar包，包括设计器相关的和服务器相关的几个 + */ + private void backup() { + String installHome = StableUtils.getInstallHome(); + //jar包备份文件的目录为"backup/"+jar包当前版本号 + String todayBackupDir = StableUtils.pathJoin(installHome, getBackupDirectory(), (GeneralUtils.readBuildNO())); + backupFilesFromInstallEnv(installHome, todayBackupDir, getJARList4Server()); + backupFilesFromInstallLib(installHome, todayBackupDir, getJARList4Designer()); + jarCurrentLabel.setText(downloadFileConfig.optString("buildNO")); + } + + private void backupFilesFromInstallEnv(String installHome, String todayBackupDir, String[] files) { + for (String file : files) { + try { + IOUtils.copy( + new File(StableUtils.pathJoin(installHome, UpdateConstants.APPS_FOLDER_NAME, FRContext.getCommonOperator().getAppName(), ProjectConstants.WEBINF_NAME, ProjectConstants.LIB_NAME, file)), + new File(StableUtils.pathJoin(todayBackupDir))); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + } + + private void backupFilesFromInstallLib(String installHome, String todayBackupDir, String[] files) { + for (String file : files) { + try { + IOUtils.copy( + new File(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file)), + new File(StableUtils.pathJoin(todayBackupDir))); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); + } + } + } + + private void putNewFiles() { + Map map = new HashMap(); + java.util.List list = new ArrayList(); + String installHome = StableUtils.getInstallHome(); + putNewFilesToInstallLib(installHome, getDownLoadJAR4Designer(), map, list); + putNewFilesToInstallEnv(installHome, getDownLoadJAR4Server(), map, list); + RestartHelper.saveFilesWhichToMove(map); + RestartHelper.saveFilesWhichToDelete(list.toArray(new String[list.size()])); + } + + private void putNewFilesToInstallLib(String installHome, String[] files, Map map, java.util.List list) { + for (String file : files) { + map.put(StableUtils.pathJoin(installHome, UpdateConstants.DOWNLOAD_DIR, file), + StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file)); + list.add(StableUtils.pathJoin(installHome, ProjectConstants.LIB_NAME, file)); + } + } + + private void putNewFilesToInstallEnv(String installHome, String[] files, Map map, java.util.List list) { + for (String file : files) { + map.put(StableUtils.pathJoin(installHome, UpdateConstants.DOWNLOAD_DIR, file), + StableUtils.pathJoin(installHome, UpdateConstants.APPS_FOLDER_NAME, FRContext.getCommonOperator().getAppName(), ProjectConstants.WEBINF_NAME, ProjectConstants.LIB_NAME, file)); + list.add(StableUtils.pathJoin(installHome, UpdateConstants.APPS_FOLDER_NAME, FRContext.getCommonOperator().getAppName(), ProjectConstants.WEBINF_NAME, ProjectConstants.LIB_NAME, file)); + } + } + + //获取备份目录 + private String getBackupDirectory() { + return UpdateConstants.DESIGNER_BACKUP_DIR; + } + + //获取服务器jar包列表 + private String[] getJARList4Server() { + return UpdateConstants.JARS_FOR_SERVER_X; + } + + //获取设计器jar包列表 + private String[] getJARList4Designer() { + return UpdateConstants.JARS_FOR_DESIGNER_X; + } + + //获取服务器jar包下载列表 + private String[] getDownLoadJAR4Server() { + ArrayList jarList = new ArrayList(); + for (DownloadItem downloadItem : downloadItems) { + String downloadItemName = downloadItem.getName(); + if (ArrayUtils.contains(getJARList4Server(), downloadItemName)) { + jarList.add(downloadItemName); + } + } + return jarList.toArray(new String[jarList.size()]); + } + + //获取设计器jar包下载列表 + private String[] getDownLoadJAR4Designer() { + ArrayList jarList = new ArrayList(); + for (DownloadItem downloadItem : downloadItems) { + String downloadItemName = downloadItem.getName(); + if (ArrayUtils.contains(getJARList4Designer(), downloadItemName)) { + jarList.add(downloadItemName); + } + } + return jarList.toArray(new String[jarList.size()]); + } + + //获取更新日志缓存配置文件名 + private String getUpdateCacheConfig() { + return UpdateConstants.UPDATE_CACHE_CONFIG_X; + } + + //获取更新日志缓存内容文件名 + private String getUpdateCacheInfo() { + return UpdateConstants.UPDATE_CACHE_INFO_X; + } + + //获取最新的jar包时间字符串 + private String getLatestJARTimeStr() { + if (downloadFileConfig == null) { + return StringUtils.EMPTY; + } + String buildNO = downloadFileConfig.optString("buildNO"); + Date jarDate = (new SimpleDateFormat("yyyy.MM.dd")).parse(buildNO, new ParsePosition(buildNO.indexOf("-") + 1)); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + return df.format(jarDate); + } + + //判断是否是有效的日志内容 + private boolean isValidLogInfo(String logContent) { + String log = logContent.toUpperCase(); + for (String s : UpdateConstants.LOG_TYPE) { + if (log.startsWith(s)) { + return true; + } + } + return false; + } + + /** + * 显示窗口 + */ + public void showDialog() { + setSize(DEFAULT); + setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade")); + GUICoreUtils.centerWindow(this); + setVisible(true); + } + + /** + * 检查有效性 + * + * @throws Exception + */ + @Override + public void checkValid() throws Exception { + + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java new file mode 100644 index 0000000000..461489839a --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java @@ -0,0 +1,65 @@ +package com.fr.design.onlineupdate.ui.widget; + +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.ListCellRenderer; +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import java.awt.Graphics; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class ColorfulCellRender extends JPanel implements ListCellRenderer { + private static int CELLCOLOR_DARK = 0xf6f6f6; + private static int CELLCOLOR_LIGHT = 0xffffff; + private static int CELLCOLOR_SELECTED = 0xdfecfd; + private static int TEXT_COORDINATE_X = 10; + private static int TEXT_COORDINATE_Y = 20; + private static final int LISTFONTSIZE = 12; + private Color[] colors = new Color[]{new Color(CELLCOLOR_DARK), new Color(CELLCOLOR_LIGHT)}; + + private String text; + + public ColorfulCellRender() { + setOpaque(true); + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + text = ((null != value) ? (value.toString()) : null); + + Color background; + Color foreground = Color.BLACK; + //当前Renderer是否是拖拽目标 + JList.DropLocation dropLocation = list.getDropLocation(); + if (dropLocation != null + && !dropLocation.isInsert() + && dropLocation.getIndex() == index) { + + background = new Color(CELLCOLOR_SELECTED); + //当前Renderer是否被选中 + } else if (isSelected) { + background = new Color(CELLCOLOR_SELECTED); + } else { + background = colors[index % 2]; + } + + setBackground(background); + setForeground(foreground); + + return this; + } + + @Override + public void paintComponent(Graphics g) { + g.setColor(getBackground()); + g.fillRect(0, 0, getWidth(), getHeight()); + g.setColor(getForeground()); + g.setFont(new Font("Default", Font.PLAIN, LISTFONTSIZE)); + if (text != null) { + g.drawString(text, TEXT_COORDINATE_X, TEXT_COORDINATE_Y); + } + } +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java new file mode 100644 index 0000000000..a21d67e462 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java @@ -0,0 +1,48 @@ +package com.fr.design.onlineupdate.ui.widget; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.general.IOUtils; + +import javax.swing.Icon; +import javax.swing.SwingConstants; +import javax.swing.Timer; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class LoadingLabel extends UILabel { + private Icon[] busyIcons = new Icon[15]; + private Timer busyIconTimer; + private int busyIconIndex; + + public LoadingLabel() { + for (int i = 0; i < busyIcons.length; i++) { + busyIcons[i] = IOUtils.readIcon("/com/fr/design/images/update/busy-icon" + i + ".png"); + } + int busyAnimationRate = 30; + + busyIconTimer = new Timer(busyAnimationRate, new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + busyIconIndex = (busyIconIndex + 1) % busyIcons.length; + setIcon(busyIcons[busyIconIndex]); + setHorizontalAlignment(SwingConstants.CENTER); + } + }); + busyIconTimer.start(); + } + + /** + * 停止加载，并显示 + * + * @param text 要显示的字段 + */ + public void stopLoading(String text) { + busyIconTimer.stop(); + setIcon(null); + setText(text); + } + +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java new file mode 100644 index 0000000000..74c2b6ae57 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java @@ -0,0 +1,95 @@ +package com.fr.design.onlineupdate.ui.widget; + +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.event.MouseInputAdapter; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateActionLabel extends UILabel { + private ActionListener actionListener; + private boolean drawLine = true; + + public UpdateActionLabel(String text, boolean drawUnderLine) { + super(text); + this.drawLine = drawUnderLine; + this.setForeground(Color.BLUE); + this.addMouseListener(mouseInputAdapter); + this.addMouseMotionListener(mouseInputAdapter); + } + + /** + * 增加事件监听 + * + * @param actionListener 监听器 + */ + public void addActionListener(ActionListener actionListener) { + this.actionListener = actionListener; + } + + /** + * Repaints the text. + */ + public void paintComponent(Graphics _gfx) { + super.paintComponent(_gfx); + + _gfx.setColor(Color.BLUE); + if (drawLine) { + _gfx.drawLine(0, this.getHeight() - 1, this.getWidth(), this.getHeight() - 1); + } + } + + private MouseInputAdapter mouseInputAdapter = new MouseInputAdapter() { + public void mouseClicked(MouseEvent e) { + } + + public void mousePressed(MouseEvent e) { + } + + public void mouseReleased(MouseEvent evt) { + Object source = evt.getSource(); + + if (source instanceof UILabel) { + //Action. + if (actionListener != null) { + ActionEvent actionEvent = new ActionEvent(source, 99, ""); + actionListener.actionPerformed(actionEvent); + } + } + } + + public void mouseEntered(MouseEvent evt) { + Object source = evt.getSource(); + + if (source instanceof UILabel) { + ((UILabel) source).setCursor(new Cursor(Cursor.HAND_CURSOR)); + } + } + + public void mouseExited(MouseEvent evt) { + Object source = evt.getSource(); + + if (source instanceof UILabel) { + ((UILabel) source).setCursor(new Cursor(Cursor.DEFAULT_CURSOR)); + } + } + + public void mouseDragged(MouseEvent e) { + } + + public void mouseMoved(MouseEvent evt) { + Object source = evt.getSource(); + + if (source instanceof UILabel) { + ((UILabel) source).setCursor(new Cursor(Cursor.HAND_CURSOR)); + } + } + }; +} \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java new file mode 100644 index 0000000000..f94a514ad3 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java @@ -0,0 +1,46 @@ +package com.fr.design.onlineupdate.ui.widget; + +import javax.swing.JTable; +import javax.swing.table.TableModel; +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateInfoTable extends JTable { + private UpdateInfoTableModel dataModel; + + public UpdateInfoTable(TableModel dm) { + super(dm); + dataModel = (UpdateInfoTableModel) dm; + } + + public UpdateInfoTable() { + } + + public UpdateInfoTable(String[] columnNames) { + this(new UpdateInfoTableModel(columnNames, new ArrayList())); + } + + public UpdateInfoTable(List data, String[] columnNames) { + this(new UpdateInfoTableModel(columnNames, data)); + } + + public UpdateInfoTable(Vector rowData, Vector columnNames) { + super(rowData, columnNames); + } + + public UpdateInfoTable(int numRows, int numColumns) { + super(numRows, numColumns); + } + + public UpdateInfoTableModel getDataModel() { + return dataModel; + } + + public void setDataModel(UpdateInfoTableModel dataModel) { + this.dataModel = dataModel; + } +} diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java new file mode 100644 index 0000000000..22c603c86f --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java @@ -0,0 +1,48 @@ +package com.fr.design.onlineupdate.ui.widget; + +import com.fr.general.ComparatorUtils; +import com.fr.stable.StringUtils; + +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; +import java.awt.Color; +import java.awt.Component; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateInfoTableCellRender extends DefaultTableCellRenderer { + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + cell.setBackground((row & 1) != 0 ? new Color(0xf0f0f0) : Color.WHITE); + if ((Boolean) table.getValueAt(row, 2)) { + cell.setBackground(new Color(0xdfecfd)); + } + if (column == 0) { + //设置首列日期居中显示 + setHorizontalAlignment(JLabel.CENTER); + + for (int i = 1; row - i >= 0; i++) { + if (ComparatorUtils.equals(table.getValueAt(row - i, 0), value)) { + //调用的父类JLabel的setText，table本身的值不变 + setText(StringUtils.EMPTY); + break; + } + } + } + return cell; + } + + @Override + public void setForeground(Color c) { + super.setForeground(c); + } + + @Override + public void setBackground(Color c) { + super.setBackground(c); + } +} diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java new file mode 100644 index 0000000000..147f88a299 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java @@ -0,0 +1,65 @@ +package com.fr.design.onlineupdate.ui.widget; + +import javax.swing.table.AbstractTableModel; +import java.util.List; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateInfoTableModel extends AbstractTableModel { + private String[] titles; + private List data; + + public UpdateInfoTableModel(String[] titles, List data) { + this.titles = titles; + this.data = data; + } + + public void populateBean(List data) { + if (data == null) { + return; + } + clear(); + this.data = data; + fireTableDataChanged(); + } + + public void clear() { + data.clear(); + } + + public List updateBean() { + return data; + } + + @Override + public int getRowCount() { + return data.size(); + } + + @Override + public int getColumnCount() { + return titles.length; + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + return data.get(rowIndex)[columnIndex]; + } + + @Override + public String getColumnName(int column) { + return titles[column]; + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return false; + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) { + super.setValueAt(aValue, rowIndex, columnIndex); + } +} + diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java new file mode 100644 index 0000000000..1e3cebdf81 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java @@ -0,0 +1,43 @@ +package com.fr.design.onlineupdate.ui.widget; + +import javax.swing.BorderFactory; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; +import java.awt.Insets; + +/** + * Created by XINZAI on 2018/8/21. + */ +public class UpdateInfoTextAreaCellRender extends JTextArea implements TableCellRenderer { + public UpdateInfoTextAreaCellRender() { + setMargin(new Insets(2, 2, 2, 2)); + setLineWrap(true); + setWrapStyleWord(true); + setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); + } + + @Override + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + // 计算当前行的最佳高度 + int maxPreferredHeight = 0; + for (int i = 0; i < table.getColumnCount(); i++) { + setText("" + table.getValueAt(row, i)); + setSize(table.getColumnModel().getColumn(column).getWidth(), 0); + maxPreferredHeight = Math.max(maxPreferredHeight, getPreferredSize().height); + } + + if (table.getRowHeight(row) != maxPreferredHeight) { + table.setRowHeight(row, maxPreferredHeight); + } + + setText(value == null ? "" : value.toString()); + setBackground((row & 1) != 0 ? new Color(0xf0f0f0) : Color.WHITE); + if ((Boolean) table.getValueAt(row, 2)) { + setBackground(new Color(0xdfecfd)); + } + return this; + } +} \ No newline at end of file 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 39a89bac6a..30cac90eb2 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 @@ -54,7 +54,7 @@ public class ParameterArrayPane extends JListControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Schedule-Template_Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Schedule_Template_Parameter"); } /** @@ -64,7 +64,7 @@ public class ParameterArrayPane extends JListControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameableSelfCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter_Name"), Parameter.class, ParameterPane.class) { + new NameableSelfCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5b080b6181..14487ca5fa 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Parameters") + ":")); + contentPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("Date")); + editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 + com.fr.design.i18n.Toolkit.i18nText("NOT_NULL_Des") + "\n"; + error += parameterName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5a8407e8db..4cff724f1a 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 @@ -3,12 +3,9 @@ package com.fr.design.parameter; import com.fr.base.Parameter; import com.fr.base.ParameterConfig; 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 javax.swing.*; import java.awt.*; @@ -24,7 +21,7 @@ public class ParameterManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3109b3b31f..063a685d80 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 @@ -1,19 +1,18 @@ package com.fr.design.parameter; -import java.awt.BorderLayout; -import java.awt.Component; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.Parameter; import com.fr.design.beans.BasicBeanPane; +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.design.layout.FRGUIPaneFactory; 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 javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; public class ParameterPane extends BasicBeanPane { @@ -46,8 +45,8 @@ public class ParameterPane extends BasicBeanPane { // richer:要排列显示的控件 Component[][] components = {{null}, - { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":"),textFieldPanel }, - { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Default_Value") + ":"),valueEditor } + { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"),textFieldPanel }, + { null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Default_Value") + ":"),valueEditor } }; double p =TableLayout.PREFERRED; double f =TableLayout.FILL; @@ -65,7 +64,7 @@ public class ParameterPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Parameter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 ed75856751..17733fb1bb 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 @@ -24,7 +24,7 @@ public class DictPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 a289a9000e..3e70ff8d25 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 @@ -23,7 +23,7 @@ public class FormulaPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 09a2c7cc39..69cf2a44bd 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 @@ -18,7 +18,7 @@ public class NonePresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 33a49c3119..204395ac12 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 @@ -8,7 +8,6 @@ import javax.swing.event.ChangeEvent; import com.fr.data.impl.CustomDictionary; 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; @@ -16,7 +15,7 @@ import com.fr.stable.StringUtils; public class CustomDictPane extends FurtherBasicBeanPane { private static final long serialVersionUID = 1L; - private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; // 字典列名key,value + private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")}; // 字典列名key,value private CustomDictCorrelationPane correlationPane; @@ -72,7 +71,7 @@ public class CustomDictPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Datasource-User_Defined"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 484b90060a..668bcd9beb 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyColumnPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource_From_Database"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 341f0b9074..3f62c01703 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 @@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants; import com.fr.design.data.DataCreatorUI; import com.fr.design.gui.frpane.UIComboBoxPane; 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; @@ -34,7 +33,7 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr int[][] rowCount = {{1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type_Set"), UILabel.LEFT), jcb}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 +43,7 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary"); } @Override @@ -78,4 +77,4 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr paneList.add(new FormulaDictPane()); return paneList; } -} \ No newline at end of file +} 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 49cf5765dd..ff13846208 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Formula_Dictionary_Display_Examples_Html")); + UILabel tag = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyFormulaContainer}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 712399a400..ab9d8d90c8 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data") + " ", UILabel.LEFT), firstLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + " ", UILabel.LEFT), keyColumnPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dic_Data_Query"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i); + TableData td = dataSource.getTableData(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i); if (td == null) { - 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); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i; + dataSource.putTableData(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i, db); break; } else { if (ComparatorUtils.equals(td, db)) { - name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Dictionary_Dynamic_SQL") + i; + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dictionary_Dynamic_SQL") + i; break; } else { continue; @@ -368,4 +368,4 @@ public class TableDataDictPane extends FurtherBasicBeanPane public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} 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 824de4bb59..e46e1f06c9 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 @@ -12,7 +12,7 @@ import com.fr.design.fun.impl.AbstractPreviewProvider; public class PagePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return com.fr.design.i18n.Toolkit.i18nText("M-Page_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 7cd781760d..02809ba38c 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 @@ -15,7 +15,7 @@ import java.util.Map; public class ViewPreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return com.fr.design.i18n.Toolkit.i18nText("M-Data_Analysis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_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 f68809cbe7..96e90d5a22 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 @@ -13,7 +13,7 @@ import java.util.Map; public class WriteEnhancePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write_Enhance_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 6c1d6192a6..3d027dca7d 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 @@ -15,7 +15,7 @@ import java.util.Map; public class WritePreview extends AbstractPreviewProvider { @Override public String nameForPopupItem() { - return com.fr.design.i18n.Toolkit.i18nText("M-Write_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Write_Preview"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java b/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java index 132f99a8fc..598ec7f057 100644 --- a/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java +++ b/designer-base/src/main/java/com/fr/design/remote/button/IconButton.java @@ -19,7 +19,7 @@ public final class IconButton extends JButton { super(StringUtils.EMPTY); setContentAreaFilled(false); setFocusPainted(false); - setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remove_x.png")); + setIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_tab_close_normal.png")); setBorder(null); } 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 cf81ba5d40..eaa96f330e 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,9 +8,9 @@ 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.report.DesignAuthority; import com.fr.stable.CoreConstants; +import com.fr.stable.StringUtils; import javax.swing.BorderFactory; import javax.swing.border.EmptyBorder; @@ -38,7 +38,9 @@ public class AuthorityEditorPane extends BasicBeanPane { IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form"}); tree.setDigIn(true); tree.setFileNodeFilter(filter); - this.add(new UIScrollPane(tree), BorderLayout.CENTER); + UIScrollPane scrollPane = new UIScrollPane(tree); + scrollPane.setBorder(BorderFactory.createEmptyBorder()); + this.add(scrollPane, BorderLayout.CENTER); tree.refreshEnv(); } @@ -60,7 +62,12 @@ public class AuthorityEditorPane extends BasicBeanPane { } String[] paths = new String[items.length]; for (int i = 0; i < items.length; i++) { - paths[i] = items[i].getPath(); + String iPath = items[i].getPath(); + if (CoreConstants.SEPARATOR.equals(iPath)) { + tree.selectAllCheckBoxPaths(); + return; + } + paths[i] = iPath; } tree.selectCheckBoxPaths(paths); } @@ -83,7 +90,8 @@ public class AuthorityEditorPane extends BasicBeanPane { type = type && fileNode.isDirectory(); tempSpot.append(fileNode.getName()); } - items.add(new DesignAuthority.Item(tempSpot.toString(), type)); + String path = tempSpot.toString(); + items.add(new DesignAuthority.Item(StringUtils.isEmpty(path) ? CoreConstants.SEPARATOR : path, type)); } da.setItems(items.toArray(new DesignAuthority.Item[0])); return da; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index 08f377b79f..bb3f222b99 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -194,7 +194,7 @@ public class UserManagerPane extends BasicPane { public UserManagerPane() { - this.setBorder(BorderFactory.createEmptyBorder(0,4,0,4)); + this.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4)); this.setLayout(new BorderLayout()); this.add( TableLayoutHelper.createCommonTableLayoutPane( @@ -221,8 +221,8 @@ public class UserManagerPane extends BasicPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), UITitledBorder.createBorderWithTitle( - Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member") - ) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member"), + 4) ) ); @@ -279,7 +279,9 @@ public class UserManagerPane extends BasicPane { content.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member") + UITitledBorder.createBorderWithTitle( + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member"), + 4 ) ) ); diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/tree/FileAuthorityTree.java b/designer-base/src/main/java/com/fr/design/remote/ui/tree/FileAuthorityTree.java index 2b22703f77..feb3895169 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/tree/FileAuthorityTree.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/tree/FileAuthorityTree.java @@ -42,6 +42,16 @@ public class FileAuthorityTree extends TemplateFileTree { this.getCheckBoxTreeSelectionModel().setSelectionPaths(res.toArray(new TreePath[0])); } + /** + * 全选 + */ + public void selectAllCheckBoxPaths() { + DefaultTreeModel model = (DefaultTreeModel) this.getModel(); + ExpandMutableTreeNode treeNode = (ExpandMutableTreeNode) model.getRoot(); + TreePath path = new TreePath(model.getPathToRoot(treeNode)); + getCheckBoxTreeSelectionModel().setSelectionPaths(new TreePath[]{path}); + } + private TreePath getSelectingPath(ExpandMutableTreeNode currentTreeNode, String prefix, String filePath, DefaultTreeModel model) { FileNode fileNode = (FileNode) currentTreeNode.getUserObject(); 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 83b42499be..27a9822c6c 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 @@ -56,7 +56,7 @@ public class WatermarkPane extends BasicPane { // 预览 JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); contentPane.add(leftPane, BorderLayout.CENTER); - leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); + leftPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text_Color")), BorderLayout.NORTH); + colorLabelPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Watermark_Text")), formulaPane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font_Size")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Watermark_Text")), formulaPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Config"),null)); + configPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Config"),null)); return configPane; } @@ -168,6 +168,6 @@ public class WatermarkPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 a26d01e45b..ef8f8276e6 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 @@ -162,8 +162,8 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo */ private void checkChanges() { //如若有变化，则弹出下面的对话框 - 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); + int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role_changed_Is_Refresh") + "?", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { roleTree.refreshTreeNode(); expandTree(roleTree, true); @@ -185,7 +185,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[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FS_Name")}; + String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name")}; buttonGroup = new UIHeadGroup(iconArray, textArray) { public void tabChanged(int index) { roleTree.setEditable(false); @@ -331,7 +331,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo // return; // } // -// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Are_you_sure_to_remove_the_selected_item") + ":" + selectedNO.getName() + "?", +// int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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()); @@ -361,7 +361,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo private class RefreshAction extends UpdateAction { public RefreshAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh")); this.setSmallIcon(UIConstants.REFRESH_ICON); } 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 54920e3645..1b90df3df2 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 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 +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("Fine-Design_Basic_M_Server_Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Role"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name_Duplicate")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Basic_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("Fine-Design_Basic_FS_Name_Duplicate"), 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 0dc4aa2459..ef576ba0f3 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 @@ -239,7 +239,7 @@ public class RoleTree extends UserObjectRefreshJTree { */ protected void doWithValueChanged(TreeSelectionEvent e) { if (e.getNewLeadSelectionPath() != null) { - if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) { + if (!e.getNewLeadSelectionPath().getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Role"))) { + if (treepath != null && !treepath.getLastPathComponent().toString().equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Role"))) { roleName = treepath.getLastPathComponent().toString(); setTabRoleName(roleName); refreshRoleTree(roleName); @@ -536,4 +536,4 @@ public class RoleTree extends UserObjectRefreshJTree { } -} \ No newline at end of file +} 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 30c3dd0ad7..f97a94da24 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 @@ -45,7 +45,7 @@ public class RolesAlreadyEditedPane extends JPanel { public RolesAlreadyEditedPane() { this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("roles_already_authority_edited")) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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() == com.fr.design.i18n.Toolkit.i18nText("M_Server-Platform_Manager")) { + if (nameObject.getName() == com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 38814a7f3b..88563e8dbf 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.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 +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("Fine-Design_Basic_M_Server_Platform_Manager")); report_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Server_Platform_Manager"), tdw); } /** * 获取数据决策系统的角色 */ protected void addFSRoles(Map FS_roles) { RoleDataWrapper tdw = new RoleDataWrapper(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name_Duplicate")); FS_roles.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FS_Name_Duplicate"), 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("Fine-Design_Basic_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 515473c778..136de486a6 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 @@ -35,18 +35,18 @@ public class AlignmentPane extends BasicPane { private AlignmentComboBox verAlignmentComboBox; private UIComboBox textComboBox; private static final String[] TEXT = { - 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)")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Wrap_Text"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 = { - com.fr.design.i18n.Toolkit.i18nText("Default"), - com.fr.design.i18n.Toolkit.i18nText("Image-Extend") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation"), null)); + textDirectionPanel.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(" " + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")));//james:加了一个空格，这样对齐了好看些 + rotationPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Degrees"))); - rotationPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-between_-90_and_90") + ")")); + rotationPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Degrees"))); + rotationPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Vertical_Text"), false); + isVerticalTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Vertical_Text"), false); isVerticalTextCheckBox.addActionListener(actionListener); isVerticalTextCheckBox.addActionListener(actionListener1); - this.leftToRightRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left_To_Right")); + this.leftToRightRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Left_To_Right")); this.leftToRightRB.addActionListener(actionListener); - this.rightToLeftRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right_To_Left")); + this.rightToLeftRB = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Right_To_Left")); this.rightToLeftRB.addActionListener(actionListener); ButtonGroup directionBG = new ButtonGroup(); @@ -131,29 +131,29 @@ public class AlignmentPane extends BasicPane { private void initSpacingPane (JPanel spacingPane) { spacingPane.setLayout(new GridLayout(1, 3)); - spacingPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing") + ":")); + spacingPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_Before"), spacingBeforeSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before_Duplicate"), 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(com.fr.design.i18n.Toolkit.i18nText("Style-Spacing_After"), spacingAfterSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_After_Duplicate"), 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(com.fr.design.i18n.Toolkit.i18nText("Style-Line_Spacing"), lineSpacingSpinner)); + spacingPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Line_Spacing_Duplicate"), lineSpacingSpinner)); } private JPanel getIndentPane() { JPanel indentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); - indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Sytle-Indentation"), null)); + indentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_Indentation"), null)); Comparable maximum = null; leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); leftIndentSpinner.addChangeListener(changeListener); @@ -168,7 +168,7 @@ public class AlignmentPane extends BasicPane { } private JPanel getTextImagePane() { - JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style")); + JPanel textImagePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Style"))); + textStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style")); + JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Horizontal"))); + horAlignmentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Vertical"))); + verAlignmentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Vertical"))); verAlignmentPane.add(verAlignmentComboBox); return aligmentPane; } @@ -253,7 +253,7 @@ public class AlignmentPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-The_value_of_rotation_must_between_-90_and_90_degrees") + "."); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_The_Value_Of_Rotation_Must_Between_90_And_90_Degrees") + "."); } } 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 8be6e4cf9a..a997b3673c 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 @@ -3,42 +3,40 @@ */ package com.fr.design.style; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.BorderFactory; -import javax.swing.Icon; -import javax.swing.JComponent; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; -import javax.swing.JToggleButton; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.event.EventListenerList; - import com.fr.base.BaseUtils; import com.fr.base.CellBorderStyle; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.Style; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.LineComboBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.VerticalFlowLayout; -import com.fr.design.dialog.BasicPane; - -import com.fr.stable.Constants; -import com.fr.stable.CoreConstants; import com.fr.design.style.color.ColorSelectBox; import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.stable.Constants; +import com.fr.stable.CoreConstants; + +import javax.swing.BorderFactory; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JToggleButton; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.EventListenerList; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; /** * CellBorder Pane. @@ -97,13 +95,13 @@ public class BorderPane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("No"))); + borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"))); // Button setting all borders to active with // current color and current style excepting inside borders borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"))); @@ -148,16 +146,16 @@ public class BorderPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Line"), null)); + northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Line"), null)); JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); northPane.add(rightTopPane, BorderLayout.NORTH); JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Style") + ":")); + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style") + ":")); first.add(this.currentLineCombo); rightTopPane.add(first, BorderLayout.NORTH); JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color") + ":")); + second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + ":")); second.add(this.currentLineColorPane); rightTopPane.add(second, BorderLayout.CENTER); @@ -216,7 +214,7 @@ public class BorderPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Border"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 e67808e8b1..04b285fd56 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 @@ -3,19 +3,22 @@ */ package com.fr.design.style; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; +import com.fr.base.FRContext; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.icombobox.LineComboBox; +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.style.color.ColorSelectBox; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.DefaultValues; +import com.fr.general.FRFont; +import com.fr.stable.CoreConstants; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JComponent; -import com.fr.design.gui.ilable.UILabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -26,19 +29,14 @@ import javax.swing.event.DocumentListener; import javax.swing.event.EventListenerList; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; - -import com.fr.base.FRContext; -import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.gui.icombobox.LineComboBox; -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.stable.CoreConstants; -import com.fr.design.style.color.ColorSelectBox; -import com.fr.design.utils.gui.GUICoreUtils; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** * Pane to edit Font. @@ -122,7 +120,7 @@ public class FRFontPane extends BasicPane { // underline pane JPanel underlinePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); listVBottomPane.add(underlinePane); - underlinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Underline"), null)); + underlinePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Underline"), null)); this.underlineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY); this.underlineCombo.addActionListener(actionListener); @@ -132,7 +130,7 @@ public class FRFontPane extends BasicPane { JPanel foregroundPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); listVBottomPane.add(foregroundPane); - foregroundPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Foreground"),null)); + foregroundPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Foreground"),null)); foregroundColorPane = new ColorSelectBox(140); foregroundColorPane.addSelectChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent e) { @@ -155,21 +153,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(com.fr.design.i18n.Toolkit.i18nText("FRFont-Effects"),null)); + effectsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Effects"),null)); JPanel effectsPane2 = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); effectsPane.add(effectsPane2, BorderLayout.NORTH); - isStrikethroughCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Strikethrough") + " "); + isStrikethroughCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Strikethrough") + " "); isStrikethroughCheckBox.addChangeListener(changeListener); isStrikethroughCheckBox.setMnemonic('K'); - isShadowCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Shadow")); + isShadowCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Shadow")); isShadowCheckBox.addChangeListener(changeListener); isShadowCheckBox.setMnemonic('S'); - isSuperscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Superscript")); + isSuperscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Superscript")); isSuperscriptCheckBox.addChangeListener(changeListener); isSuperscriptCheckBox.setMnemonic('E'); - isSubscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FRFont-Subscript")); + isSubscriptCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Font_Subscript")); isSubscriptCheckBox.addChangeListener(changeListener); isSubscriptCheckBox.setMnemonic('B'); @@ -186,7 +184,7 @@ public class FRFontPane extends BasicPane { // preview pane. preview = new FRFontPreviewArea(); - preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"))); + preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); rightPane.add(preview, BorderLayout.CENTER); // Cannot select superscript and subscript in the same time. @@ -277,7 +275,7 @@ public class FRFontPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Sytle-FRFont"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sytle_FRFont"); } /** @@ -401,4 +399,4 @@ public class FRFontPane extends BasicPane { updatePreviewLabel(); } } -} \ No newline at end of file +} 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 bbec9e2fb3..37076c66fb 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 @@ -1,18 +1,16 @@ package com.fr.design.style; -import java.awt.BorderLayout; - -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import com.fr.base.Utils; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; -import com.fr.design.utils.gui.GUICoreUtils; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.BorderLayout; public class FontFamilyPane extends JPanel { private UITextField familyField; @@ -37,7 +35,7 @@ public class FontFamilyPane extends JPanel { // familyPane.setLayout(FRGUIPaneFactory.createBorderLayout()); familyPane.add(FRFontPane.createTextFieldListPane("", familyField, familyList), BorderLayout.CENTER); - familyPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FRFont-Family"),null)); + familyPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Family"),null)); this.add(familyPane); } 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 5358076377..709fc355a0 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Format") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_StyleFormat_Sample") + ":")); pane.add(previewLabel = new UILabel("")); typeBox.addItemListener(typeListener); @@ -172,7 +172,7 @@ public class FormatBox extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style"); } private void refreshLabelText() { @@ -205,4 +205,4 @@ public class FormatBox extends BasicPane { private boolean isMoneyPattern(String pattern) { return (pattern.length() > 0 && pattern.charAt(0) == '¤') || (pattern.length() > 0 && pattern.charAt(0) == '$'); } -} \ No newline at end of file +} 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 9883f94dea..255efe78c5 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Sample"), null)); + samplePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("StyleFormat-Category"), null)); + leftControlPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Format_Category"), null)); initRadioButton(); ButtonGroup categoryButtonGroup = new ButtonGroup(); categoryButtonGroup.add(nullRadioButton); @@ -170,7 +170,7 @@ public class FormatPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning"); + sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning"); c = Color.red; } this.sampleLabel.setText(sample); @@ -488,4 +488,4 @@ public class FormatPane extends BasicPane { } }; -} \ No newline at end of file +} 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 a0e0702e4b..ed8afc9e4d 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color"))); } 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 d6302e95e4..7f8669d6a8 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 @@ -92,32 +92,32 @@ public class BackgroundFactory { private static void registerUniversal(Map, BackgroundUIWrapper> map) { map.put(null, BackgroundUIWrapper.create() - .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(TextureBackground.class, BackgroundUIWrapper.create() - .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Texture"))); + .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"))); map.put(PatternBackground.class, BackgroundUIWrapper.create() - .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Pattern"))); + .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color"))); } private static void registerImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); } private static void registerBrowserImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); } private static void registerButtonBackground(Map, BackgroundUIWrapper> map){ map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 15a37c4ae5..66fa06c9e0 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 @@ -85,7 +85,7 @@ public class BackgroundPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"); } 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 3add0af1ea..93ca55c1ae 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 @@ -42,7 +42,7 @@ public abstract class BackgroundSelectPane extends BasicPane { this.add(backgroundPane, BorderLayout.CENTER); - UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Choose_None")); + UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3ad62ebeff..08d2a2e6a4 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() - .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Color"))); + .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() - .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Gradient_Color"))); + .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color"))); } 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 00fd0eec5a..c8f801f221 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 @@ -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 = 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 static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"); + protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"); + protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); + protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); protected CardLayout cardLayout; protected JPanel layoutPane; 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 4569487712..53558f6fb7 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Drag_To_Select_Gradient")); + UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient_Direction") + ":")); + innercenterPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Direction") + ":")); - left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Horizontal")); + left2right = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Horizontal")); innercenterPane.add(left2right); left2right.setSelected(true); left2right.addActionListener(reviewListener); - top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup_Vertical")); + top2bottom = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_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 53c6fa962c..155e15604a 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 @@ -22,8 +22,8 @@ import java.awt.Dimension; public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -2762854865690293473L; - 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 LEFT_2_RIGHT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Landscape"); + private static final String TOP_2_BOTTOM = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Portrait"); private static final String[] COLOR_DIRECTIONS = { LEFT_2_RIGHT, TOP_2_BOTTOM 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 2112446b32..545b497177 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 @@ -1,19 +1,18 @@ package com.fr.design.style.background.gradient; -import java.awt.BorderLayout; +import com.fr.base.Utils; +import com.fr.base.background.GradientBackground; +import com.fr.design.dialog.BasicPane; +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 javax.swing.JFormattedTextField; -import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; - -import com.fr.base.Utils; -import com.fr.base.background.GradientBackground; -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 java.awt.BorderLayout; /** @@ -38,11 +37,11 @@ public class GradientFromToPixPane extends BasicPane { startField.setHorizontalAlignment(UITextField.LEFT); startField.setColumns(3); - secondFloorPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("To") + " ")); + secondFloorPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_To") + " ")); endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1)); secondFloorPane.add(endPixSpinner); - secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Indent-Pixel") + ")")); + secondFloorPane.add(new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Indent_Pixel") + ")")); JFormattedTextField endField = ((JSpinner.DefaultEditor)endPixSpinner.getEditor()).getTextField(); endField.setHorizontalAlignment(UITextField.LEFT); 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 8f3a920a98..3c5ebf4df9 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 @@ -63,7 +63,7 @@ public class GradientSelectBox extends BasicPane { } protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); } public void populate(GradientBackground background) { @@ -81,4 +81,4 @@ public class GradientSelectBox extends BasicPane { background.setStartColor(startColor); background.setEndColor(endColor); } -} \ No newline at end of file +} 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 452099908a..ca091cf940 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 @@ -55,7 +55,7 @@ public class ExpandFileChooser extends JFileChooser { bottomControlPanel.setPreferredSize(new Dimension(DEFAULT_WIDTH, 40)); approve = new UIButton(approveText); - cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Cancel")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 80d9098220..1e5e96ab1f 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 @@ -23,10 +23,10 @@ import java.util.Hashtable; public class ImageFileChooser extends ExpandFileChooser { public ImageFileChooser() { - super(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open")); + super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Compress"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open")); ExampleFileFilter bothFilter = new ExampleFileFilter( new String[]{"jpg", "gif", "png", "bmp"}, - com.fr.design.i18n.Toolkit.i18nText("Image-Image_Files")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Image_Files")); bothFilter.setExtensionListInDescription(true); this.addChoosableFileFilter(bothFilter); this.setAcceptAllFileFilterUsed(false); @@ -265,4 +265,4 @@ public class ImageFileChooser extends ExpandFileChooser { return useExtensionsInDescription; } } -} \ No newline at end of file +} 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 715fd18432..0e5cbe4635 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 @@ -108,7 +108,7 @@ public class ImagePreviewPane extends JComponent implements Scrollable, ImagePre public void paintComponent(Graphics g) { super.paintComponent(g); if (isLoading) { - g.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Image_Loading"), getWidth() / 2 - 25, getHeight() / 2); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 e63b6e2f15..5b845eae91 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 @@ -32,8 +32,8 @@ import java.io.File; */ public class ImageSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -3938766570998917557L; - private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default"); - private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Image-Titled"); + private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"); + private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled"); private String suffix = PictureCollection.DEFAULT_SUFFIX; @@ -66,7 +66,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { pane.add(testPane1); // 选择图片按钮 - UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture")); + UIButton selectPictureButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("Form-Layout") + ":")); + selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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) + com.fr.design.i18n.Toolkit.i18nText("px")); + + selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px")); } } @@ -159,6 +159,6 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Image-Select_Picture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 110a5c42e2..3eb990c318 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 @@ -50,7 +50,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.add(previewContainerPane, BorderLayout.CENTER); - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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 = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default")); + tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled")); + extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend")); + adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")); defaultRadioButton.addActionListener(layoutActionListener); tiledRadioButton.addActionListener(layoutActionListener); 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 b5973b1ed3..e0bf871f0f 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 @@ -49,9 +49,9 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane { } private void initButton() { - chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); + chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select")); chooseButton.addActionListener(selectPictureActionListener); - clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Clear")); + clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java index c399320347..ffb4e1eb0b 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 @@ -63,7 +63,7 @@ public class PatternBackgroundPane extends BPane { protected void setChildrenOfContentPane(JPanel contentPane) { // colors - JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Colors")); + JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Foreground") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":", foregroundColorPane)); colorPane.add(Box.createHorizontalStrut(8)); - colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Background") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":", backgroundColorPane)); } 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 503f7d3645..132ccf9832 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 @@ -1,16 +1,14 @@ package com.fr.design.style.background.pattern; -import java.awt.BorderLayout; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.background.PatternBackground; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Background; - import com.fr.design.style.background.BackgroundPane4BoxChange; import com.fr.design.style.color.ColorSelectBox; +import com.fr.general.Background; + +import javax.swing.JPanel; +import java.awt.BorderLayout; /** * @author kunsnat E-mail:kunsnat@gmail.com @@ -31,9 +29,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange { this.add(pane, BorderLayout.NORTH); pane.add(patternBox = new PatternSelectBox(80)); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":")); pane.add(foreColor = new ColorSelectBox(80)); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":")); pane.add(backColor = new ColorSelectBox(80)); } 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 1298e4b693..45e2a2b948 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 @@ -196,7 +196,7 @@ public class ColorChooserPreview extends JPanel { private String getSampleText() { if (this.sampleText == null) { - this.sampleText = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_SampleText"); + this.sampleText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sample_Text"); } return this.sampleText; } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java index d4ca574db3..14307ee535 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectConfigManager.java @@ -5,8 +5,7 @@ import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLableReader; -import java.awt.*; - +import java.awt.Color; import java.util.ArrayList; import java.util.List; @@ -17,10 +16,9 @@ import java.util.List; */ public class ColorSelectConfigManager implements XMLReadable { - // 最近使用的颜色个数 - private int colorNums = 20; + // 最大存储的最近使用的颜色个数 + private int colorNum = 20; - private boolean init = true; // 最近使用颜色 private List colors = new ArrayList(); private static final String RECENT_COLOR_TAG = "RecentColors"; @@ -33,35 +31,30 @@ public class ColorSelectConfigManager implements XMLReadable { } public int getColorNum() { - return colorNums; + return colorNum; } - public void setColorNum(int colorNums) { - this.colorNums = colorNums; + public void setColorNum(int colorNum) { + this.colorNum = colorNum; } - /** * 添加颜色到最近使用队列中 * * @param color 颜色 */ public void addToColorQueue(Color color) { - if(color == null){ + + // 将透明度不为 0% 的 颜色去掉 + if (color == null || color.getAlpha() != 0xff) { return; } + // 过滤重复的最近使用颜色 - // 因为有个后进先出的问题，最近使用的颜色需要放到最前面所以没用set - if (colors.contains(color)) { - colors.remove(color); - } + // 最近使用的颜色需要放到"最前面"，"最前面"是在面板部分做的，是 colors 的逆序，因此保证最新的放在 list 的最后， + colors.remove(color); colors.add(color); - /*@author yaohwu*/ - //将历史颜色信息保存到xml文件中去 - if (colors != null && !colors.isEmpty()) { - this.setColorsToFile(colors); - } } public void readXML(XMLableReader reader) { @@ -71,8 +64,11 @@ public class ColorSelectConfigManager implements XMLReadable { String tagName = reader.getTagName(); if (reader.isChildNode()) { if (ComparatorUtils.equals(COLOR_TAG, tagName)) { - Color color = null; - colors.add(reader.getAttrAsColor("colors", color)); + Color color = reader.getAttrAsColor("colors", null); + // 将透明度不为 0% 的 颜色去掉 + if (color != null && color.getAlpha() == 0xff) { + colors.add(color); + } } } } @@ -82,11 +78,18 @@ public class ColorSelectConfigManager implements XMLReadable { public void writeXML(XMLPrintWriter writer) { writer.startTAG(RECENT_COLOR_TAG); if (this.colors != null && !this.colors.isEmpty()) { - for (int i = 0; i < this.colors.size(); i++) { + // 只应该存储 max 个，其他颜色存了也没用 + // 从 colors 的尾部开始计算，从尾往头数 max 个，但是存储的时候还是要从头往尾 + int size = colors.size(); + + int beginIndex = size > colorNum ? size - colorNum : 0; + + for (int i = beginIndex; i < this.colors.size(); i++) { writer.startTAG(COLOR_TAG); writer.attr("colors", colors.get(i).getRGB()); writer.end(); } + } writer.end(); } 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 63ea7d4593..73dfe5ca92 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 @@ -56,7 +56,7 @@ public class ColorSelectDetailPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_Color"); } protected void initComponents() { @@ -78,7 +78,7 @@ public class ColorSelectDetailPane extends BasicPane { this.add(selectedPanel, BorderLayout.NORTH); // 最近使用面板 - recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Used")); + recentUsePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + previewPanel = FRGUIPaneFactory.createTitledBorderPaneCenter(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); final ColorChooserPreview colorChooserPreview = new ColorChooserPreview(); ColorSelectionModel model = selectedPanel.getSelectionModel(); model.addChangeListener(new ChangeListener() { @@ -101,4 +101,4 @@ public class ColorSelectDetailPane extends BasicPane { previewPanel.add(colorChooserPreview); this.add(previewPanel, BorderLayout.SOUTH); } -} \ No newline at end of file +} 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 0dc0ca42ba..b717ea67e7 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 @@ -1,5 +1,11 @@ package com.fr.design.style.color; +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 javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Dialog; @@ -9,13 +15,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.Serializable; -import javax.swing.JPanel; - -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; - /** * 颜色选择器更多颜色对话框 @@ -92,13 +91,13 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.add(buttonPane, BorderLayout.SOUTH); - 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")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel")); buttonPane.add(ok); buttonPane.add(cancel); - ok.setActionCommand("Fine-Design_Report_OK"); + ok.setActionCommand("OK"); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { seletePane.setColor(okListener.getColor()); 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 a0dd8fb556..bb902fa930 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); + UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); this.add(transpanrentButton, BorderLayout.NORTH); transpanrentButton.addActionListener(new ActionListener() { 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 6aca12ffcf..b2dafe6fa9 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 @@ -53,7 +53,7 @@ public class ColorUIComboBoxPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 581fdeeaa6..a6c4195c29 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 @@ -22,7 +22,6 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; import com.fr.design.gui.ibutton.SpecialUIButton; -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.gui.islider.UISlider; @@ -492,7 +491,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec * @return The name displayed in the JColorChooser tab. */ public String getDisplayName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 88e2413417..4245c1293b 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Color")); + JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Preview")); + UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 dcb6119f33..fec4993221 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); + UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); this.add(transpanrentButton, BorderLayout.NORTH); transpanrentButton.addActionListener(new ActionListener() { 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 e8500ad58b..120a0c2134 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 @@ -577,7 +577,7 @@ public class SwatchChooserPanel extends AbstractColorChooserPanel{ */ public String getDisplayName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Swatch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 5e63ac72db..f9d9658c5e 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 @@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane { // richer:能否拖动 if (isSupportTransparent) { - UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ChartF-Transparency")); + UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Custom") + UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/BrowseUtils.java b/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java new file mode 100644 index 0000000000..4de2705715 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java @@ -0,0 +1,62 @@ +package com.fr.design.utils; + +import com.fr.base.FRContext; +import com.fr.log.FineLoggerFactory; +import com.fr.stable.OperatingSystem; +import com.fr.stable.StringUtils; + +import javax.swing.JOptionPane; +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +/** + * Created by XINZAI on 2018/8/23. + */ +public class BrowseUtils { + + /** + * 处理内存异常，win10下用rundll32打开 + * @param uri 网址 + * @param e + */ + private static void startBrowserFromCommand(String uri, IOException e) { + + if (OperatingSystem.isWindows()) { + try { + // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开. + Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri); + } catch (IOException ee) { + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate")); + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } else { + FineLoggerFactory.getLogger().error(e.getMessage(), e); + } + } + + /** + * 打开网页,用默认浏览器 + * @param url 网址 + */ + public static void browser(String url) { + + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + startBrowserFromCommand(url, exp); + } catch (URISyntaxException exp) { + FineLoggerFactory.getLogger().error(exp.getMessage(), exp); + } catch (Exception exp) { + FineLoggerFactory.getLogger().error(exp.getMessage(), exp); + FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + url); + } + } + + +} 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 d0d0b859d5..240176eef7 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 @@ -227,7 +227,7 @@ public class DesignUtils { //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整. Locale designerLocale = GeneralContext.getLocale(); - String file = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"); + String file = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"); char displayChar = file.charAt(0); if (!guiFRFont.canDisplay(displayChar)) { //如果不能用默认的语言显示字体, 比如想在英文系统里用中文设计器 diff --git a/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java b/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java new file mode 100644 index 0000000000..374f953b99 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/utils/gui/FunctionClassMappingUtils.java @@ -0,0 +1,43 @@ +package com.fr.design.utils.gui; + +import com.fr.stable.StringUtils; + +/** + * @author： Harrison + * @date： 2018/08/28 + * @description: 为 Function 类的名字做匹配, 从而方便国际化的类 + **/ +public enum FunctionClassMappingUtils { + DataFunction_Sum("Sum", "Fine-Design_DataFunction_Sum"), + DataFunction_Average("Average","Fine-Design_DataFunction_Average"), + DataFunction_Max("Max","Fine-Design_DataFunction_Max"), + DataFunction_Min("Min","Fine-Design_DataFunction_Min"), + DataFunction_Count("Count","Fine-Design_DataFunction_Count"), + DataFunction_None("None","Fine-Design_DataFunction_None"); + + private final String functionClassName; + private final String localeKey; + + FunctionClassMappingUtils(String functionClassName, String localeKey) { + this.functionClassName = functionClassName; + this.localeKey = localeKey; + } + + public String getFunctionClassName() { + return functionClassName; + } + + public String getLocaleKey() { + return localeKey; + } + + public static String getLocaleKey(String functionClassName) { + for (FunctionClassMappingUtils value : FunctionClassMappingUtils.values()) { + if (StringUtils.equals(value.getFunctionClassName(), functionClassName)) { + return value.getLocaleKey(); + } + } + return functionClassName; + } + +} 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 e3cb5597bc..1a79fe22cf 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 @@ -684,7 +684,7 @@ public abstract class GUICoreUtils{ return false; } - 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"), + int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { int minSelectedIndex = nodeList.getMinSelectionIndex(); @@ -891,4 +891,4 @@ public abstract class GUICoreUtils{ panel.add(dynamicPaneWrapper, BorderLayout.CENTER); return panel; } -} \ No newline at end of file +} 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 c9ee82253c..90d5874ecb 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 @@ -68,7 +68,7 @@ public class CustomIconPane extends BasicPane { private void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon"))); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))); JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); centerPane.add(noNamePane, BorderLayout.CENTER); @@ -85,7 +85,7 @@ public class CustomIconPane extends BasicPane { noNamePane.add(jsPane); DescriptionTextArea des = new DescriptionTextArea(2); - des.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message1")); + des.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message1")); centerPane.add(des, BorderLayout.SOUTH); this.add(centerPane, BorderLayout.CENTER); @@ -126,7 +126,7 @@ public class CustomIconPane extends BasicPane { } private void initAddButton(JPanel buttonPane) { - UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); + UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); addButton.setPreferredSize(new Dimension(80, 25)); addButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -143,7 +143,7 @@ public class CustomIconPane extends BasicPane { }else { // add failed - 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); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } }).setVisible(true); @@ -154,7 +154,7 @@ public class CustomIconPane extends BasicPane { } private void initRemoveButton(JPanel buttonPane) { - removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove")); + removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")); removeButton.setPreferredSize(new Dimension(80, 25)); removeButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -173,8 +173,8 @@ public class CustomIconPane extends BasicPane { } else { // remove failed JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message2"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } @@ -183,7 +183,7 @@ public class CustomIconPane extends BasicPane { } private void initEditButton(JPanel buttonPane) { - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension(80, 25)); editButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -221,7 +221,7 @@ public class CustomIconPane extends BasicPane { // 失败了再弄回去 iconManager.addIcon(oldIcon, true); // edit failed - 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); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } }).setVisible(true); @@ -245,7 +245,7 @@ public class CustomIconPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon"); } /** @@ -387,9 +387,9 @@ public class CustomIconPane extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p, p}; - UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_SelectIcon")); + UIButton browseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_SelectIcon")); browseButton.setPreferredSize(new Dimension(80, 25)); - browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Click_this_button")); + browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button")); nameTextField = new UITextField(20); browseButton.addActionListener(new ActionListener() { @@ -409,8 +409,8 @@ public class CustomIconPane extends BasicPane { } if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Icon_Message3"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message3"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } @@ -422,7 +422,7 @@ public class CustomIconPane extends BasicPane { showImageLabel.setPreferredSize(new Dimension(20,20)); imagePane.add(showImageLabel); imagePane.add(browseButton); - 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}}; + Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}}; JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(centerPane, BorderLayout.CENTER); 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 0ca2ed0b57..38a55865ad 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 @@ -6,10 +6,8 @@ import com.fr.design.gui.controlpane.NameableSelfCreator; import com.fr.design.gui.controlpane.UnrepeatedNameHelper; 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.NameObject; +import com.fr.report.web.util.ReportEngineEventMapping; import com.fr.stable.Nameable; public class EventCreator extends NameableSelfCreator { @@ -36,11 +34,14 @@ public class EventCreator extends NameableSelfCreator { } /* - * richer:国际化事件名称，所有需要国际化的事件都应按格式FR-Engine_Event_eventName来进行国际化 + * richer:国际化事件名称，所有需要国际化的事件都应根据使用的位置 + * 按格式 Fine-模块_xx 来进行国际化 */ public static final String switchLang(String eventName) { try { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Event_" + eventName); + // 通过映射 ， 找到相对应的 properties 文件中的 key 值 + String localeKey = ReportEngineEventMapping.getLocaleName(eventName); + return com.fr.design.i18n.Toolkit.i18nText(localeKey); } 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 069caec0b2..69805979ba 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); + removeIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); iconButtonPane.add(removeIconButton); removeIconButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -89,4 +89,4 @@ public class IconDefinePane extends BasicPane { public String update() { return this.curIconName; } -} \ No newline at end of file +} 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 9133fd8fec..4bbbcecfbc 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 @@ -25,8 +25,8 @@ public class WidgetBoundsPaneFactory { double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - 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))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(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))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Position")), createRightPane(x, y)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER))}, }; Component[][] centerComponents = new Component[][]{ - 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))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)}, + new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Width"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size")), width}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 36990287e9..9be9a8fba4 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 @@ -28,12 +28,12 @@ public class ButtonConstants { }; public static final String[] TYPES4BUTTON = { - 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_Report_Common"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_TreeNode") }; public static final Class[] CLASSES4BUTTON = { 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 db3e0ce0d6..b75aeaa81f 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 @@ -43,10 +43,10 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt iconPane = new AccessibleIconEditor(); labelPane.add(iconPane); Component[][] n_components = { - {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()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 54b7bf67b7..99e642425b 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 @@ -34,7 +34,7 @@ public abstract class BackgroundCompPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel headLabel = createUILable(); initBackgroundEditor(); - String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; + String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")), initialBackgroundEditor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")); } protected UILabel createUILable(){ - return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 623ff35649..9a76352f94 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 @@ -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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")), delimiterComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox} }; returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); - returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Widget-Array"), com.fr.design.i18n.Toolkit.i18nText("String")}); + returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("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("Fine-Design_Basic_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); @@ -87,4 +87,4 @@ public class CheckBoxDictPane extends JPanel { checkBoxGroup.setStartSymbol((String)this.startComboBox.getSelectedItem()); checkBoxGroup.setEndSymbol((String)this.endComboBox.getSelectedItem()); } -} \ No newline at end of file +} 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 ddcb98f86f..656b42283c 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 @@ -22,7 +22,7 @@ public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); - private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); + private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"); 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 2b43ac4a77..78accb96b3 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 @@ -60,12 +60,12 @@ public class NumberEditorValidatePane extends JPanel { this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Negative")); this.allowNegativeCheckBox.addActionListener(allowNegativeListener); allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Max_Value"), false); + this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Need_Min_Value"), false); + this.setMinValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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); @@ -98,7 +98,7 @@ public class NumberEditorValidatePane extends JPanel { private void initErrorMsgPane() { errorMsgTextField = new UITextField(); errorMsgTextFieldPane = TableLayoutHelper.createGapTableLayoutPane( - 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); + new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 7d1b5a43cb..20b82467bb 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 @@ -23,7 +23,7 @@ public class WidgetMobilePane extends JPanel { protected void init() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 956b9878c3..543ad98e9a 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 @@ -37,14 +37,14 @@ public abstract class CustomJobPane extends BasicBeanPane { classNameTextField = new UITextField(getLengthOfTextField()); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); browserButton.setPreferredSize(new Dimension( - GraphHelper.getLocTextWidth("FR-Designer_Select") + 20, + GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20, classNameTextField.getPreferredSize().height)); - UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension( - GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20, + GraphHelper.getLocTextWidth("Fine-Design_Basic_Edit") + 20, classNameTextField.getPreferredSize().height)); reportletNamePane.add(browserButton); @@ -85,18 +85,18 @@ public abstract class CustomJobPane extends BasicBeanPane { } }); - reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ClassName"), null)); + reportletNamePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Name"), null)); this.add(reportletNamePane, BorderLayout.NORTH); objectProperiesPane = new ObjectProperiesPane(); - objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Property"), null)); + objectProperiesPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"), null)); this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); dsPane.add(area); - dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null)); + dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 48e0e025d7..2e36ea5d8a 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 @@ -108,7 +108,7 @@ public class DBManipulationPane extends BasicBeanPane { private static final String[] DML_CONFIG_TYPES = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Delete_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Insert_Submit"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Update_Submit")}; /** @@ -181,13 +181,13 @@ public class DBManipulationPane extends BasicBeanPane { checkBoxUpdatePane.setPreferredSize(new Dimension(120,20)); controlBtnPane.add(checkBoxUpdatePane); - UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified")); + UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified")); UIButton helpButton = new UIButton(HEIP_ICON); helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help")); helpButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); + FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Help"), 12f); BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this), new DialogActionAdapter(){}); dlg.setVisible(true); @@ -238,7 +238,7 @@ public class DBManipulationPane extends BasicBeanPane { } private UIButton addEventButton() { - UIButton addSubmitEventButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Event")); + UIButton addSubmitEventButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Event")); addSubmitEventButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -275,7 +275,7 @@ public class DBManipulationPane extends BasicBeanPane { JScrollPane jp = new JScrollPane(conditionsTree); addComponent(conditionPane,jp); - UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_Submit_Condition")); + UIButton addSubmitConditionButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Condition")); addSubmitConditionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -410,7 +410,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class SmartAddFieldsAction extends UpdateAction { public SmartAddFieldsAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Smart_Add_Fields")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Smart_Add_Fields")); } public void actionPerformed(ActionEvent evt) { @@ -418,12 +418,12 @@ public class DBManipulationPane extends BasicBeanPane { BasicPane bPane = new BasicPane() { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("RWA-Smart_Add_Fields"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Smart_Add_Fields"); } }; bPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Field_Name")) { + final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name")) { public String value2Text(Object value) { if (value instanceof ColumnName) { return ((ColumnName)value).name; @@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane { } for (int j = 0; j < keyColumnNameValueList.size(); j++) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { - Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; + Object[] options = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_None") }; returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); @@ -551,7 +551,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class AddFieldAction extends UpdateAction { public AddFieldAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Add_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Add_Field")); } public void actionPerformed(ActionEvent e) { @@ -568,7 +568,7 @@ public class DBManipulationPane extends BasicBeanPane { protected class RemoveFieldAction extends UpdateAction { public RemoveFieldAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("RWA-Remove_Field")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_RWA_Remove_Field")); } public void actionPerformed(ActionEvent evt) { @@ -815,7 +815,7 @@ public class DBManipulationPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Values-Editor"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Values_Editor"); } public void populateBean(Object object) { @@ -944,7 +944,7 @@ public class DBManipulationPane extends BasicBeanPane { } protected abstract static class KeyColumnTableModel extends AbstractTableModel { - public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA-Key"); + public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA_Key"); public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Column"); public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_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 face6e7d1a..d52eb4a653 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 @@ -57,6 +57,6 @@ public class SubmitJobListPane extends ObjectJControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Submit_Event"); } } 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 61a4dfcd41..30b4b76f12 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -53,16 +53,16 @@ public class EnvListPane extends JListControlPane { */ @Override public NameableCreator[] createNameableCreators() { - NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", + NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png", LocalDesignerWorkspaceInfo.class, LocalEnvPane.class); - NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png", + NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace"); } /** @@ -103,9 +103,4 @@ public class EnvListPane extends JListControlPane { } return this.getSelectedName(); } - - @Override - protected boolean filterNameableCreator(NameableCreator creator) { - return false; - } } 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 84a47acd6d..eaabd0a9a4 100644 --- a/designer-base/src/main/java/com/fr/env/LocalEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/LocalEnvPane.java @@ -33,7 +33,7 @@ public class LocalEnvPane extends BasicBeanPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(northPane, BorderLayout.NORTH); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Env-Des1")); + description.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Des1")); description.setEditable(false); } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Location"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 408dc6c5dc..31cbabd14c 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -72,7 +72,7 @@ public class RemoteEnvPane extends BasicBeanPane { /** * 是否启用 https 勾选框 */ - private UICheckBox httpsCheckbox = new UICheckBox(Toolkit.i18nText("FR-Designer_RemoteEnv_Enable_Https")); + private UICheckBox httpsCheckbox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Enable_Https")); /** * 主机位置输入框 */ @@ -124,11 +124,11 @@ public class RemoteEnvPane extends BasicBeanPane { /** * https 密钥标签 */ - private UILabel certSecretKeyLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Secret_Key")); + private UILabel certSecretKeyLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Secret_Key")); /** * https证书路径标签 */ - private UILabel certPathLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Cert_Path")); + private UILabel certPathLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Cert_Path")); /** * https 证书路径输入框 */ @@ -207,7 +207,7 @@ public class RemoteEnvPane extends BasicBeanPane { contentPanel.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("FR-Designer_RemoteEnv_Config"))) + UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Config"))) ); @@ -218,7 +218,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - Toolkit.i18nText("FR-Designer_RemoteEnv_Server") + Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server") ) ) ); @@ -237,7 +237,7 @@ public class RemoteEnvPane extends BasicBeanPane { new EmptyBorder(15, 0, 0, 0), BorderFactory.createTitledBorder( new ModLineBorder(ModLineBorder.TOP), - Toolkit.i18nText("FR-Designer_RemoteEnv_Platform_Account") + Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Platform_Account") ) )); @@ -248,9 +248,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(Toolkit.i18nText("FR-Designer_RemoteEnv_Test_Connection")); + UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection")); - testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection")); + testConnectionButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection")); testConnectionButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent ev) { @@ -323,19 +323,19 @@ public class RemoteEnvPane extends BasicBeanPane { // 主机名 - UILabel hostNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Host_IP")); + UILabel hostNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Host_IP")); hostNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 端口 - UILabel portLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Port")); + UILabel portLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Port")); portLabel.setHorizontalAlignment(SwingConstants.RIGHT); // web应用 - UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Web_Name")); + UILabel webAppNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Web_Name")); webAppNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // servlet - UILabel servletNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Servlet_Name")); + UILabel servletNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Servlet_Name")); servletNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 主机位置 - UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_URL")); + UILabel remoteEnvURLLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_URL")); remoteEnvURLLabel.setHorizontalAlignment(SwingConstants.RIGHT); enableSubDocListener(); @@ -359,7 +359,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane urlTipsPane = new JTextPane(); urlTipsPane.setEditable(false); - urlTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Server_Config_Tips")); + urlTipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Server_Config_Tips")); urlTipsPane.setBackground(urlPanel.getBackground()); urlTipsPane.setForeground(TIPS_FONT_COLOR); @@ -373,7 +373,7 @@ public class RemoteEnvPane extends BasicBeanPane { JTextPane httpsTipsPane = new JTextPane(); httpsTipsPane.setEditable(false); - httpsTipsPane.setText(Toolkit.i18nText("FR-Designer_RemoteEnv_Https_Tips")); + httpsTipsPane.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Https_Tips")); httpsTipsPane.setBackground(configPanel.getBackground()); httpsTipsPane.setForeground(TIPS_FONT_COLOR); @@ -453,10 +453,10 @@ public class RemoteEnvPane extends BasicBeanPane { private void packAccountPanel(JPanel accountPanel) { // 用户名 - UILabel userNameLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Username")); + UILabel userNameLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Username")); userNameLabel.setHorizontalAlignment(SwingConstants.RIGHT); // 密码 - UILabel passwordLabel = new UILabel(Toolkit.i18nText("FR-Designer_RemoteEnv_Account_Password")); + UILabel passwordLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Account_Password")); passwordLabel.setHorizontalAlignment(SwingConstants.RIGHT); //输入密码的时候检测下大写锁定 @@ -464,7 +464,7 @@ public class RemoteEnvPane extends BasicBeanPane { @Override public void mouseEntered(MouseEvent e) { if (java.awt.Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) { - passwordInput.setToolTipText(Toolkit.i18nText("CapsLock")); + passwordInput.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_CapsLock")); } else { passwordInput.setToolTipText(null); } @@ -587,7 +587,7 @@ public class RemoteEnvPane extends BasicBeanPane { message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); - dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Datasource-Test_Connection"), true); + dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_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 047f4e5f74..99b0fe0699 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java @@ -22,9 +22,9 @@ public class RemoteSignInPane extends BasicPane { public void initComponent(){ this.setLayout(FRGUIPaneFactory.create2ColumnGridLayout()); - userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Username")+":"); + userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName")+":"); userTextField = new UITextField(); - passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password")+":"); + passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password")+":"); passwordField = new UIPassWordField(); this.add(userLabel); this.add(userTextField); @@ -44,4 +44,4 @@ public class RemoteSignInPane extends BasicPane { // this.showWindow(null).setVisible(false); // this.showWindow(null).dispose(); } -} \ No newline at end of file +} 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 e5ae775a88..3629dfdf9b 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -243,11 +243,11 @@ public class FILEChooserPane extends BasicPane { // 用createTableLayoutPane布局下fileNamePane Component[][] coms = new Component[][]{ - 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(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_File_Name") + ":"), BorderLayout.WEST), + fileNameTextField = new UIAutoCompletionField(), okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open")) }, - 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")) + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_File_Type") + ":"), BorderLayout.WEST), + postfixComboBox = new UIComboBox(), cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_Action_Cancel")) }}; JPanel fileNamePane = TableLayoutHelper.createGapTableLayoutPane(coms, new double[]{TableLayout.PREFERRED, TableLayout.PREFERRED, @@ -334,7 +334,7 @@ public class FILEChooserPane extends BasicPane { } protected String getEnvProjectName() { - return com.fr.design.i18n.Toolkit.i18nText("Utils-Report-Env_Directory"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Report_Env_Directory"); } /** @@ -561,24 +561,24 @@ public class FILEChooserPane extends BasicPane { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } else { if (type == JFileChooser.OPEN_DIALOG) { - this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); + this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Excel_Source"))); } } // 添加 xls 文件类型过滤 kt if (WorkContext.getCurrent().isLocal()) { //本地连接 - 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"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Excel_Source"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Excel2007_Source"))); } if (FileExtension.PNG.matchExtension(suffix)) { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Export_png"))); } if (type == JFileChooser.SAVE_DIALOG) { - 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"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Export_PDF"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Export_SVG"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Export_CSV"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Export_Word"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Import_Export_Text"))); } } @@ -591,7 +591,7 @@ public class FILEChooserPane extends BasicPane { } if (WorkContext.getCurrent().isLocal()) { //本地连接 if (!showWebReport) { - defaultComboBoxModel.addElement(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-App_AllFiles") + "(*.*)"); + defaultComboBoxModel.addElement(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_App_AllFiles") + "(*.*)"); } } // 默认选取的文件类型(.cpt)类型 @@ -692,7 +692,7 @@ public class FILEChooserPane extends BasicPane { return; } if (selectedFile.exists()) { - int selVal = JOptionPane.showConfirmDialog(dialog, com.fr.design.i18n.Toolkit.i18nText("FR-Utils-Would_you_like_to_cover_the_current_file") + " ?", + int selVal = JOptionPane.showConfirmDialog(dialog, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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; @@ -741,7 +741,7 @@ public class FILEChooserPane extends BasicPane { * dialog的名字 */ private String dialogName() { - return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Save"); + return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Design_File_Open") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Save"); } /* @@ -1410,7 +1410,7 @@ public class FILEChooserPane extends BasicPane { return; } - String res = JOptionPane.showInputDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-Please_Input_a_New_Name")); + String res = JOptionPane.showInputDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Please_Input_A_New_Name")); if (res != null) { currentDirectory.createFolder(res); @@ -1444,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(com.fr.design.i18n.Toolkit.i18nText("FR-Utils-New_Folder")); + folderButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 2575e2864b..f64f961cb7 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -100,7 +100,7 @@ public class FileNodeFILE implements FILE { } if (ComparatorUtils.equals(node.getEnvPath(), ProjectConstants.REPORTLETS_NAME)) { - return com.fr.design.i18n.Toolkit.i18nText("Utils-Report_Runtime_Env"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 12f4b48eb9..2141870b1c 100644 --- a/designer-base/src/main/java/com/fr/start/ServerStarter.java +++ b/designer-base/src/main/java/com/fr/start/ServerStarter.java @@ -1,34 +1,15 @@ package com.fr.start; -import com.fr.base.FRContext; import com.fr.base.ServerConfig; -import com.fr.design.DesignModelAdapter; import com.fr.design.DesignerEnvManager; -import com.fr.design.data.datapane.TableDataTreePane; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.DialogActionAdapter; -import com.fr.design.env.DesignerWorkspaceGenerator; -import com.fr.design.file.TemplateTreePane; -import com.fr.design.gui.itextarea.UITextArea; -import com.fr.design.mainframe.DesignerContext; +import com.fr.design.utils.BrowseUtils; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; - -import com.fr.log.FineLoggerFactory; -import com.fr.stable.OperatingSystem; -import com.fr.stable.ProductConstants; import com.fr.stable.StableUtils; -import com.fr.stable.StringUtils; import com.fr.start.server.FineEmbedServer; import com.fr.workspace.WorkContext; -import javax.swing.*; -import java.awt.*; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; - public class ServerStarter { /** @@ -39,7 +20,7 @@ public class ServerStarter { if (!WorkContext.getCurrent().isLocal()) { //有问题，这里拿不到远程的http端口 - browser(WorkContext.getCurrent().getPath()); + BrowseUtils.browser(WorkContext.getCurrent().getPath()); } else if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用 String web = GeneralContext.getCurrentAppNameOfEnv(); @@ -57,7 +38,7 @@ public class ServerStarter { FineEmbedServer.start(); } finally { //先访问Demo, 后访问报表, 不需要重置服务器. - browser("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName()); + BrowseUtils.browser("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + GeneralContext.getCurrentAppNameOfEnv() + "/" + ServerConfig.getInstance().getServletName()); } } @@ -69,42 +50,6 @@ public class ServerStarter { public static void browserURLWithLocalEnv(String url) { FineEmbedServer.start(); - browser(url); + BrowseUtils.browser(url); } - - private static void browser(String uri) { - - if (StringUtils.isEmpty(uri)) { - FRContext.getLogger().info("The URL is empty!"); - return; - } - try { - Desktop.getDesktop().browse(new URI(uri)); - - } catch (IOException e) { - startBrowserFromCommand(uri, e); - } catch (URISyntaxException e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); - } catch (Exception e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); - FineLoggerFactory.getLogger().error("Can not open the browser for URL: " + uri); - } - } - - private static void startBrowserFromCommand(String uri, IOException e) { - - if (OperatingSystem.isWindows()) { - try { - // win10 内存用到到80%左右的时候, Desktop.browser经常提示"存储空间不足, 无法处理改命令", 用rundll32可以打开. - Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri); - } catch (IOException ee) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); - FineLoggerFactory.getLogger().error(e.getMessage(), e); - } - } else { - FineLoggerFactory.getLogger().error(e.getMessage(), e); - } - } - - -} \ No newline at end of file +} 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 6f88b0b2a8..3b15071790 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Server-Start"))); + startPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Server-Stop"))); + stopPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Log") + ":"), BorderLayout.WEST); + infoPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Open")); + openButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server")); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server")); GUICoreUtils.centerWindow(this); } @@ -146,4 +146,4 @@ public class ServerManageFrame extends JFrame { this.validate(); } -} \ No newline at end of file +} 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 af8c322bc1..ce2da0407d 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 @@ -38,7 +38,7 @@ public class ServerTray { listen(); //p:首先构建右键菜单 PopupMenu popup = new PopupMenu(); - MenuItem manangeMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Server-Open_Service_Manager")); + MenuItem manangeMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(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")); + startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start")); + stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop")); + MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit")); //创建打开监听器 ActionListener startListener = new ActionListener() { @@ -96,7 +96,7 @@ public class ServerTray { popup.add(exitMenu); //p:开始创建托盘. - trayIcon = new TrayIcon(trayStartedImage, com.fr.design.i18n.Toolkit.i18nText("Server-Embedded_Server"), popup); + trayIcon = new TrayIcon(trayStartedImage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server"), popup); trayIcon.setImageAutoSize(true); trayIcon.addMouseListener(new MouseAdapter() { diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png b/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png new file mode 100644 index 0000000000..4fd2df684a Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/bbs.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png b/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png new file mode 100644 index 0000000000..24393bc4be Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/bug.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/center.png b/designer-base/src/main/resources/com/fr/design/images/bbs/center.png new file mode 100644 index 0000000000..1d464ba9bf Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/center.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png b/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png new file mode 100644 index 0000000000..b237026fa1 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/demand.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/help.png b/designer-base/src/main/resources/com/fr/design/images/bbs/help.png new file mode 100644 index 0000000000..c13f2f1926 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/help.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/need.png b/designer-base/src/main/resources/com/fr/design/images/bbs/need.png new file mode 100644 index 0000000000..486ff9846a Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/need.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/question.png b/designer-base/src/main/resources/com/fr/design/images/bbs/question.png new file mode 100644 index 0000000000..c8c6fd8a1b Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/question.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png b/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png new file mode 100644 index 0000000000..b1556f7ed1 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/sign.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png new file mode 100644 index 0000000000..f092306746 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/solution.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/bbs/video.png b/designer-base/src/main/resources/com/fr/design/images/bbs/video.png new file mode 100644 index 0000000000..1971f26156 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/bbs/video.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Design_Report_Poly_Report_Block.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Design_Report_Poly_Report_Block.png new file mode 100644 index 0000000000..5b8f0ff2f6 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Design_Report_Poly_Report_Block.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png new file mode 100644 index 0000000000..2f68dcf8f9 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_Drill_Map.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Area.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bar.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png new file mode 100644 index 0000000000..e1ab5c3131 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Bubble.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Column.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png new file mode 100644 index 0000000000..9ff66acafd Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Combine.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png new file mode 100644 index 0000000000..c23759fba9 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Funnel.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png new file mode 100644 index 0000000000..2c62da86be Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Gauge.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Line.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png new file mode 100644 index 0000000000..2f68dcf8f9 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Map.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png new file mode 100644 index 0000000000..b6bca9a3eb Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_MultiPie.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Pie.png diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png new file mode 100644 index 0000000000..754781f9fd Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Radar.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png new file mode 100644 index 0000000000..24a2aaa3e9 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_Scatter.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png new file mode 100644 index 0000000000..09edd2b77e Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Fine-Engine_Chart_New_TreeMap.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon0.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon0.png new file mode 100644 index 0000000000..242c0c85bc Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon0.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon1.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon1.png new file mode 100644 index 0000000000..9f6f63438e Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon1.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon10.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon10.png new file mode 100644 index 0000000000..c4ef4a1fc6 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon10.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon11.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon11.png new file mode 100644 index 0000000000..6eca1f5e4e Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon11.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon12.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon12.png new file mode 100644 index 0000000000..e447ee8ac2 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon12.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon13.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon13.png new file mode 100644 index 0000000000..848a6f1a41 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon13.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon14.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon14.png new file mode 100644 index 0000000000..7b3561df21 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon14.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon2.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon2.png new file mode 100644 index 0000000000..c866e62a7c Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon2.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon3.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon3.png new file mode 100644 index 0000000000..9be22fa586 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon3.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon4.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon4.png new file mode 100644 index 0000000000..f07c20dc44 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon4.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon5.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon5.png new file mode 100644 index 0000000000..653fc9c3be Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon5.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon6.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon6.png new file mode 100644 index 0000000000..703557264f Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon6.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon7.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon7.png new file mode 100644 index 0000000000..49fbc6ec54 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon7.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon8.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon8.png new file mode 100644 index 0000000000..e1a5a40938 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon8.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/busy-icon9.png b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon9.png new file mode 100644 index 0000000000..827801235b Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/busy-icon9.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/update/update_new.png b/designer-base/src/main/resources/com/fr/design/images/update/update_new.png new file mode 100644 index 0000000000..c4b2b231c0 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/update/update_new.png differ diff --git a/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png new file mode 100644 index 0000000000..9020a3ce99 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal.png differ diff --git a/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png new file mode 100644 index 0000000000..912429fc9d Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/remote/images/icon_tab_close_normal@2x.png differ diff --git a/designer-chart/pom.xml b/designer-chart/pom.xml index 472b1e62ba..8d5e30e1c3 100644 --- a/designer-chart/pom.xml +++ b/designer-chart/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file 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 06e74b39ca..5d54adff73 100644 --- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java @@ -278,6 +278,14 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr } return name; } + + public String getTitle4PopupWindow(String plotID) { + IndependentChartUIProvider provider = getChartTypeInterface(plotID); + if (provider != null) { + return provider.getPlotTypeTitle4PopupWindow(); + } + return StringUtils.EMPTY; + } /** * 获取指定图表的标题 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 eb1c266bdc..e0493cc70d 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 @@ -30,13 +30,13 @@ public class ChartControlPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Chart"), Chart.class, ChartTypeUpdatePane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"), Chart.class, ChartTypeUpdatePane.class) }; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Manage_Chart_Type"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 8e13f0e9d9..a7dd9f5641 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 @@ -56,7 +56,7 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); - cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 028591d550..b4efa05a4f 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 @@ -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, com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Not_Supported")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Not_Supported")); throw new RegistEditionException(VT4FR.ChartMap); } 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 124a582e42..184545f5d6 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 @@ -11,10 +11,10 @@ package com.fr.design.chart.axis; public class ChartAlertValueInTopBottomPane extends ChartAlertValuePane { protected String getLeftName() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Bottom"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Bottom"); } protected String getRightName() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Alert_Top"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Top"); } } \ No newline at end of file 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 8b17587a4e..becfb8c826 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 @@ -25,8 +25,8 @@ import com.fr.design.dialog.BasicPane; * Time : 上午8:48 */ public abstract class ChartStyleAxisPane extends BasicPane implements ListSelectionListener { - 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 CATE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category"); + protected static final String VALUE_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis"); protected static final String SECOND_AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis"); private JList mainList; private CardLayout cardLayout; 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 f3e26baeff..595cecd3cf 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 @@ -14,6 +14,6 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { } protected String getSecondValueAxisName() { - return com.fr.design.i18n.Toolkit.i18nText("Second_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 afc2942f82..5e061822c6 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 @@ -19,7 +19,7 @@ public class GanntChartStyleAxisPane extends BinaryChartStyleAxisPane { protected AxisStyleObject getXAxisPane(Plot plot) { ChartCategoryPane categoryPane = new ChartCategoryPane(); categoryPane.getAxisValueTypePane().removeTextAxisPane(); - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"), categoryPane); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis"), categoryPane); } protected AxisStyleObject getYAxisPane(Plot plot) { 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 922eaf3a0c..ab970073de 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 @@ -17,10 +17,10 @@ public class XYChartStyleAxisPane extends BinaryChartStyleAxisPane { } protected AxisStyleObject getXAxisPane(Plot plot) { - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), new ChartValuePane()); } protected AxisStyleObject getYAxisPane(Plot plot) { - return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), new ChartValuePane()); + return new AxisStyleObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 de2d67cb5c..59f1e397a1 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 @@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane { private ColorSelectBox colorSelectBox; public BorderAttriPane() { - this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); + this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")); } public BorderAttriPane(String lineString, String colorSting) { 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 0dd5e0a789..cb35fea8fb 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 @@ -20,7 +20,7 @@ public class SetDataSheetAction extends ChartComponentAction { public SetDataSheetAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Chart_Set_Data_Sheet")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 e88772db55..abc137bd83 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 @@ -19,7 +19,7 @@ public class SetLegendStyleAction extends ChartComponentAction { public SetLegendStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Set_Legend_Sytle")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Legend_Sytle")); } public void actionPerformed(ActionEvent e) { @@ -29,4 +29,4 @@ public class SetLegendStyleAction extends ChartComponentAction { public void showLegendStylePane() { DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LEGNED_TITLE); } -} \ No newline at end of file +} 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 e61c347526..a27bf328e1 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 @@ -14,12 +14,12 @@ import javax.swing.*; import java.awt.*; /** - * + * * @author jim * */ public class ChartEmailPane extends EmailPane{ - + private UITextField itemNameTextField; @Override @@ -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(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content")); + showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content")); contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - 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()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), 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(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()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), 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(com.fr.design.i18n.Toolkit.i18nText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},}, + JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":", SwingConstants.RIGHT), itemNameTextField},}, new double[] {preferred}, columnSize, 6); centerPane.add(namePane, BorderLayout.NORTH); } @@ -65,26 +65,26 @@ public class ChartEmailPane extends EmailPane{ protected boolean needRenamePane() { return true; } - + protected void checkEmailConfig(boolean valid) { super.checkEmailConfig(valid); if(itemNameTextField != null){ itemNameTextField.setEnabled(valid); } } - + public void populateBean(EmailJavaScript ob) { if(itemNameTextField != null){ itemNameTextField.setName(ob == null ? null : ob.getItemName()); } super.populateBean(ob); } - + public void updateBean(EmailJavaScript email) { if(itemNameTextField != null){ email.setItemName(itemNameTextField.getText()); } super.updateBean(email); } - + } \ No newline at end of file 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 13d66c6e6f..ae46f709e6 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 @@ -58,7 +58,7 @@ public class GisMapDataPane extends DataContentsPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Gis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Map"); } 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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":"), jcb}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":"), jcb}, } ; JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 0); @@ -130,7 +130,7 @@ public class GisMapDataPane extends DataContentsPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 55063796a4..b35f40c552 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 @@ -51,8 +51,8 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(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")}); + addressType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_First")}); addressPane = new TinyFormulaPane(); addressNamePane = new TinyFormulaPane(); double p = TableLayout.PREFERRED; @@ -70,7 +70,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane(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 = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LatLng")}); + lnglatOrder = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude_First"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude_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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); 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 c0f488d09f..b8a18b1521 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 @@ -303,7 +303,7 @@ public class MapCubeLayerPane extends BasicBeanPane{ * 返回界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Drill_Level"); } } \ 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 55afcc7a97..9383162bbe 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 @@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane{ private void initCom() { this.setLayout(new BorderLayout(0, 0)); - 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[] {}) { + UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 25552c2cbf..4d9d12fa89 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ShowWay") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Show_Way") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); 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 34f1a0b5cd..373d3e1726 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 @@ -87,7 +87,7 @@ public class MapMoreCubeLayerPane extends MultiTabPane{ * @return 返回标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Muiti_In"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 b64511ff15..3318ccade0 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 @@ -59,7 +59,7 @@ 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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Data-Resource") + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source") + ":")); northPane.add(jcb); this.add(northPane, BorderLayout.NORTH); @@ -57,7 +57,7 @@ public class MapSinglePane extends FurtherBasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"); } }, BorderLayout.CENTER); } 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 8552dbb984..bb5d62b84e 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 @@ -77,7 +77,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane implements AbstrctMapAt northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Import_Map")); + UIButton loadMap = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Import_Map")); loadMap.setPreferredSize(new Dimension(160, 20)); northPane.add(loadMap); loadMap.addActionListener(selectPictureActionListener); if(isNeedDataSource){ - UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Table_Data") + ":", SwingConstants.RIGHT) ; + UILabel label =new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Field"}) + ":")); + northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Field") + ":")); areaString = new FilterComboBox(); areaString.setPreferredSize(new Dimension(120, 20)); @@ -229,7 +229,7 @@ refreshAreaNameBox(); @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Datasource-User_Defined", "Chart-Map"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_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 38b6f4bd6e..a8542b0fff 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 @@ -67,7 +67,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc northPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData") + ":", SwingConstants.RIGHT); + UILabel lable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Field")+":")); northPane.add(columnBox); - 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[]{}) { + tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "Area_Name"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 0cf7f46228..2148257a41 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 @@ -1,7 +1,6 @@ package com.fr.design.chart.series.PlotSeries; import com.fr.base.BaseUtils; -import com.fr.base.FRContext; import com.fr.base.MapHelper; import com.fr.base.MapXMLHelper; import com.fr.base.Utils; @@ -22,7 +21,6 @@ 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.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; @@ -30,9 +28,18 @@ import com.fr.stable.StringUtils; import com.fr.stable.SvgProvider; import com.fr.workspace.WorkContext; -import javax.swing.*; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; import javax.swing.event.ListSelectionEvent; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Shape; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; @@ -48,10 +55,10 @@ import java.util.ArrayList; */ public class MapGroupExtensionPane extends BasicPane implements UIObserver { private static final String[] TYPE_NAMES = new String[]{ - 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")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_World_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_State_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Province_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map")}; private static final int WORD = 0; private static final int NATION = 1; private static final int STATE = 2; @@ -211,7 +218,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createAreaItem(final String oldName) { - JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Filed"})); + JMenuItem editFileItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Region")); editFileItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapCustomPane image = new MapCustomPane(); @@ -259,7 +266,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createMarkerItem(final String oldName) { - JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Marker"})); + JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Marker")); editMarkerItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapCustomPane image = new MapCustomPane(); @@ -293,7 +300,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private JMenuItem createLayerItem(final String oldName) { - JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Corresponding_Fields"})); + JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Corresponding_Fields")); corrItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane(); @@ -320,16 +327,16 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private void showRenameWaring(String newName){ - 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); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed") + + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE); } private JMenuItem createRenameItem() { - JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename")); + JMenuItem renameItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename")); renameItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { String newName = JOptionPane.showInputDialog(DesignerContext.getDesignerFrame().getContentPane(), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Rename"), groupExtensionPane.getSelectedObject()); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Rename"), groupExtensionPane.getSelectedObject()); if (StringUtils.isNotBlank(newName)) { String oldName = Utils.objectToString(groupExtensionPane.getSelectedObject()); if(ComparatorUtils.equals(oldName, newName)){ @@ -400,7 +407,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { @Override protected void done() { - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Saved")); // 地图已经保存. + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Saved")); // 地图已经保存. } }; @@ -486,4 +493,4 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { popupMenu.setEnabled(isEnabled); groupExtensionPane.setEnabled(isEnabled); } -} \ No newline at end of file +} 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 df5d60c53b..54e6667392 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 @@ -523,7 +523,7 @@ public class MapImageEditPane extends BasicBeanPane { private int editViewRow = -1;// 所对应的view的index行 , 确定当前正在编辑的viewList的行, 然后改变值 - private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Pre_Defined") + "------"); + private UILabel namedLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pre_Defined") + "------"); private JPanel listPane = new JPanel(); public EditNamePane() { @@ -630,13 +630,13 @@ public class MapImageEditPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image"); } } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 3ca7e5e597..2f69013ced 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 @@ -431,7 +431,7 @@ public class UIGroupExtensionPane extends BasicPane { }; isPressOnDelete = true; bp.setLayout(new BorderLayout()); - bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Delete", "Chart-Map"}) + "?", SwingConstants.CENTER)); + bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delete_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 5350ffd4b8..348455bad2 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 @@ -63,22 +63,22 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(typePane); - typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Type"}), null)); + typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Type"), null)); JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(buttonPane); - 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"))); + buttonPane.add(exponentButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Exponent"))); + buttonPane.add(linearButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Linear"))); + buttonPane.add(logButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Log"))); + buttonPane.add(polynomialButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Polynomial"))); + buttonPane.add(powerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Math_Power"))); JPanel maPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); typePane.add(maPane); - 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(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Move_Average"))); + maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Forecast"}), null)); + extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Forecast"), null)); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":")); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Forward") + ":")); extendsPane.add(forwardLabel = new UITextField("0", 5)); - 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(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Backward") + ":")); extendsPane.add(backwardLabel = new UITextField("0", 5)); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); return extendsPane; } @@ -127,7 +127,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } ActionListener listener = new ActionListener() { 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 2d421de9e6..f5921b94d8 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 @@ -19,7 +19,7 @@ public class DataSeriesAttrCustomPane extends DataSeriesAttrPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 9167d0b945..920cc63c8d 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 @@ -37,13 +37,13 @@ public class DataSeriesAttrPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) }; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 92cd574ea6..e1274aa4b9 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 @@ -5,7 +5,6 @@ import com.fr.chart.base.AttrAlpha; import com.fr.chart.base.AttrBackground; import com.fr.chart.base.AttrContents; import com.fr.chart.base.DataSeriesCondition; -import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.data.condition.AbstractCondition; @@ -166,7 +165,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane(names, values); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java index 961b851f91..6f02047b14 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java @@ -32,10 +32,10 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane Component[][] components; if (!this.needRenamePane) { components = new Component[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Object")), targetFrameComboBox}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox}, }; } else { itemNameTextField = new UITextField(); components = new Component[][]{ - {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}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name_Has_Colon")), itemNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Form_Object")), targetFrameComboBox}, }; } JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); @@ -99,7 +99,7 @@ public class FormHyperlinkNorthPane extends BasicBeanPane @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Form_link"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Form_Link"); } @Override @@ -136,4 +136,4 @@ public class FormHyperlinkNorthPane extends BasicBeanPane } formHyperlink.setRelateEditorName((String) targetFrameComboBox.getSelectedItem()); } -} \ No newline at end of file +} 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 665a015014..a9e209fc3d 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 @@ -39,12 +39,12 @@ public class FormHyperlinkPane extends AbstractHyperLinkPane{ namedPane= new MapDefiAreaNamePane(false); areaPane.setImageSelectType(MapShapeValue.AREA); // pointPane.setImageSelectType(MapShapeValue.POINT); - tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_ImageArea"),areaPane); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Image_Area"),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); + tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 45f8036078..5ff3e02333 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 @@ -65,7 +65,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ chartEditPane.setContainer(container); chartEditPane.addTitleChangeListener(titleListener); String tabname = chartEditPane.getSelectedTabName(); - nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + (tabname != null ? ('-' + chartEditPane.getSelectedTabName()) : "")); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Property_Table") + '-' + addName); + nameLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table") + '-' + addName); } }; @@ -118,7 +118,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{ * 返回View的标题. */ public String getViewTitle() { - return com.fr.design.i18n.Toolkit.i18nText("CellElement-Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell_Element_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 a044c059b1..5fce5c3669 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 @@ -21,7 +21,6 @@ import com.fr.design.mainframe.chart.gui.ChartTypePane; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; - import javax.swing.JPanel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -154,7 +153,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 this.isDefaultPane = true; }else{ ChartDataPane chartDataPane = createChartDataPane(plotID); - paneList.add(chartDataPane); + if (chartDataPane != null) { + paneList.add(chartDataPane); + } AbstractChartAttrPane[] otherPaneList = ChartTypeInterfaceManager.getInstance().getAttrPaneArray(plotID, listener); for(int i = 0; i < otherPaneList.length; i++){ otherPaneList[i].addAttributeChangeListener(listener); @@ -169,7 +170,9 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 protected ChartDataPane createChartDataPane(String plotID) { ChartDataPane chartDataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); - chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData()); + if (chartDataPane != null) { + chartDataPane.setSupportCellData(dataPane4SupportCell.isSupportCellData()); + } return chartDataPane; } @@ -215,7 +218,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4 @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Property_Table"); } public void populate(ChartCollection collection) { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java index 936304b4e1..bae6e20bce 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartHyperEditPane.java @@ -42,7 +42,9 @@ public class ChartHyperEditPane extends ChartEditPane { @Override protected ChartDataPane createChartDataPane(String plotID) { ChartDataPane dataPane = ChartTypeInterfaceManager.getInstance().getChartDataPane(plotID, listener); - dataPane.setSupportCellData(false); + if (dataPane != null) { + dataPane.setSupportCellData(false); + } return dataPane; } 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 aef8c20703..74f9952e0d 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 @@ -12,7 +12,7 @@ import javax.swing.*; */ public abstract class ChartsConfigPane extends AbstractChartAttrPane { - public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"); + public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"); public abstract Class acceptType(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java index 3f35c585dc..b9f5a2fbdc 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/ChartsEditPane.java @@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.mainframe.chart.gui.ChartDataPane; -import java.awt.*; +import java.awt.BorderLayout; import java.util.ArrayList; /** @@ -43,7 +43,9 @@ public class ChartsEditPane extends ChartEditPane { dataPane4SupportCell = createChartDataPane(plotID); chartsConfigPane = ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID); - paneList.add(dataPane4SupportCell); + if (dataPane4SupportCell != null) { + paneList.add(dataPane4SupportCell); + } paneList.add(chartsConfigPane); createTabsPane(); 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 fdf2e5a6b4..e0f16b6752 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 @@ -3,23 +3,23 @@ package com.fr.design.mainframe.chart; public class PaneTitleConstants { - 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_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"); + public final static String CHART_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"); + public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style"); + public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special"); - 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_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"); + public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend"); + public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series"); + public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis"); + public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"); + public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); + public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label"); + public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line"); - 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_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area"); + public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plot_Region"); - public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); + public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); -} \ 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 8f374889cd..cc8a7db137 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 @@ -107,12 +107,12 @@ 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[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hide")}); + switchStyleGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hide")}); Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null} }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); @@ -143,7 +143,7 @@ public class ChangeConfigPane extends BasicBeanPane { private JPanel createButtonBackgroundColorPane(){ colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), colorSelectBox4button, EDIT_AREA_WIDTH); } private JPanel createButtonConfigPane() { @@ -227,6 +227,6 @@ public class ChangeConfigPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 10df74d922..4f109bd557 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 @@ -37,7 +37,7 @@ public class ChartDesignerOtherPane extends ChartOtherPane { * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Advanced"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 98c1d842e7..cc049b4503 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 @@ -110,7 +110,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen } private void initConfigCreator() { - configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); + configCreator = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Change_Config_Attributes"), new AttrChangeConfig(), ChangeConfigPane.class); } private void initAddButton() { @@ -183,7 +183,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private String getNewChartName() { int count = indexList.size() + 1; while (true) { - String name_test = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Module_Name") + count; + String name_test = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Module_Name") + count; boolean repeated = false; for (int i = 0, len = indexList.size(); i < len; i++) { ChartChangeButton nameable = indexList.get(i); @@ -261,7 +261,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } 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 968fba1277..f66b0fb01b 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 @@ -19,9 +19,9 @@ import com.fr.log.FineLoggerFactory; */ public class CalculateComboBox extends UIComboBox{ - 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 String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Average"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Max"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Min"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_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(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None")); + this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_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 116cc20516..9db2fe7b21 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 @@ -109,7 +109,7 @@ public class ChartDataFilterPane extends ThirdTabPane { * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"); } /** @@ -228,7 +228,7 @@ public class ChartDataFilterPane extends ThirdTabPane { panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num")); - combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowCate")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Cate")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -258,7 +258,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Category"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category"); } /** @@ -403,7 +403,7 @@ public class ChartDataFilterPane extends ThirdTabPane { panel1.add(onlyPreData, BorderLayout.NORTH); preDataNum = new UITextField(); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Records_Num")); - combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther")); + combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_NotShowSeries")); + notShowNull = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Not_Show_Series")); panel2.add(notShowNull, BorderLayout.NORTH); onlyPreData.addChangeListener(new ChangeListener() { @@ -433,7 +433,7 @@ public class ChartDataFilterPane extends ThirdTabPane { fire(); } }; - presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present") ,present); + presentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 e38a2c1f35..1277ae4632 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Resource")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source")); 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 a0ead25d1e..00cea4be16 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 @@ -24,9 +24,9 @@ public class PresentComboBox extends UIComboBox{ private Present present; private String[] ITEMS = { - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 d353c2784f..3403bf3413 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 @@ -36,7 +36,7 @@ public class ReportDataPane extends FurtherBasicBeanPane{ * @return 界面的标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Cell_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 8191066e75..5248fb08b1 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 @@ -1,8 +1,8 @@ package com.fr.design.mainframe.chart.gui.data; import com.fr.base.TableData; +import com.fr.chart.chartattr.Chart; import com.fr.chart.chartattr.ChartCollection; -import com.fr.chart.chartattr.Plot; import com.fr.chart.chartdata.TableDataDefinition; import com.fr.chart.chartdata.TopDefinition; import com.fr.data.impl.NameTableData; @@ -14,9 +14,9 @@ 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 javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import java.awt.BorderLayout; +import java.awt.Dimension; public class TableDataPane extends FurtherBasicBeanPane{ private static final long serialVersionUID = 4740461028440155147L; @@ -36,7 +36,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ } private void initDataPane() { - UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-DS_TableData")) ; + UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TableData")) ; label.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); tableDataPane = new DatabaseTableDataPane(label) { @Override @@ -72,8 +72,8 @@ public class TableDataPane extends FurtherBasicBeanPane{ } } - protected AbstractTableDataContentPane getContentPane(Plot plot) { - return ChartTypeInterfaceManager.getInstance().getTableDataSourcePane(plot, parent); + protected AbstractTableDataContentPane getContentPane(Chart chart) { + return ChartTypeInterfaceManager.getInstance().getTableDataSourcePane(chart.getPlot(), parent); } /** @@ -106,7 +106,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ * @param collection 图表属性的集合 */ public void refreshContentPane(ChartCollection collection) { - refreshContentPane(getContentPane(collection.getSelectedChart().getPlot())); + refreshContentPane(getContentPane(collection.getSelectedChart())); } protected void refreshContentPane(AbstractTableDataContentPane contentPane) { 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 4393f45371..01c412d314 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 @@ -26,7 +26,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa public BubblePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); filterPane = new ChartDataFilterPane(new BubblePlot(), parent); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane); panel.setBorder(getSidesBorder()); filterPane.setBorder(getFilterPaneBorder()); this.add(panel, "0,6,2,4"); @@ -35,9 +35,9 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa @Override protected String[] columnNames() { return new String[]{ - 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("Fine-Design_Chart_Bubble_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_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 405fe274dd..fd8e08d87f 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 @@ -54,7 +54,7 @@ public class CategoryPlotMoreCateReportDataContentPane extends CategoryPlotRepor public CategoryPlotMoreCateReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 c71ac065ca..298ee49370 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 @@ -34,12 +34,12 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent public CategoryPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 7245a44c18..618d51382f 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 @@ -21,14 +21,14 @@ import java.util.List; */ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPane { - 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 STEP = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step"); + private static final String START = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start"); + private static final String END = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End"); - 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"); + private static final String RESTART = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start"); + private static final String REEND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End"); + private static final String PERCENT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleFormat_Percent"); + private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project"); public GanttPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); @@ -109,4 +109,4 @@ public class GanttPlotReportDataContentPane extends AbstractReportDataContentPan return new String[]{"", ""}; } -} \ No newline at end of file +} 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 2a04eabc0b..c456b2a03c 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 @@ -26,7 +26,7 @@ import java.awt.Component; public class MeterPlotReportDataContentPane extends AbstractReportDataContentPane { 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 static final String NVALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel pane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 732664fe1e..81346ddca6 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 @@ -24,7 +24,7 @@ public class PiePlotReportDataContentPane extends AbstractReportDataContentPane public PiePlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new PiePlot(), parent), "0,6,2,4"); } 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 226f482b19..833563c2f0 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 @@ -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 = 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 String AXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horial_Time_Axis"); + private static final String VOLUME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Volume"); + private static final String OPEN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Open"); + private static final String HIGHT = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_High"); + private static final String LOW = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Low"); + private static final String CLOSE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 59ae03bad2..5bd690b2f7 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 @@ -25,15 +25,15 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten public XYScatterPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new XYScatterPlot(), parent), "0,6,2,4"); } protected String[] columnNames() { return new String[]{ - 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" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "x", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "y" }; } @@ -88,4 +88,4 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten list.add(seriesEntry); } } -} \ No newline at end of file +} 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 cac5863edc..fdf872c64a 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 @@ -45,7 +45,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane yCombox.setPreferredSize(new Dimension(100, 20)); bubbleSize.setPreferredSize(new Dimension(100, 20)); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName}, new Component[]{new UILabel("x"), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), 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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane), null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),dataScreeningPane), null}, }; @@ -91,7 +91,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane protected void refreshBoxListWithSelectTableData(List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 a8c4aba765..3bf0225ef2 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")); + UILabel categoryLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")); 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 4c2e70850a..6ba03732ec 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Category_Name")) ; + UILabel label1 = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Category")) ; label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT)); categoryCombox.setPreferredSize(new Dimension(100,20)); - categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); seriesTypeComboxPane.refreshBoxListWithSelectTableData(list); } @@ -100,7 +100,7 @@ public class CategoryPlotTableDataContentPane extends AbstractTableDataContentPa */ public void clearAllBoxList(){ clearBoxItems(categoryCombox); - categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + categoryCombox.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 4db13903b0..eb5eada001 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 @@ -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(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}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Step_Name")),step}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_Start")),planStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plan_End")),planEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_Start")),finalStart}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Actual_End")),finalEnd}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent")),percent}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 04349ccfcf..da5c28c5bf 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 @@ -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 = 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 static final String METER_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name"); + private static final String METER_VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),filterPane); + JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 1da844507c..850ef70fe1 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 @@ -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 = {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 static final String[] HEADS = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Summary_Method")}; + private static final String[] HEADS_NO_SUMMARY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Field_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From")); + UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"), 290, 24, dataScreeningPane); + JPanel panel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nText("ChartF-Series_Name_From"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 1457ba7a4f..ee6d6228dd 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 @@ -25,7 +25,7 @@ import java.util.List; */ public class StockPlotTableDataContentPane extends AbstractTableDataContentPane { - private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Chart-Horizontal_TimeAxis"); + private static final String TIMEAXIS = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 a5b06db0c8..86e57d1339 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 @@ -39,7 +39,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP yCombox = new UIComboBox(); dataScreeningPane = new ChartDataFilterPane(new XYScatterPlot(), parent); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(" " + 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 BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name") + ":"),seriesName}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "x" + ":"), xCombox}, + new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter_Name") + "y" + ":"), yCombox}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Data_Filter"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 23bb3a4cf9..4822fb66e0 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 @@ -39,7 +39,7 @@ public class ChartConditionAttrPane extends BasicScrollPane { * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new CustomAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Attributes"), new CustomAttr(), showPane)); } else { - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Attributes"), new ConditionAttr(), showPane)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 76a19f9758..f96974f2ad 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 @@ -33,10 +33,10 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane { List list = new ArrayList(); java.util.HashMap hyperLinkEditorMap = plot.getHyperLinkEditorMap(); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Web_link"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Interactive-chart"), null, null)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "Fine-Design_Report_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null)); return list; } @@ -52,4 +52,4 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane { autoRefreshTime.setEnabled(definition.isSupportAutoRefresh()); } } -} \ No newline at end of file +} 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 273149f868..8af8ad92d2 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 @@ -146,29 +146,29 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Tab"); } @Override protected JPanel createContentPane() { - 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")); + isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Show")); + isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Drag")); + + isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); + dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); + isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); + tooltipStyle = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Black_Font"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_White_Font")}); + tooltipStyleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name")); + tooltipShowType = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Single_Data"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_All_Data")}); + tooltipShowTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show")); + + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name")); + + isAxisShowToolTip = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Axis_Tooltip")); + isAxisZoom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Interactive_timeSwitch")); + timeSwitch = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Time_Switch")); timeSwitchPane = new TimeSwitchPane(); initFormatListener(); return initPaneWithListener(); @@ -316,7 +316,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{tooltipShowTypeLabel, tooltipShowType}, new Component[]{tooltipStyleLabel, tooltipStyle} }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } private void relayoutDataPointToolTipPane(Plot plot) { @@ -326,7 +326,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb double[] rowSize = new double[]{p, p}; if (plot.isShowAllDataPointLabel()) { - isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); + isDatapointPercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")); } if (plot.isSupportAddress4Gis()) { UIButton tmpButton = new UIButton(); //用来调整对齐 @@ -338,7 +338,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{isAddressTittle, tmpButton}, new Component[]{isDatapointValue, dataPointValueFormat}, }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } else if (plot.isSupportValuePercent()) { Component[][] components; if (plot.isSupportTooltipSeriesType()) { @@ -357,13 +357,13 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb getTooltipStyleComponent() }; } - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } else { Component[][] components = new Component[][]{ new Component[]{isDatapointValue, dataPointValueFormat}, getTooltipStyleComponent() }; - tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize); + tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize); } } @@ -396,7 +396,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAxisShowToolTip}, }; - axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Axis", "Chart-Interactive"}, components, rowSize, columnSize); + axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Interactive"}, components, rowSize, columnSize); } private void initAutoRefreshPane() { @@ -408,13 +408,13 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAutoRefresh, null}, new Component[]{GUICoreUtils.createFlowPane(new Component[]{ - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Interval")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds")) + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds")) }, 1)}, - new Component[]{new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-AutoRefresh_NotSupportIMGAndReportData") + ""), null}, + new Component[]{new UILabel("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Support_Img_And_Cell") + ""), null}, }; - autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize); + autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Check"}, components, rowSize, columnSize); } private void initSuperlinkPane() { @@ -426,7 +426,7 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb new Component[]{superLink, null}, }; - superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Hyperlink"}, components, rowSize, columnSize); + superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Report_Hyperlink"}, components, rowSize, columnSize); } private void relayoutWithPlot(Plot plot) { @@ -568,9 +568,9 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb addressType = ((GisMapReportDefinition) definition).isAddress(); } if (addressType) { - this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Address")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Address")); } else { - this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_LatLng")); + this.isAddress.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - 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"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Mail"), new EmailJavaScript(), ChartEmailPane.class)); + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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, com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 ce6e30e103..6288b7ecf4 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 @@ -84,7 +84,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{ * @param 返回标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } @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 2cc21f7530..ed2a54fbef 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Year"); + private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year"); private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 final String DAY =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"); + private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"); + private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"); + private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"); private static String[] TYPES = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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") + com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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, com.fr.design.i18n.Toolkit.i18nText("Year")); + INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); } private UIButton addButton; @@ -340,4 +340,4 @@ public class TimeSwitchPane extends JPanel implements UIObserver { } } } -} \ No newline at end of file +} 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 00d7ecce88..390ff1004c 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 @@ -81,13 +81,14 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ } private void initComponents() { - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Label")); + + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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")}); + showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Interval"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Wrap")}); customLabelSamleTime = new UITextField(); - 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")}; + String[] nameObjects = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_All_Normal"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Vertical"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Text_Rotation")}; labelOrientationChoose = new UIComboBox(nameObjects); orientationBar = new NumberDragBar(-NUM90, NUM90); orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); @@ -160,8 +161,8 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - 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, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Show")), showWay, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -214,7 +215,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p}; Component[][] components = new Component[][]{ - 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("Fine-Design_Chart_Axis_Label_Show")), showWay, null} }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); } @@ -226,7 +227,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Text_Rotation")), labelOrientationChoose, null}, + new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null, orientationSpinner, orientationBar, null}, new Component[]{null, textAttrPane, null, null}, }; @@ -288,8 +289,8 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - 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,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelSampleChoose, customLabelSamleTime}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), labelOrientationChoose, null}, new Component[]{null,orientationSpinner, orientationBar, null}, new Component[]{null,textAttrPane, null, null}, }; @@ -315,7 +316,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ * 界面标签 */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Tick_Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 90c2ac0435..76f45c26d6 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 @@ -34,7 +34,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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"), @@ -54,14 +54,14 @@ public class ChartAxisLineStylePane extends BasicPane{ double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - 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("Fine-Design_Basic_Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),axisLineColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null}, new Component[]{null, mainTickPosition}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),null}, new Component[]{null,secondTickPosition} } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Style"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Style"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } 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 0b00dd521d..ce6b9adf32 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 @@ -39,7 +39,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane { } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))}, new Component[]{null,titleAlignmentPane,}, }; titlePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); 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 ca2c2d3610..06bed8a6e2 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 @@ -38,7 +38,7 @@ public class ChartAxisTitlePane extends BasicPane{ } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, + new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))}, new Component[]{null,titleAlignmentPane,}, }; titlePane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); 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 4858473f46..c69cbdef36 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 @@ -49,7 +49,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("AxisValue"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Value"); } /** @@ -110,7 +110,7 @@ public class ChartAxisValueTypePane extends BasicPane { * 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Text_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 42598a211c..a2c8f6d4dc 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 @@ -75,10 +75,10 @@ public class ChartBackgroundPane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{typeComboBox, null} , new Component[]{centerPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Alpha_Int")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha_Degree")), null}, new Component[]{null, transparent} }; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Background"}, components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Background"}, components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); this.add(new JSeparator(), BorderLayout.SOUTH); 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 381fe56dd1..8a8c479d00 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 @@ -16,9 +16,9 @@ public class ChartBeautyPane extends BasicBeanPane{ private UIComboBox styleBox; public ChartBeautyPane() { - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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") //新加的两种风格，注意兼容处理 + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格，注意兼容处理 }; styleBox = new UIComboBox(nameArray); @@ -30,7 +30,7 @@ public class ChartBeautyPane extends BasicBeanPane{ Component[][] components = new Component[][]{ new Component[]{styleBox}, } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InterfaceStyle"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Style"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } @@ -71,4 +71,4 @@ public class ChartBeautyPane extends BasicBeanPane{ protected String title4PopupWindow() { return ""; } -} \ No newline at end of file +} 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 a2b4f0bfff..6de66828bd 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 @@ -28,17 +28,17 @@ 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(com.fr.design.i18n.Toolkit.i18nText("Border-Style-Radius")); + isRoundBorder = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; - JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize); + JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Border"},components,rowSize,columnSize); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER) ; this.add(new JSeparator(), BorderLayout.SOUTH); 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 efade76a03..6b22c287f5 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 @@ -34,15 +34,15 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{ public ChartDataPointLabel4GisPane(ChartStylePane parent){ this.parent = parent; - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); - isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Area_Title")); - isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Gis_Address")); + isAddressTittle = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title")); + isAddress = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_GIS_Address")); isAddress.setSelected(true); - isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name")); + isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Address_Name")); - isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 e106887268..129ed176aa 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 @@ -29,13 +29,13 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane { public ChartDataPointLabel4MapPane(ChartStylePane parent) { this.parent = parent; - 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")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label")); + isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")); + isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Value")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 21a51280ad..48585ae5b1 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name")); + isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name")); } - isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")); - isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")); + isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); + isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")); isValue.setSelected(true); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); if(plot.isSupportValuePercent()) { - isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent")); - valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + isValuePercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Percent")); + valuePercentFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format")); if (plot.isShowAllDataPointLabel()) { - isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion")); + isValuePercent.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion")); } } @@ -117,7 +117,7 @@ public class ChartDatapointLabelPane extends BasicPane{ textFontPane = new ChartTextAttrPane(); if(isGuidline) { - isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine")); + isGuid = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline")); } 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(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")), BorderLayout.WEST); + positionPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Delimiter_Symbol")), BorderLayout.WEST); + delimiterPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 2192d1a1a9..39bc49a903 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 @@ -55,8 +55,8 @@ public class ChartFillStylePane extends BasicBeanPane{ JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - 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"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"))); customPane.add(buttonPane, BorderLayout.NORTH); changeColorSetPane = new JPanel(cardLayout = new CardLayout()); @@ -116,7 +116,7 @@ public class ChartFillStylePane extends BasicBeanPane{ new Component[]{styleSelectBox}, new Component[]{customPane} } ; - return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ColorMatch"},components,rowSize,columnSize); + return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Color_Match"},components,rowSize,columnSize); } @Override @@ -135,13 +135,13 @@ public class ChartFillStylePane extends BasicBeanPane{ private String[] getNameObj() { ChartPreStyleConfig config = ChartPreStyleConfig.getInstance(); ArrayList nameArr = new ArrayList(); - nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); + nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); Iterator keys = config.names(); while (keys.hasNext()) { Object key = keys.next(); nameArr.add(Utils.objectToString(key)); } - nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); + nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")); return nameArr.toArray(new String[nameArr.size()]); } @@ -228,4 +228,4 @@ public class ChartFillStylePane extends BasicBeanPane{ return condition; } -} \ No newline at end of file +} 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 b3d8ee5213..c21ca0e045 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 @@ -48,29 +48,29 @@ import java.util.regex.Pattern; public class DateAxisValuePane extends FurtherBasicBeanPane{ private static String[] TYPES = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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") + com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second") }; private static Map VALUES = new HashMap(); static { - VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year"), ChartConstants.YEAR_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun"), ChartConstants.DAY_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), ChartConstants.HOUR_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), ChartConstants.MINUTE_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"), ChartConstants.SECOND_TYPE); } private static Map INTS = new HashMap(); static { - INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); + INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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")); + INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sun")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); } // 最大最小值 @@ -94,9 +94,9 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMin() { // 最小值. - minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); @@ -110,9 +110,9 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMax() { // 最大值 - maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); @@ -238,7 +238,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart_Date_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Date_Time_Axis"); } private void checkBoxUse() { @@ -358,8 +358,8 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ String tmp = DateUtils.getDate2LStr(toDate); toDate = DateUtils.DATETIMEFORMAT2.parse(tmp); } catch (ParseException e) { - FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Cannot_Get_Date")); + FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cannot_Get_Date")); } return toDate; } -} \ No newline at end of file +} 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 1ea4368249..e9eafa4de3 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 @@ -68,15 +68,15 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ double f = TableLayout.FILL; double[] row = {p}; double[] col = {f}; - trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col); + trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col); } //最多有两条坐标轴是值类型的 if(plot.getAlertLinePaneTitle().length == 2){ String[] title = plot.getAlertLinePaneTitle(); - firstAlertPane = this.createAlertLinePane(new String[]{title[0], "ChartF-Alert-Line"}, true); - secondAlertPane = this.createAlertLinePane(new String[]{title[1], "ChartF-Alert-Line"}, false); + firstAlertPane = this.createAlertLinePane(new String[]{title[0], "Fine-Design_Chart_Alert_Line"}, true); + secondAlertPane = this.createAlertLinePane(new String[]{title[1], "Fine-Design_Chart_Alert_Line"}, false); }else if(plot.getyAxis() instanceof ValueAxis){ - firstAlertPane = this.createAlertLinePane(new String[]{"ChartF-Alert-Line"}, true); + firstAlertPane = this.createAlertLinePane(new String[]{"Fine-Design_Chart_Alert_Line"}, true); } Component[][] component = null;; if(trendLine != null){ @@ -109,7 +109,7 @@ public class ChartAnalysisLinePane extends BasicScrollPane{ private JPanel createAlertLinePane(String[] title, boolean first){ List list = new ArrayList(); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValuePane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), new ChartAlertValue(), ChartAlertValuePane.class)); } else { - menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("ChartF-Alert-Line"), new ChartAlertValue(), ChartAlertValueInTopBottomPane.class)); + menuList.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"), conditionLine, ConditionTrendLinePane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 e6f7d3b60c..f846866268 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 @@ -55,11 +55,11 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { verticalColorPane = new ColorSelectBox(100); Component[][] components = new Component[][]{ - 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}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom") + ":"),verticalColorPane}, }; - backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_Interval_Back"}, components, rowSize, columnSize); + backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Interval_Background"}, components, rowSize, columnSize); } //初始化网格线 @@ -69,12 +69,12 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { double[] rowSize = {p,p}; double[] columnSize = { p, f }; - 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")); + isVerticleGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FIne-Design_Report_Utils_Left_To_Right")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom")); gridColorPane = new ColorSelectBox(100); JPanel container = TableLayoutHelper.createTableLayoutPane(new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane},} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane},} , rowSize, columnSize); Component[][] components = new Component[][]{ @@ -82,7 +82,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { new Component[]{container,null} }; - gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Grid_Line"}, components, rowSize, columnSize); + gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Grid_Line"}, components, rowSize, columnSize); } @@ -116,4 +116,4 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { ((RectanglePlot)plot).setHorizontalIntervalBackgroundColor(horizontalColorPane.getSelectObject()); ((RectanglePlot)plot).setVerticalIntervalBackgroundColor(verticalColorPane.getSelectObject()); } -} \ No newline at end of file +} 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 e13420324a..020a10a209 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 @@ -18,7 +18,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane { private ColorSelectBox gridColorPane; public Plot3DAxisAreaPane() { - gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line")); + gridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 9aeb036a1d..8011d18c0e 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 @@ -24,7 +24,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { public RadarAxisAreaPane() { horizontalColorPane = new ColorSelectBox(100); - isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")); + isHorizontalGridLine = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background") + ":"),horizontalColorPane}, new Component[]{new JSeparator(),null}, - 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,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Grid")),null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 f2244aeb18..c0842ab15e 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 @@ -52,7 +52,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ axisLineStylePane = new ChartAxisLineStylePane(); formatPane = new FormatPaneWithOutFont(); axisLabelPane = new ChartAxisLabelPane(); - axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("AxisReversed")); + axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Reversed")); this.setLayout(new BorderLayout()); this.add(isSupportLineStyle() ? getPaneWithLineStyle() : getPaneWithOutLineStyle(),BorderLayout.CENTER); } @@ -61,7 +61,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutLineStyle(){ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p}; @@ -73,7 +73,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -84,7 +84,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithLineStyle(){ double p = TableLayout.PREFERRED; double f = TableLayout.FILL; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p, p, p}; @@ -98,7 +98,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -123,7 +123,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Category_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Category"); } @Override @@ -217,7 +217,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutAxisRevertAndLineStyle(){ double f = TableLayout.FILL; double p = TableLayout.PREFERRED; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p}; @@ -227,7 +227,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{getAxisTitlePane()}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -239,7 +239,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ private JPanel getPaneWithOutAxisRevert(){ double f = TableLayout.FILL; double p = TableLayout.PREFERRED; - JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{ + JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{ new Component[]{axisValuePane}}, new double[]{p}, new double[]{f}); double[] columnSize = {f}; double[] rowSize = { p, p, p, p, p, p, p, p, p, p}; @@ -251,7 +251,7 @@ public class ChartCategoryPane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisLineStylePane}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, 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 9f8d43b0a1..6c6f3d2c0c 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 @@ -27,7 +27,7 @@ public class ChartRadarPane extends ChartValuePane{ JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); valuePane.add(buttonPane); - String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_AutoCount"), com.fr.design.i18n.Toolkit.i18nText("Chart_Axis_UnitCount")}; + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Auto_Count"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")}; 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 0ab62a66c3..ed3c798798 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false)); return pane; } 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 a45210a86a..d68483e35b 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Chart_AxisAlignZeroValueLine"), false)); + pane.add(isAlignZeroValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Align_Origin"), false)); return pane; } 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 3d468abb1d..32e6564799 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 @@ -77,7 +77,7 @@ public class ChartValuePane extends ChartAxisUsePane{ axisLineStylePane = new ChartAxisLineStylePane(); zeroPane = aliagnZero4Second(); - axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")); + axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")); unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES); formatPane = new FormatPaneWithOutFont(); axisLabelPane = new ChartAxisLabelPane(); @@ -109,10 +109,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -135,10 +135,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{new JSeparator()}, new Component[]{axisReversed}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -176,8 +176,8 @@ public class ChartValuePane extends ChartAxisUsePane{ // 返回对数相关界面. 百分比 没有此界面. protected JPanel addLogarithmicPane2ValuePane() { JPanel labelLogPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - 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"))); + labelLogPane.add(logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Logarithmic")+":")); + labelLogPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Log_Base"))); logBaseField = new UITextField(4); logBaseField.setText("10"); @@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane{ * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_F_Radar_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis"); } @Override @@ -327,10 +327,10 @@ public class ChartValuePane extends ChartAxisUsePane{ new Component[]{axisLineStylePane}, new Component[]{zeroPane}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -352,10 +352,10 @@ public class ChartValuePane extends ChartAxisUsePane{ Component[][] components = new Component[][]{ new Component[]{getAxisTitlePane()}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{ new Component[]{unitCombox}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, - new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{ + new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{ new Component[]{formatPane}}, new double[]{p}, new double[]{f})}, new Component[]{new JSeparator()}, new Component[]{axisLabelPane}, @@ -415,4 +415,4 @@ public class ChartValuePane extends ChartAxisUsePane{ protected boolean isSupportLineStyle(){ return true; } -} \ No newline at end of file +} 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 ab4ca532e3..4f08282ecb 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 @@ -93,13 +93,13 @@ public class ChartDataLabelPane extends BasicScrollPane{ protected String[] getLabelLocationNameArray() { Plot plot = chart.getPlot(); if(plot instanceof BarPlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("BarInside"), com.fr.design.i18n.Toolkit.i18nText("BarOutSide"), com.fr.design.i18n.Toolkit.i18nText("Center")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof PiePlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pie_Outside")}; }else if(plot instanceof RangePlot){ - 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")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof BubblePlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Outside")}; }else{ return new String[0]; } @@ -122,4 +122,4 @@ public class ChartDataLabelPane extends BasicScrollPane{ } -} \ No newline at end of file +} 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 4287b0f67c..c08f480777 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 @@ -91,7 +91,7 @@ public class ChartLabelFontPane extends BasicScrollPane { } private class ContentPane extends JPanel { - private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); + private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value")); private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units")); public ContentPane() { @@ -108,7 +108,7 @@ public class ChartLabelFontPane extends BasicScrollPane { valueTextAttrPane = new ChartTextAttrNoColorPane(); unitTextAttrPane = new ChartTextAttrNoColorPane(); cateTextAttrPane = new ChartTextAttrNoColorPane(); - categoryName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name")); + categoryName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_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 faa2d25e16..f452e13076 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Chart_Show_Data_Sheet")); + isDatasheetVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Data_Type")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 ab7efa200c..4c5a7b6e42 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 @@ -52,12 +52,12 @@ public class ChartLegendPane extends BasicScrollPane{ } private void initComponents(){ - isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Visible")); textAttrPane = new ChartTextAttrPane(); borderPane = new ChartBorderPane(); - 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")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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"), @@ -151,4 +151,4 @@ public class ChartLegendPane extends BasicScrollPane{ checkBoxUse(); } -} \ No newline at end of file +} 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 3d720f3ffd..e9b118df87 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 @@ -91,7 +91,7 @@ public abstract class AbstractPlotSeriesPane extends BasicBeanPane{ * 界面标题. */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Series"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series"); } /** 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 5c195fd495..cfa593dd21 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 @@ -36,7 +36,7 @@ public class AreaSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { stylePane = new ChartBeautyPane(); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 f6e000c666..6078c3917d 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 @@ -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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 c05e511822..70a4f4b8cc 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 @@ -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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 04de8bfe15..c596c293f7 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 @@ -51,12 +51,12 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{ } protected void initCom(){ - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}), - com.fr.design.i18n.Toolkit.i18nText("Bubble-Width")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Area"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")}; Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH}; bubbleMean = new UIButtonGroup(nameArray, valueArray); zoomTime = new UITextField(); - isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Display", "Chart_Negative_Bubble"})); + isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Negative")); } @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(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 4de4f6f48a..08baed4928 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"))}, new Component[]{fillColorPane, null}, new Component[]{stylePane, null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Bar_Size")),zoomTime} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 b738b02c2e..309f2b718d 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart")), null}, new Component[]{fillColorPane, null}, new Component[]{bubbleMean,null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Change_Bubble_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 5f27c3760a..30494d7597 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Pie")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie")),null}, new Component[]{fillColorPane, null}, new Component[]{stylePane,null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Change_Pie_Size")),zoomTime}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 e73f4a079a..d31aad3b38 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 @@ -27,12 +27,12 @@ import java.util.List; */ public class CustomDefaultSeriesPane extends BasicPane{ - 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 static final String BAR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Column_Chart"); + private static final String BAR_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_NormalStack_Chart"); + private static final String BAR3D = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Chart"); + private static final String BAR3D_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Stack_Chart"); + private static final String LINE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"); + private static final String AREA_STACK = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); 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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -248,9 +248,9 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; @@ -309,7 +309,7 @@ public class CustomDefaultSeriesPane extends BasicPane{ this.setLayout(new BorderLayout()); - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 2d859f547f..2c94b5e494 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 @@ -46,10 +46,10 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{stylePane}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Series_Use_Default"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Use_Default"))}, new Component[]{defaultSeriesStyle}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Add_Series_Setting"), SwingConstants.LEFT)}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Setting"), new CustomAttr(), CustomTypeConditionSeriesPane.class)); conditionPane.refreshMenuAndAddMenuAction(list); @@ -108,4 +108,4 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { } } } -} \ No newline at end of file +} 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 60c815be56..7b6bb36571 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"), null)); + conditionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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"))); + stylePane.add(barRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Column_Chart"))); + stylePane.add(barStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_NormalStack_Chart"))); + stylePane.add(bar3DRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Chart"))); + stylePane.add(bar3DStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar3D_Stack_Chart"))); + stylePane.add(lineRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"))); + stylePane.add(areaStackButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"))); 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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Choose_Style"), null)); + styleChoosePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; 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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Gap")), seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Gap")), categoryGap} }; @@ -312,7 +312,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -320,8 +320,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeBar3DSeriesPane(){ - 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")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; 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 com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -364,8 +364,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ private UIButtonGroup positionGroup; public CustomTypeAreaSeriesPane(){ - 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")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; 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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Curve_Line")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane} }; this.setLayout(new BorderLayout()); @@ -419,7 +419,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Config"); } } @@ -432,8 +432,8 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ protected MarkerComboBox markerPane; public CustomTypeLineSeriesPane(){ - 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")}; + UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Choose")); + String[] names = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis")}; 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(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); 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 = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -457,9 +457,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{positionPane, null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; @@ -499,7 +499,7 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Config"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/Donut2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java index 514c5398ba..001829b4a3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java @@ -54,11 +54,11 @@ public class Donut2DSeriesPane extends AbstractPlotSeriesPane{ Component[][] components = new Component[][]{ new Component[]{stylePane, null}, new Component[]{new JSeparator(), null}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InnerRadis"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Inner_Radius"}, new Component[][]{new Component[]{innerRadiusPercent}}, singleRow, singleCol)}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Series"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Series"}, new Component[][]{new Component[]{seriesGap}}, singleRow, singleCol)}, - new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Category"}, + new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Category"}, new Component[][]{new Component[]{categoryGap}}, singleRow, singleCol)}, }; 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 3154522c5d..9fbbb11970 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 @@ -46,10 +46,10 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Curve")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Curve_Smooth")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); double p = TableLayout.PREFERRED; @@ -57,7 +57,7 @@ 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(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Style")),isCurve}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} 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 cef280dfa6..edf2f94246 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 @@ -52,7 +52,7 @@ public class MapSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isHeatMap = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Heat_Map")); + isHeatMap = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Configuration")), areaTitles}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Range_Color")),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 84fa6751b5..f266e2a60e 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 @@ -43,8 +43,8 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { protected JPanel getContentInPlotType() { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); - 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")}; + String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ge"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Hundred"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); @@ -61,7 +61,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return 120; } protected int getColorgroupMarginLeft () { - return 20; + return 5; } }; } @@ -73,11 +73,11 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] tmpComponent = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pointer-A-Tick-Order") + ":", SwingUtilities.LEFT), order} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_A_Tick_Order") + ":", SwingUtilities.LEFT), order} }; JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); Component[][] components = new Component[][]{ - 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("Fine-Design_Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, @@ -143,4 +143,4 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { } } } -} \ No newline at end of file +} 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 50b485ae8c..b16f12a2a5 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 @@ -35,8 +35,8 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { 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("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; + isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Plot_Region")); + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Style")}; Integer[] valueArray = {0, 1}; secondPlotType = new UIButtonGroup(nameArray, valueArray); smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); 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 e478a3f7b3..8943473270 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 @@ -42,10 +42,10 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ @Override protected JPanel getContentInPlotType() { - isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ChartF-Fill")); + isCurve = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill")); lineStyle = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); markerPane = new MarkerComboBox(MarkerFactory.getMarkerArray()); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Chart_Null_Value_Continue")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Continue")}; Boolean[] valueArray = {true, false}; isNullValueBreak = new UIButtonGroup(nameArray, valueArray); @@ -54,8 +54,8 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ double[] columnSize = { p, f }; double[] rowSize = { p,p,p,p,p}; Component[][] components = new Component[][]{ - 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_Polyline_Style")),isCurve}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polyline_Type")),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("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} } ; 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 72e89d6c73..a2fdc8526c 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("UpBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), 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 BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), upBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Background")), upBackColor}, new Component[]{new JSeparator(),null}, - 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_Down_Bar_Border_Style_And_Color")), 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}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), downBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Background")), downBackColor}, } ; JPanel pane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); @@ -102,4 +102,4 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { } } -} \ No newline at end of file +} 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 ef0c57ebb7..7a1567bf9e 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 @@ -51,7 +51,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { private static final int COLOR_REC_HEIGHT = 40; private static final int COLOR_REC_WIDTH = 30; protected static final int TEXTFIELD_HEIGHT = 20; - protected static final int TEXTFIELD_WIDTH = 140; + protected static final int TEXTFIELD_WIDTH = 130; protected static final int UPCONTROLPANE_WIDTH = 230; private static final int LAYOUR_DET = 6; private static final double VALUE = 100; @@ -83,7 +83,7 @@ public class UIColorPickerPane extends BasicPane implements UIObserver { regionNumPane.updateBean().intValue()), getValueArray(regionNumPane.updateBean().intValue())); } }); - 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 = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(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_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}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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[]{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 = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), regionNumPane}}; + Component[][] tmpComp = new Component[][]{new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), regionNumPane}}; stagePanel = TableLayout4VanChartHelper.createGapTableLayoutPane(tmpComp, rowSize, columnSize); Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Tick_And_Color")), designTypeButtonGroup}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 6d08de4975..7205814443 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 @@ -51,7 +51,7 @@ public class ChartTitlePane extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_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(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 7de40187b3..c383064097 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 @@ -51,7 +51,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane { } private void initComponents() { - isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Title_Is_Visible")); + isTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_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(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , + new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 3c679cfd3a..a4e47914eb 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 @@ -69,10 +69,10 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane{ protected String[] getNormalLayoutTipName() { return new String[] { - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_TopDownShade"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Transparent"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Plane3D"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"), styleName)){ + case ChartConstants.STYLE_SHADE: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Retro"), styleName)){ styleList.get(STYLE_SHADE).isPressing = true; lastStyleIndex = STYLE_SHADE; } break; - case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"), styleName)){ + case ChartConstants.STYLE_TRANSPARENT:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Fresh"), styleName)){ styleList.get(STYLE_TRANSPARENT).isPressing = true; lastStyleIndex = STYLE_TRANSPARENT; } break; - case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_3D: if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"), styleName)){ styleList.get(STYLE_PLANE3D).isPressing = true; lastStyleIndex = STYLE_PLANE3D; } break; - case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"), styleName)){ + case ChartConstants.STYLE_OUTER:if(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Retro"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Retro"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_TRANSPARENT).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Fresh"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Fresh"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_PLANE3D).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Bright"); preStyle = manager.getPreStyle(name); }else if(styleList.get(STYLE_HIGHLIGHT).isPressing){ - name = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Bright"); + name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 61fdad32d3..42667ee9d9 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 @@ -33,10 +33,10 @@ public class AreaPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - 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"); + String area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ stack + area, percent + stack + area, @@ -139,7 +139,7 @@ public class AreaPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_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 83566b3abd..280fca724c 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 @@ -31,16 +31,16 @@ public class BarPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - 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"); + String bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ bar, stack + bar, percent + stack + bar, td + bar, - td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", + td + bar + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", td + stack + bar, td + percent + stack + bar }; @@ -65,7 +65,7 @@ public class BarPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_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 9c2f56d113..103dbd1940 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 @@ -25,7 +25,7 @@ public class BubblePlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart") }; } @@ -44,7 +44,7 @@ public class BubblePlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"); } /** 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 30a4fa8b66..5f290d5926 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 @@ -30,16 +30,16 @@ public class ColumnPlotPane extends AbstractBarPane{ @Override protected String[] getTypeTipName() { - 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"); + String column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); + String td = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D"); return new String[]{ column, stack + column, percent + stack + column, td + column, - td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal") + ")", + td + column + "(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal") + ")", td + stack + column, td + percent + stack + column }; @@ -63,7 +63,7 @@ public class ColumnPlotPane extends AbstractBarPane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_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 8858cbc8cb..d6a46df458 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 @@ -26,7 +26,7 @@ public class CustomPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Chart") }; } @@ -45,7 +45,7 @@ public class CustomPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Comb_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_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 486152bfb0..e8643c34ff 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 @@ -35,10 +35,10 @@ public class DonutPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String donut = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); + String donut = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart"); return new String[]{ donut, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + donut + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + donut }; } @@ -103,7 +103,7 @@ public class DonutPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Donut"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Donut_Chart"); } /** 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 dd8e86316a..8f31c8c555 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 @@ -31,7 +31,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel") }; } @@ -50,7 +50,7 @@ public class FunnelPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_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 75094492e0..537fa46289 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 @@ -24,7 +24,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart") }; } @@ -47,7 +47,7 @@ public class GanttPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Gantt_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 ad33375944..25d2fa48f2 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 @@ -52,7 +52,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ if(styleList != null && !styleList.isEmpty()) { components = new Component[][]{ new Component[]{layoutPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Waring_Please_Input_The_Key"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Waring_Input_Key"))}, new Component[]{keyInput}, }; } @@ -72,7 +72,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map") + "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Map") }; } @@ -90,8 +90,8 @@ public class GisMapPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeLayoutTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_BaiduMap"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_GoogleMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_BaiduMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_GoogleMap") }; } @@ -172,7 +172,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{ * @return 标题 */ public String title4PopupWindow() { - return "gis"+com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); + return "gis"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 bcc8ff0faa..5afd3e2177 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 @@ -21,7 +21,7 @@ public class LinePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart") }; } @@ -83,7 +83,7 @@ public class LinePlotPane extends AbstractChartTypePane{ } public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-LineStyle_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"); } 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 fa667e1a26..661dba7590 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 @@ -50,10 +50,10 @@ public class MapPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Normal"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Bubble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Column") }; } @@ -72,7 +72,7 @@ public class MapPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Map"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 d3638408bb..811053641a 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 @@ -31,9 +31,9 @@ public class MeterPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { - String meter = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); + String meter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + meter, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") + meter, meter + "1", meter + "2" }; @@ -77,7 +77,7 @@ public class MeterPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Meter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); } /** 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 2509e4ec9b..98ccb0e533 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 @@ -36,10 +36,10 @@ public class PiePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { - String pie = com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); + String pie = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); return new String[]{ pie, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D") + pie + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_3D") + pie }; } @@ -63,7 +63,7 @@ public class PiePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-PieStyle_Normal"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); } 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 a9f45abb66..631a4d9d46 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 @@ -24,7 +24,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart") }; } @@ -48,7 +48,7 @@ public class RadarPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Radar_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 29ea3be8c9..405f9aa4fc 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 @@ -25,7 +25,7 @@ public class RangePlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Chart") }; } @@ -49,7 +49,7 @@ public class RangePlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ChartF-Range_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 ecc3514af2..567595703c 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 @@ -24,7 +24,7 @@ public class StockPlotPane extends AbstractChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stock_Chart") }; } @@ -48,7 +48,7 @@ public class StockPlotPane extends AbstractChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Stock_Chart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 ad4ad9e144..0effae28e1 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 @@ -28,7 +28,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker") }; } @@ -47,7 +47,7 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("I-xyScatterStyle_Marker"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_I_XYScatterStyle_Marker"); } /** @@ -86,4 +86,4 @@ public class XYScatterPlotPane extends AbstractChartTypePane{ public Chart getDefaultChart() { return XYScatterIndependentChart.XYScatterChartTypes[0]; } -} \ No newline at end of file +} 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 c2474606fb..2ed319249a 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 @@ -21,7 +21,7 @@ public class ChartEmptyDataStyleAction extends UpdateAction { public ChartEmptyDataStyleAction() { this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/EmptyChart.png")); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 310455339d..bc5d4ca9b9 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 @@ -83,7 +83,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { } }); - UILabel promptContent = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Content")); + UILabel promptContent = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEFT, TEN, 0); northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); return northPane; @@ -96,7 +96,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel previewContainerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); centerPane.add(previewContainerPane, BorderLayout.CENTER); - JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview")); + JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); previewOwnerPane.setLayout(new BorderLayout()); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); @@ -116,7 +116,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); - defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); + defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")); ButtonGroup buttonGroup = new ButtonGroup(); defaultRadioButton.setSelected(true); @@ -131,7 +131,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { jp.add(customRadioButton); selectPictureButton = new UIButton( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select")); selectPictureButton.addActionListener(getSelectPictureActionListener()); jp.add(selectPictureButton); @@ -210,7 +210,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 b306ae6a11..583a669ef6 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 @@ -32,11 +32,11 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - 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)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float"), ChartHyperRelateFloatLink.class, ChartHyperRelateFloatLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink_Form_Link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } -} \ No newline at end of file +} 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 a6353d36c3..66a103e657 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 @@ -53,8 +53,8 @@ public class ChartPreFillStylePane extends BasicBeanPane { JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - 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"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(" " + com.fr.design.i18n.Toolkit.i18nText("ColorMatch")), null}, + new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")), null}, new Component[]{null, customPane}, }; @@ -105,7 +105,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerM_Predefined_Styles"); } public void populateBean(ChartColorMatching condition) { @@ -162,4 +162,4 @@ public class ChartPreFillStylePane extends BasicBeanPane { return chartColorMatching; } -} \ No newline at end of file +} 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 e489364723..abae5118b3 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 @@ -27,14 +27,14 @@ public class ChartPreStyleManagerPane extends JListControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PreStyle"), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle_Duplicate"), ChartColorMatching.class, ChartPreStylePane.class) }; } @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart-PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle"); } public void populateBean() { @@ -70,4 +70,4 @@ public class ChartPreStyleManagerPane extends JListControlPane { } } -} \ No newline at end of file +} 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 907311a3b0..2b8f6ea321 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 @@ -39,7 +39,7 @@ public class ChartPreStylePane extends BasicBeanPane { JPanel pane = new JPanel(); pane.setLayout(new FlowLayout(FlowLayout.LEFT)); - pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"))); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"))); JPanel boxPane = new JPanel(); boxPane.setLayout(new BorderLayout()); @@ -103,7 +103,7 @@ public class ChartPreStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 53b2402fd7..473d55a405 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 @@ -28,10 +28,10 @@ public class FormHyperlinkGroup extends BaseHyperlinkGroup { public NameableCreator[] getHyperlinkCreators() { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - 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)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink_Form_Link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java index c633fa755f..9e4a84f038 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/AbstractExtendedChartReportDataPane.java @@ -58,17 +58,20 @@ public abstract class AbstractExtendedChartReportDataPane extends this.listener = listener; } + protected void setChart(Chart chart) { + if (chart instanceof AbstractChart) { + this.chart = (T) chart; + } + } + + protected T getChart() { + return this.chart; + } + + protected AttributeChangeListener getListener() { + return this.listener; + } + @Override protected JPanel createContentPane() { @@ -95,8 +109,11 @@ public abstract class AbstractExtendedStylePane extends if (collection != null) { Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart){ - this.chart = (T)chart; + if (chart != null) { + setChart(chart); + } + + if (this.chart != null) { paneList.get(tabPane.getSelectedIndex()).populateBean(this.chart); } @@ -109,8 +126,11 @@ public abstract class AbstractExtendedStylePane extends if (collection != null) { Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart){ - this.chart = (T)chart; + if (chart != null) { + setChart(chart); + } + + if (this.chart != null) { paneList.get(tabPane.getSelectedIndex()).updateBean(this.chart); } 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 099c008d21..a92e100e53 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,6 @@ 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.van.chart.designer.TableLayout4VanChartHelper; import javax.swing.JPanel; @@ -28,29 +27,42 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private UISpinner autoRefreshTime; private JPanel contentPane; + protected AbstractChart getAbstractChart(Chart chart) { + if (chart != null && chart instanceof AbstractChart) { + return (AbstractChart) chart; + } + return null; + } + @Override public void populate(ChartCollection collection) { - if (collection != null) { - Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart) { - hyperLinkPane.populateBean((AbstractChart) chart); - autoRefreshTime.setValue(((AbstractChart) chart).getAutoRefreshTime()); - refreshEnabled.setSelectedIndex(((AbstractChart) chart).isRefreshEnabled() ? 0 : 1); - checkRefreshEnable(); - } + if (collection == null || collection.getSelectedChart() == null) { + return; + } + + AbstractChart chart = getAbstractChart(collection.getSelectedChart()); + + if (chart != null) { + hyperLinkPane.populateBean(chart); + autoRefreshTime.setValue(chart.getAutoRefreshTime()); + refreshEnabled.setSelectedIndex(chart.isRefreshEnabled() ? 0 : 1); + checkRefreshEnable(); } } @Override public void update(ChartCollection collection) { - if (collection != null) { - Chart chart = collection.getSelectedChart(); - if (chart != null && chart instanceof AbstractChart) { - hyperLinkPane.updateBean((AbstractChart) chart); - ((AbstractChart) chart).setAutoRefreshTime(autoRefreshTime.getValue()); - ((AbstractChart) chart).setRefreshEnabled(refreshEnabled.getSelectedIndex() == 0); - } + if (collection == null || collection.getSelectedChart() == null) { + return; + } + + AbstractChart chart = getAbstractChart(collection.getSelectedChart()); + + if (chart != null) { + hyperLinkPane.updateBean(chart); + chart.setAutoRefreshTime(autoRefreshTime.getValue()); + chart.setRefreshEnabled(refreshEnabled.getSelectedIndex() == 0); } } @@ -97,7 +109,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds"))}, }; contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); @@ -105,9 +117,9 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { panel.add(refreshEnabled, BorderLayout.NORTH); panel.add(contentPane, BorderLayout.CENTER); - JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Design-Chart_Auto_Refresh"), panel); + JPanel gapPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Refresh"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Refresh"), gapPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Refresh"), gapPane); } private JPanel createHyperlinkPane() { diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java index a1375938d5..9e5ddd7b48 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java @@ -27,6 +27,12 @@ public class ExtendedTypePane extends AbstractChartType protected void setType(T chart, int index) { } + protected void populate(T chart) { + } + + protected void update(T chart) { + } + @Override public void populateBean(Chart chart) { if (getTypeIconPath().length > 0) { @@ -36,10 +42,13 @@ public class ExtendedTypePane extends AbstractChartType typeDemo.get(getTypeIndex((T) chart)).isPressing = true; checkDemosBackground(); } + populate((T) chart); } @Override public void updateBean(Chart chart) { + update((T) chart); + if (getTypeIconPath().length > 0) { for (int index = 0, len = typeDemo.size(); index < len; index++) { if (typeDemo.get(index).isPressing) { 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 79a1acdd1f..e8311cd2a8 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 @@ -202,7 +202,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { dialog.dispose(); if (result) { - int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION); + int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION); if (choose == JOptionPane.OK_OPTION) { RestartHelper.restart(); 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 0c6f1b84ec..2642daa288 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -27,14 +27,14 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - 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 area = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ area, stack + area, percent + stack + area, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewArea"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Area"); } 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 3c03971d46..4944869df8 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); private static final long serialVersionUID = 2879689884048643002L; @@ -27,14 +27,14 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - 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 bar = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ bar, stack + bar, percent + stack + bar, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -43,7 +43,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bar"); } 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 c0ec2ebe1d..7dad3847a0 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 @@ -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[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 25788b992d..9f6c47ae7e 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble");; + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Bubble");; private static final long serialVersionUID = -3481633368542654247L; @@ -38,8 +38,8 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_BubbleChart"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewForceBubble") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Chart"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Force_Bubble") }; } @@ -48,7 +48,7 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewBubble"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_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 e2c08011ca..3e2898f324 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 @@ -45,7 +45,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon xCombox.setPreferredSize(PREFERRED_SIZE); yCombox.setPreferredSize(PREFERRED_SIZE); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName}, new Component[]{new UILabel("x" ), xCombox}, new Component[]{new UILabel("y"), yCombox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), bubbleSize}, }; JPanel north = TableLayout4VanChartHelper.createGapTableLayoutPane(components_north,rowSize_north,columnSize_north); north.setBorder(BorderFactory.createEmptyBorder(10, 24, 10, 15)); - JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Filter"),dataScreeningPane); + JPanel filterPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"))){ + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 e9f4a4116f..c81317a813 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 @@ -14,7 +14,7 @@ public class ColumnBorderAttriPane extends BorderAttriPane { private UISpinner radius; public ColumnBorderAttriPane() { - this(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")); + this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 ce0cb06449..ffd13a1ab8 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); private static final long serialVersionUID = 5950923001789733745L; @@ -28,14 +28,14 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - 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 column = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); + String stack = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked"); + String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent"); return new String[]{ column, stack + column, percent + stack + column, - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -44,7 +44,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewColumn"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Column"); } 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 e94143c0de..a71babe8f9 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 @@ -86,8 +86,8 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { panel1.add(columnWidth, BorderLayout.CENTER); Component[][] components2 = new Component[][]{ - 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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap}, }; JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col); @@ -116,7 +116,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { checkImagePane(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), borderPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane); } private void checkAll() { @@ -196,4 +196,4 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { } } } -} \ No newline at end of file +} 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 e03fc26071..efa071305d 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 @@ -74,9 +74,9 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane{ yDirection = new UISpinner(0, 100, 1, 20); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position") + "(%): " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Direction"), SwingConstants.LEFT),xDirection}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position") + "(%): " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Direction"), SwingConstants.LEFT),xDirection}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Direction"), SwingConstants.RIGHT),yDirection}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius") + "(px): ",SwingConstants.LEFT),radius} 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 41e3da1c6d..7e4e8417b9 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 @@ -19,8 +19,8 @@ public class VanChartCustomAxisConditionPane extends VanChartCustomStackAndAxisC protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - 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("Fine-Design_Chart_X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),YAxis}, }; return components; 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 3e6777f74e..af11a8b960 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 @@ -14,7 +14,6 @@ import com.fr.design.chart.series.SeriesCondition.impl.ChartHyperRelateFloatLink import com.fr.design.chart.series.SeriesCondition.impl.FormHyperlinkPane; import com.fr.design.designer.TargetComponent; import com.fr.design.fun.HyperlinkProvider; -import com.fr.design.gui.HyperlinkFilterHelper; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.imenutable.UIMenuNameableCreator; @@ -23,8 +22,6 @@ import com.fr.design.hyperlink.WebHyperlinkPane; 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.NameObject; import com.fr.js.EmailJavaScript; import com.fr.js.FormHyperlinkProvider; @@ -35,6 +32,7 @@ import com.fr.js.NameJavaScriptGroup; import com.fr.js.ParameterJavaScript; import com.fr.js.ReportletHyperlink; import com.fr.js.WebHyperlink; +import com.fr.log.FineLoggerFactory; import com.fr.stable.ListMap; import com.fr.stable.Nameable; import com.fr.stable.bridge.StableFactory; @@ -74,7 +72,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { } - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { Constructor constructor = null; try { constructor = creator.getUpdatePane().getConstructor(HashMap.class, boolean.class); @@ -93,7 +91,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { } protected Map getHyperLinkEditorMap() { - return plot.getHyperLinkEditorMap(); + return getPlot().getHyperLinkEditorMap(); } /** @@ -102,17 +100,17 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { * @return 返回标题字符串. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"); } @Override protected String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Hyperlink"); } @Override - protected AddItemMenuDef getAddItemMenuDef (NameableCreator[] creators) { - return new AddVanChartItemMenuDef(creators); + protected void initShortCutFactory() { + this.shortCutFactory = VanChartShortCutFactory.newInstance(this); } public void populate(NameJavaScriptGroup nameHyperlink_array) { @@ -147,7 +145,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { } public void populate(Plot plot) { - this.plot = plot; + setPlot(plot); HashMap paneMap = getHyperlinkMap(plot); //安装平台内打开插件时,添加相应按钮 @@ -236,24 +234,24 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { protected java.util.List refreshList(HashMap map) { java.util.List list = new ArrayList(); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Reportlet"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Reportlet"), new ReportletHyperlink(), getUseMap(map, ReportletHyperlink.class))); - 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"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Mail"), new EmailJavaScript(), VanChartEmailPane.class)); + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Web"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Dynamic_Parameters"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Float_Chart"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), new ChartHyperPoplink(), getUseMap(map, ChartHyperPoplink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Cell"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Cell"), new ChartHyperRelateCellLink(), getUseMap(map, ChartHyperRelateCellLink.class))); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Float"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Float"), new ChartHyperRelateFloatLink(), getUseMap(map, ChartHyperRelateFloatLink.class))); FormHyperlinkProvider hyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); - list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Chart-Link_Form"), + list.add(new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Link_Form"), hyperlink, getUseMap(map, FormHyperlinkProvider.class))); return list; @@ -272,18 +270,6 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { return null; } - protected class AddVanChartItemMenuDef extends AddItemMenuDef { - - public AddVanChartItemMenuDef(NameableCreator[] creators) { - super(creators); - } - - @Override - protected boolean whetherAdd(String itemName) { - return HyperlinkFilterHelper.whetherAddHyperlink4Chart(itemName); - } - } - //邮箱 public static class VanChartEmailPane extends ChartEmailPane { @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartShortCutFactory.java b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartShortCutFactory.java new file mode 100644 index 0000000000..b9b41302e0 --- /dev/null +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartShortCutFactory.java @@ -0,0 +1,37 @@ +package com.fr.van.chart.custom.component; + +import com.fr.design.gui.HyperlinkFilterHelper; +import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.shortcutfactory.ShortCutFactory; +import com.fr.design.gui.controlpane.ShortCutListenerProvider; +import com.fr.design.menu.ShortCut; + +/** + * Created by plough on 2018/8/13. + */ +class VanChartShortCutFactory extends ShortCutFactory { + private VanChartShortCutFactory(ShortCutListenerProvider listenerProvider) { + super(listenerProvider); + } + + public static VanChartShortCutFactory newInstance(ShortCutListenerProvider listenerProvider) { + return new VanChartShortCutFactory(listenerProvider); + } + + @Override + public ShortCut createAddItemMenuDef(NameableCreator[] creators) { + return new AddVanChartItemMenuDef(creators); + } + + private class AddVanChartItemMenuDef extends AddItemMenuDef { + + AddVanChartItemMenuDef(NameableCreator[] creators) { + super(creators); + } + + @Override + protected boolean whetherAdd(String itemName) { + return HyperlinkFilterHelper.whetherAddHyperlink4Chart(itemName); + } + } +} 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 7773b9f211..da696fcce7 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 @@ -66,6 +66,6 @@ public class VanChartCustomConditionAttrPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Condition_Display"); } } 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 97d24338f5..44c0e1a551 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 @@ -36,7 +36,7 @@ public class VanChartBeautyPane extends BasicBeanPane { } protected String[] getNameArray(){ - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"), + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade") }; } 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 cdce6c8407..e395f26e94 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("ColorMatch")),styleSelectBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")),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 dcd0ba5eb5..4276be541e 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 @@ -25,7 +25,7 @@ public class VanChartFloatPositionPane extends BasicBeanPane { this.setLayout(new BorderLayout()); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_XYFromTheUpLeft")), BorderLayout.CENTER); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_From_UpLeft")), BorderLayout.CENTER); this.add(createCustomFloatPositionPane(), BorderLayout.SOUTH); } 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 bfc1a2cf4f..012677304a 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 @@ -53,7 +53,7 @@ public class VanChartLineTypePane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),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("Fine-Design_Chart_Style_Present")),lineStyle}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")),nullValueBreak}, }; 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 89779c6286..e2aff03f54 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,6 @@ 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.plugin.chart.base.VanChartAttrMarker; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; @@ -25,7 +24,7 @@ public class VanChartMarkerPane extends BasicPane { private JPanel centerPane; private CardLayout cardLayout; - private BasicBeanPane commonMarkerPane; + private VanChartCommonMarkerPane commonMarkerPane; private BasicBeanPane imageMarkerPane; @@ -75,7 +74,7 @@ public class VanChartMarkerPane extends BasicPane { return new VanChartImageMarkerPane(); } - protected BasicBeanPane createCommonMarkerPane() { + protected VanChartCommonMarkerPane createCommonMarkerPane() { return new VanChartCommonMarkerPane(){ protected double[] getcolumnSize () { double s = TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH; @@ -111,6 +110,7 @@ public class VanChartMarkerPane extends BasicPane { commonMarkerPane.populateBean(marker); } else { imageMarkerPane.populateBean(marker); + commonMarkerPane.setDefaultValue(); } checkCenterPane(); 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 24e0d8d4a6..af03afbe91 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 @@ -98,7 +98,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane(textArray, valueArray); directionPane.setSelectedIndex(0); @@ -102,4 +102,4 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 23a2f73734..9f2bdf6bc0 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 @@ -33,7 +33,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane { protected Component[][] getPaneComponents() { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox}, new Component[]{null, centerPane}, }; } 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 d42b967859..c90fef0a41 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 @@ -44,7 +44,7 @@ public class VanChartBorderPane extends BasicPane { return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),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("Fine-Design_Chart_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 a9edf4cd54..d185f735a1 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 @@ -30,7 +30,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),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("Fine-Design_Chart_Color")),currentLineColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 05b6d56173..f23e0f01ec 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 @@ -29,8 +29,8 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane { return new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 1d64d257c7..2e0d55a41f 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 @@ -18,6 +18,6 @@ public class CategoryNameFormatPaneWithCheckBox extends VanChartFormatPaneWithCh @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name"); } } 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 de5e194a54..442f846112 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 @@ -16,6 +16,6 @@ public class MapAreaNameFormatPaneWithCheckBox extends CategoryNameFormatPaneWit @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 4355bf7f27..35f53e5068 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 @@ -18,7 +18,7 @@ public class PercentFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBo @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Percent"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 a6b455db5c..ef51fe1a72 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 @@ -18,6 +18,6 @@ public class SeriesNameFormatPaneWithCheckBox extends VanChartFormatPaneWithChec @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 77cd36e33e..1f120e5dd0 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 @@ -18,6 +18,6 @@ public class ValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 7bb9f71d57..3c8591bd63 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 @@ -41,7 +41,7 @@ public abstract class VanChartFormatPaneWithCheckBox extends JPanel{ this.setLayout(new BorderLayout()); isSelectedBox = new UICheckBox(getCheckBoxText()); - formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + formatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/marker/VanChartCommonMarkerPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java index 16388f1dd9..7a03bd465f 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,6 @@ 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.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.van.chart.designer.TableLayout4VanChartHelper; @@ -130,7 +129,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane protected Component[][] getUseComponent() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Fill_Color")), markerFillColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius}, }; @@ -138,7 +137,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane protected Component[][] getUseComponentWithOutFillColor() { return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius}, }; } @@ -154,6 +153,9 @@ public class VanChartCommonMarkerPane extends BasicBeanPane return "commonMarker"; } + public void setDefaultValue() { + } + @Override public void populateBean(VanChartAttrMarker marker) { if(marker == null){ 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 3e48ed8261..da07def4e5 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 @@ -16,11 +16,11 @@ public class OneDimensionalPlotReportDataContentPane extends MeterPlotReportData @Override protected String getCateNameString() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"); } @Override protected String getNValueString() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 4b5e3a8138..0c68d6f756 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 @@ -108,7 +108,7 @@ public class AutoRefreshPane extends BasicBeanPane { protected Component[][] initComponent(JPanel autoTooltipPane){ return new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Seconds"))}, new Component[]{autoTooltip,null, tooltipSet}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrContentPane.java index bc37fee560..3028f07200 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionAttrContentPane.java @@ -27,10 +27,16 @@ public class VanChartConditionAttrContentPane extends AbstractConditionAttrConte populateBean(plot, collection, showPane); } - public void populateBean(Plot plot, ConditionCollection collection, Class showPane){ + public void populateBean(final Plot plot, ConditionCollection collection, Class showPane) { if (conditionPane == null) { - conditionPane = new VanChartConditionListControlPane(plot); + conditionPane = new VanChartConditionListControlPane() { + @Override + protected Plot getPlot() { + return plot; + } + }; + } this.setLayout(new BorderLayout()); 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 0ddefeb1f5..1e4c5cea76 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 @@ -37,7 +37,7 @@ public class VanChartConditionAttrPane extends AbstractVanChartScrollPane */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 ba477f110d..004adba784 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 @@ -1,6 +1,5 @@ package com.fr.van.chart.designer.other; -import com.fr.base.chart.BasePlot; import com.fr.chart.chartattr.Plot; import com.fr.chart.chartglyph.ConditionAttr; import com.fr.chart.chartglyph.ConditionCollection; @@ -9,7 +8,6 @@ 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.NameObject; import com.fr.stable.Nameable; import com.fr.van.chart.designer.component.VanChartUIListControlPane; @@ -23,29 +21,25 @@ import java.lang.reflect.InvocationTargetException; */ public class VanChartConditionListControlPane extends VanChartUIListControlPane { - public VanChartConditionListControlPane(BasePlot plot) { - super(plot); - } - public void populate(Nameable[] nameableArray, Class showPane) { initComponentPane(); this.setBorder(null); - NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, showPane)}; + NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, showPane)}; refreshNameableCreator(creators); super.populate(nameableArray); } @Override public NameableCreator[] createNameableCreators() { - return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; + return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane(getPlot()).getClass())}; } - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { Constructor constructor = null; try { constructor = creator.getUpdatePane().getConstructor(Plot.class); - return constructor.newInstance(plot); + return constructor.newInstance(getPlot()); } catch (InstantiationException e) { throw new RuntimeException(e); @@ -62,12 +56,12 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane @Override public String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Condition"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition"); } @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3b85485ad2..664b3d8cf6 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 @@ -74,7 +74,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Interactive_Tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive_Tab"); } @Override @@ -121,11 +121,11 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { zoomType = new UIButtonGroup(getNameArray(), getValueArray()); zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); - JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget); + JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Widget"), zoomWidget); JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Boundary")), zoomResize}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_From")), from}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_To")), to}, }; @@ -143,12 +143,12 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { checkZoomPane(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Zoom"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Zoom"), panel); } protected JPanel getzoomTypePane(UIButtonGroup zoomType) { - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomType"), zoomType); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Direction"), zoomType); } protected JPanel createZoomPaneContent(JPanel zoomWidgetPane, JPanel zoomGesturePane, JPanel changeEnablePane, JPanel zoomTypePane, VanChartPlot plot) { @@ -194,8 +194,8 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected String[] getNameArray() { - 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")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis") + ,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")}; } protected String[] getValueArray() { @@ -213,7 +213,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { Component[][] components = createToolBarComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ToolBar"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ToolBar"), panel); } protected double[] getToolBarRowSize () { 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 e028c6e318..706a9cb75c 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 @@ -39,7 +39,7 @@ public class VanChartLabelConditionPane extends AbstractNormalMultiLineCondition * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"); } public void setDefault() { 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 4ec723f197..d4668d5c5f 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 @@ -39,7 +39,7 @@ public class VanChartTooltipConditionPane extends AbstractNormalMultiLineConditi * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Point_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 9464654077..328d7fcacb 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 @@ -16,7 +16,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } @Override @@ -34,7 +34,7 @@ public class VanChartTrendLineConditionPane extends AbstractNormalMultiLineCondi * @return item的名称 */ public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } @Override 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 83d2c8602d..fbe2d903e1 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 @@ -78,7 +78,7 @@ public class VanChartPlotLegendPane extends BasicPane { } protected void initComponents(){ - isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Legend_Is_Visible")); + isLegendVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Legend_Visible")); legendPane = createLegendPane(); double p = TableLayout.PREFERRED; @@ -151,8 +151,8 @@ public class VanChartPlotLegendPane extends BasicPane { } protected JPanel createTitlePositionPane(double[] row, double[] col){ - 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")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Bottom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Alignment_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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"), @@ -169,7 +169,7 @@ public class VanChartPlotLegendPane extends BasicPane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),location}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); } private void initPositionListener(){ @@ -226,7 +226,7 @@ public class VanChartPlotLegendPane extends BasicPane { protected JPanel createTitleStylePane(){ textAttrPane = new ChartTextAttrPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane); } protected JPanel createDisplayStrategy(){ @@ -343,4 +343,4 @@ public class VanChartPlotLegendPane extends BasicPane { checkAllUse(); } -} \ No newline at end of file +} 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 7d09b1e5cf..64d5fe357d 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 @@ -81,7 +81,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { } private void initComponents() { - isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Title_Is_Visible")); + isTitleVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Title_Visible")); titlePane = createTitlePane(); double p = TableLayout.PREFERRED; @@ -131,7 +131,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html")); Component[][] components = new Component[][]{ new Component[]{null ,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"), SwingConstants.LEFT), titleContent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), SwingConstants.LEFT), titleContent}, new Component[]{null ,useHtml}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); @@ -150,7 +150,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { Component[][] components = new Component[][]{ new Component[]{null,null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), SwingConstants.LEFT),alignmentPane}, new Component[]{null,customFloatPositionButton} }; @@ -159,12 +159,12 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { initPositionListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } private JPanel createTitleStylePane(){ textAttrPane = new ChartTextAttrPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane); } private JPanel createDisplayStrategy(){ @@ -340,4 +340,4 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane { backgroundPane.update(title); } -} \ No newline at end of file +} 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 beaf751e72..eda8ea007d 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 @@ -57,7 +57,7 @@ public class VanChartAxisScrollPaneWithTypeSelect extends AbstractVanChartScroll protected void initLayout() { this.setLayout(new BorderLayout(0,6)); - JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type"),jcb); + JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 384db70310..ca9419c427 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 @@ -134,7 +134,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),titleContent}, new Component[]{null,titleUseHtml}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position")),titleAlignPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),titleAlignPane}, new Component[]{titleTextAttrPane,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),titleTextRotation}, }; @@ -161,7 +161,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelTextRotation = new UINumberDragPane(-ROTATION_MAX,ROTATION_MAX); @@ -169,7 +169,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { labelGapValue = new UITextField(); Component[][] gapComponents = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), labelTextRotation}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelGapStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Interval")), labelGapStyle}, }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col); labelGapValuePane= TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText(""),labelGapValue, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); @@ -238,8 +238,8 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - 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("Fine-Design_Chart_Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),axisLineColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),mainTick}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),secondTick}, }; @@ -251,18 +251,18 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { Component[][] components = new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),position}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")),reversed}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")),reversed}, } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel); } private String[] getAxisPositionNameArray(boolean isXAxis){ if(isXAxis){ return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; } else { - 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("Fine-Design_Chart_Axis_Vertical_Zero")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Vertical_Zero")}; } } @@ -327,7 +327,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); } protected FormatPane createFormatPane(){ @@ -660,4 +660,4 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { public VanChartAxis updateBean(){ return null; } -} \ No newline at end of file +} 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 37009c62a9..3a43866a23 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 @@ -82,7 +82,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private JPanel createValueDefinition(){ timeMinMaxValuePane = new TimeMinMaxValuePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), timeMinMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), timeMinMaxValuePane); } @Override @@ -165,8 +165,8 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { secTickPane.add(secondUnitField); secTickPane.add(secondType); - 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); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); @@ -199,9 +199,9 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMin() { // 最小值. - minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"})); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); @@ -214,9 +214,9 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMax() { // 最大值 - maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"})); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); @@ -229,7 +229,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { private void initMain() { // 主要刻度单位 - mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_MainType"})); + mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type")); 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(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_SecType"})); + secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type")); secondUnitField = new UITextField(); secondUnitField.setPreferredSize(new Dimension(20, 20)); secondType = new UIComboBox(TYPES); @@ -385,4 +385,4 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { } } -} \ No newline at end of file +} 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 7bc4da6da5..39ae32372f 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 @@ -63,7 +63,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { protected JPanel createMinMaxValuePane(double[] row, double[] col){ JPanel panel = createCommenValuePane(row,col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), panel); } protected JPanel createCommenValuePane(double[] row, double[] col){ initMinMaxValuePane(); @@ -120,7 +120,7 @@ public class VanChartValueAxisPane extends VanChartBaseAxisPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueAxis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Axis"); } 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 f6ac2a3d51..9460e6ac20 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 @@ -105,7 +105,7 @@ public class VanChartAxisButtonPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Types_Switch"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch_Chart"); } @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 def5e149e7..e1367371e3 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 @@ -60,8 +60,8 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane { @Override protected Component[][] getPanelComponents() { - 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); + minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); + maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Type"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH); 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 a5d1d5c485..e047830291 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 @@ -77,7 +77,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { } protected JPanel createLabelPane(double[] row, double[] col){ - showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); + showLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hidden")}); labelTextAttrPane = getChartTextAttrPane(); labelPanel = new JPanel(new BorderLayout()); labelPanel.add(labelTextAttrPane); @@ -108,7 +108,7 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane { minMaxValuePane = new VanChartMinMaxValuePane(); break; } - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), minMaxValuePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), minMaxValuePane); } private JPanel createTickColorPane(double[] row, double[] col){ 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 97ca274694..fa77258537 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 @@ -54,8 +54,8 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} }; return TableLayoutHelper.createTableLayoutPane(components, row, col); 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 face171416..c69fc9b52e 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 @@ -40,8 +40,8 @@ public class VanChartRadarXAxisPane extends VanChartBaseAxisPane { protected Component[][] getLineStylePaneComponents() { return new Component[][]{ new Component[]{null,null} , - 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("Fine-Design_Chart_Type")),axisLineStyle} , + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 0727cd4d0e..f7567ed211 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 @@ -60,14 +60,14 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH; double[] columnSize = {f, e}; - valueStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing"), + valueStyle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")}); JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize); tableDataPane = new RadarTableDataPane(); centerPane = new JPanel(new CardLayout()); - centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing")); + centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")); centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")); JPanel contentPane = new JPanel(new BorderLayout()); @@ -80,7 +80,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { } }); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueDefinition"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Definition"), 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(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("Fine-Design_Chart_Type")), axisLineStyle}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), axisLineColor}, }; } @@ -101,7 +101,7 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane { if (centerPane != null && valueStyle != null) { CardLayout cardLayout = (CardLayout) centerPane.getLayout(); if (valueStyle.getSelectedIndex() == 0) { - cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unified_Computing")); + cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Unified_Count")); } else { cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Respectively_Specified")); } 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 428d20a134..0acf05632c 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,6 @@ 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.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; @@ -25,7 +24,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - 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")}, + return new ChartNameObjectCreator[]{new ChartNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alert_Line"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } @@ -35,19 +34,19 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { } protected String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Alert_Line"); } protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } public void populate(Plot plot) { - this.plot = plot; + setPlot(plot); VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot; List xAxisList = rectanglePlot.getXAxisList(); List yAxisList = rectanglePlot.getYAxisList(); 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 95e6a48a46..096948b8ac 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,6 @@ 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.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.axis.VanChartAlertValue; @@ -26,7 +25,7 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { @Override public NameableCreator[] createNameableCreators() { - 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")}, + return new BackgroundNameObjectCreator[]{new BackgroundNameObjectCreator(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Interval_Background"), VanChartAlertValue.class, VanChartAlertValuePane.class)}; } @@ -42,14 +41,14 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } public void populate(Plot plot) { - this.plot = plot; + setPlot(plot); VanChartRectanglePlot rectanglePlot = (VanChartRectanglePlot) plot; List xAxisList = rectanglePlot.getXAxisList(); List yAxisList = rectanglePlot.getYAxisList(); 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 2821564bf0..282ad45129 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 @@ -103,10 +103,10 @@ public class VanChartAlertValuePane extends BasicBeanPane { protected Component[][] getTopPaneComponents() { return new Component[][]{ - 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("Fine-Design_Chart_Layout_Position")),alertAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position")),alertTextPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Form_Font")),fontName}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")),fontColor}, }; return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java index 7826866d45..08c474c3ed 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAxisAreaPane.java @@ -66,14 +66,14 @@ public class VanChartAxisAreaPane extends BasicBeanPane { verticalGridLine = new ColorSelectBox(100); Component[][] components = getGridLinePaneComponents(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("ChartF-Grid_Line"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Grid_Line"), panel); } protected Component[][] getGridLinePaneComponents() { return new Component[][]{ new Component[]{null, null}, - 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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal")), horizontalGridLine}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")), verticalGridLine}, }; } @@ -108,7 +108,7 @@ public class VanChartAxisAreaPane extends BasicBeanPane { } }); JPanel intervalPane = new JPanel(new BorderLayout(0, 6)); - JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back"), isDefaultIntervalBackground); + JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background"), isDefaultIntervalBackground); intervalPane.add(panel1, BorderLayout.NORTH); intervalPane.add(centerPane, BorderLayout.CENTER); JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interval_Background"), intervalPane); @@ -123,8 +123,8 @@ public class VanChartAxisAreaPane extends BasicBeanPane { protected Component[][] getIntervalPaneComponents() { return new Component[][]{ new Component[]{null, null}, - 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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal")), horizontalColorBackground}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")), verticalColorBackground}, }; } 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 9f27487dd4..81aa8d276d 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 @@ -61,17 +61,17 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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("Fine-Design_Chart_Widget_Style"),textAttrPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, }; 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 01c65d6580..9a26a87116 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 @@ -124,12 +124,12 @@ public class VanChartPlotLabelDetailPane extends BasicPane { Component[][] comps = new Component[2][2]; comps[0] = new Component[]{null,null}; - comps[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position"), SwingConstants.LEFT), position}; + comps[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("ChartF-Show_GuidLine")); + tractionLine = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Guideline")); tractionLinePane = TableLayout4VanChartHelper.createGapTableLayoutPane("",tractionLine); panel.add(tractionLinePane, BorderLayout.SOUTH); initPositionListener(); @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } @@ -164,7 +164,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane { initStyleListener(); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot),row,col); - return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); + return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel); } protected ChartTextAttrPane initTextFontPane () { @@ -273,4 +273,4 @@ public class VanChartPlotLabelDetailPane extends BasicPane { } } -} \ No newline at end of file +} 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 8a6aa9fcd7..e0a007dd25 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 @@ -31,7 +31,7 @@ public class VanChartPlotLabelPane extends BasicPane { public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) { this.parent = parent; this.plot = plot; - isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseLabel")); + isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Label")); 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 5b2826a87c..efc91258a0 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 @@ -129,7 +129,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //趋势线 protected JPanel createTrendLinePane() { trendLinePane = new VanChartTrendLinePane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"), trendLinePane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"), trendLinePane); } //线 @@ -151,7 +151,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP //填充颜色 protected JPanel createAreaFillColorPane() { areaSeriesFillColorPane = new VanChartAreaSeriesFillColorPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart_Area"), areaSeriesFillColorPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area"), areaSeriesFillColorPane); } //边框（默认没有圆角） 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 8ead0e2837..c3bf0bc159 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 @@ -65,7 +65,7 @@ public class VanChartEffectPane extends BasicBeanPane { label1.setPreferredSize(new Dimension((int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH, 20)); periodPane.add(label1, BorderLayout.WEST); periodPane.add(period, BorderLayout.CENTER); - periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second")), BorderLayout.EAST); + periodPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Second")), BorderLayout.EAST); return periodPane; } 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 70cdcc399f..a6886e3b0a 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,6 @@ 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.NameObject; import com.fr.plugin.chart.attr.DefaultAxisHelper; import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot; @@ -31,7 +30,7 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stack_And_Series"); } protected String getAddItemText() { @@ -40,14 +39,14 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } public void populate(VanChartRectanglePlot plot) { - this.plot = plot; + setPlot(plot); String[] axisXNames = DefaultAxisHelper.getXAxisNames(plot); String[] axisYNames = DefaultAxisHelper.getYAxisNames(plot); @@ -96,6 +95,6 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl } public String getPaneTitle() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackAndSeries"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stack_And_Series"); } } 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 77db5f0da8..2aa68b09a8 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 @@ -18,7 +18,7 @@ public class VanChartPlotTooltipNoCheckPane extends VanChartPlotTooltipPane { } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip")); 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 e041651266..fe8b0f0321 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 @@ -50,7 +50,7 @@ public class VanChartPlotTooltipPane extends BasicPane { } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip")); tooltipPane = createTooltipPane(plot); double p = TableLayout.PREFERRED; @@ -125,7 +125,7 @@ public class VanChartPlotTooltipPane extends BasicPane { initStyleListener(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel1); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel1); } @@ -237,4 +237,4 @@ public class VanChartPlotTooltipPane extends BasicPane { return attrTooltip; } -} \ No newline at end of file +} 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 66607f8831..4f5ab5e21d 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 @@ -112,6 +112,6 @@ public class DrillMapDataPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 c08a67a656..6fd6ecabbc 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 @@ -198,6 +198,6 @@ public class DrillMapLayerPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Drill"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Drill_Level"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java index 1d0cf31770..9423434bd1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/type/VanChartDrillMapPlotPane.java @@ -18,7 +18,7 @@ import java.util.ArrayList; */ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Map"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map"); @Override protected String[] getTypeIconPath() { @@ -41,9 +41,9 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - 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_CustomDrillMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map") }; } @@ -74,7 +74,7 @@ public class VanChartDrillMapPlotPane extends VanChartMapPlotPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Map"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill_Map"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java index a5b90d23bf..0ca6b0a71a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/FunnelPercentFormatPaneWithCheckBox.java @@ -15,6 +15,6 @@ public class FunnelPercentFormatPaneWithCheckBox extends PercentFormatPaneWithCh } protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Conversion"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Conversion"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java index e5067699cf..a6a8dcb9a9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java @@ -66,7 +66,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane { JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } public void populateBean(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java index 88a97ff28b..cfcb352f48 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * Created by Mitisky on 16/10/10. */ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewFunnel"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); @Override protected String[] getTypeIconPath() { @@ -25,7 +25,7 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Funnel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel") }; } @@ -46,7 +46,7 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewFunnel"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Funnel"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java index 7b14f9dd72..08b50d6e11 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java @@ -34,7 +34,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane dataPane = new NormalChartDataPane(listener, parent){ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart"); } }; linkPane = new NormalChartDataPane(listener, parent){ 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 e1872c3a5a..01e8e70e71 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 @@ -40,17 +40,17 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{ } private void initAllComponent() { - seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")); + seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); - startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")); + startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time")); - endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")); + endTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time")); markerTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")); - progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process")); + progress = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process")); - linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID")); + linkID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 85227cd4a1..14691049a1 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 @@ -25,7 +25,7 @@ public class GanttReportDataProjectPane extends AbstractReportDataContentPane im private List processPaneList = new ArrayList(); public GanttReportDataProjectPane() { - firstProcessPane = new TinyFormulaWithButtonPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"), "/com/fr/design/images/buttonicon/add.png") { + firstProcessPane = new TinyFormulaWithButtonPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Items") + (index + 1); + String content = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 16ed1b2698..b8a2001147 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None"); + private static final String NONE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"); private UIComboBox seriesComboBox; private UIComboBox startTimeComboBox; @@ -68,12 +68,12 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ double[] col = {p,f}; Component[][] components = new Component[][]{ - 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("Fine-Design_Chart_Series_Name")), seriesComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time")), startTimeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time")), endTimeComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process")), processComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 d49883b436..c1cb298276 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 @@ -40,7 +40,7 @@ public class GanttTableDataProjectPane extends AbstractTableDataContentPane impl projectName = new ComboBoxWithButtonPane(){ @Override protected String getTitleText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java index 992d13d54e..56e2381312 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/link/GanttLinkTableDataPane.java @@ -1,6 +1,6 @@ package com.fr.van.chart.gantt.designer.data.link; -import com.fr.chart.chartattr.Plot; +import com.fr.chart.chartattr.Chart; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.data.TableDataPane; import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane; @@ -14,7 +14,7 @@ public class GanttLinkTableDataPane extends TableDataPane { } @Override - protected AbstractTableDataContentPane getContentPane(Plot plot) { + protected AbstractTableDataContentPane getContentPane(Chart chart) { return new GanttLinkTableDataContentPane(); } } 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 1d7a359317..51e045edfb 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 @@ -36,7 +36,7 @@ public class GanttAxisStylePane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{textAttrPane, null}, - 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("Fine-Design_Chart_Color")), colorSelectBox4button}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; 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 c3c3392da1..c642c3e130 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 @@ -93,7 +93,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane { JPanel jPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Proportion"), panel); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-DataFunction_Percent"), jPanel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Percent"), jPanel); } private void checkoutPaneVisible() { 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 458e7543e5..04d4e46dca 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,11 +4,11 @@ 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.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.marker.type.MarkerType; import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; +import java.awt.Color; import java.awt.Component; /** @@ -28,7 +28,7 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane { return new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape")), getMarkerPane()}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelect} }; } @@ -44,6 +44,16 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane { @Override protected void updateColor(VanChartAttrMarker marker) { - marker.setColorBackground(ColorBackground.getInstance(colorSelect.getSelectObject())); + Color color = colorSelect.getSelectObject(); + color = color == null ? new Color(248, 182, 44) : color; + + marker.setColorBackground(ColorBackground.getInstance(color)); + } + + @Override + public void setDefaultValue() { + getMarkerPane().setSelectedMarker(Marker.createMarker(MarkerType.MARKER_STAR)); + colorSelect.setSelectObject(new Color(248, 182, 44)); } + } 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 a08afc5eb6..8b96c36940 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,12 +9,12 @@ 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.plugin.chart.base.VanChartAttrMarker; import com.fr.plugin.chart.gantt.VanChartGanttPlot; import com.fr.stable.CoreConstants; import com.fr.van.chart.designer.TableLayout4VanChartHelper; import com.fr.van.chart.designer.component.VanChartMarkerPane; +import com.fr.van.chart.designer.component.marker.VanChartCommonMarkerPane; import com.fr.van.chart.designer.style.series.VanChartAbstractPlotSeriesPane; import javax.swing.JPanel; @@ -70,7 +70,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), lineWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), colorSelect} }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); @@ -82,7 +82,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { protected JPanel createMarkerPane() { markerPane = new VanChartMarkerPane(){ @Override - protected BasicBeanPane createCommonMarkerPane() { + protected VanChartCommonMarkerPane createCommonMarkerPane() { return new VanChartGanttCommonMarkerPane(); } 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 874c5887f6..6bff1d5708 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 @@ -40,27 +40,27 @@ public class VanChartGanttTooltipContentPane extends VanChartTooltipContentPane processesFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane); startTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Time"); } }; endTimeFormatPane = new VanChartDateFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Time"); } }; durationFormatPane = new VanChartFormatComBoxWithCheckBox(); progressFormatPane = new VanChartFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Process"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Process"); } }; } 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 cb792743d1..a9c8bbdabb 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt"); @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[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_GanttChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gantt_Chart") }; } @@ -36,7 +36,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGantt"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gantt"); } 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 e4df563c67..f49752b1c9 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); private static final long serialVersionUID = -4599483879031804911L; @@ -28,11 +28,11 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { - 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") + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Pointer180"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Ring"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Slot"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gauge_Cuvette") }; } @@ -41,7 +41,7 @@ public class VanChartGaugePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewGauge"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Gauge"); } 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 7c7648464d..79509aee25 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 @@ -66,7 +66,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { } private JPanel createGaugeLayoutPane() { - 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")}); + gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Direction_Vertical")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override @@ -74,7 +74,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { changeLabelPosition(); } }); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Layout"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel); } private void changeLabelPosition() { @@ -107,7 +107,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation_Direction"), rotate); panel.add(panel1, BorderLayout.NORTH); } - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel); } private Component[][] getDiffComponentsWithGaugeStyle() { @@ -260,4 +260,4 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { colorPickerPane.updateBean(detailStyle.getHotAreaColor()); } } -} \ No newline at end of file +} 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 455cd5d755..f4c7bd4769 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 @@ -117,7 +117,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } 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 8f717c2214..fd6cf6d19e 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); @Override protected String[] getTypeIconPath() { @@ -27,7 +27,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_HeatMap") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_HeatMap") }; } @@ -48,7 +48,7 @@ public class VanChartHeatMapTypePane extends VanChartMapPlotPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewHeatMap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_HeatMap"); } @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 7c462d1358..17f6042d8a 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 @@ -12,9 +12,9 @@ import java.awt.Component; public class VanChartLineCustomStackAndAxisConditionPane extends VanChartCustomStackAndAxisConditionPane { protected Component[][] getDeployComponents() { Component[][] components = new Component[][]{ - 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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Axis")),XAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Axis")),YAxis}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 e70f8178d3..9dac6fbe35 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line"); private static final long serialVersionUID = -8161581682558781651L; @Override @@ -26,9 +26,9 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Chart"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Mode_Custom") }; } @@ -37,7 +37,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewLine"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Line"); } /** 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 5e7a651fc4..df23244ccb 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 @@ -51,8 +51,8 @@ import java.awt.event.ItemListener; * 地图-系列界面 */ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { - 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 AREA_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region"); + private static final String POINT_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Point"); private static final String LINE_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Flow"); private static final String[] MARKER_TYPES = new String[]{MapMarkerType.DEFAULT.toLocalString(), 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 95f6922391..35f3046d9e 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 @@ -10,8 +10,8 @@ import javax.swing.JPanel; * 点地图和区域地图的各种配置 */ public class VanMapAreaAndPointGroupPane extends VanChartGroupPane { - 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 AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 bd9a502928..569d0850cb 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 @@ -12,9 +12,9 @@ import javax.swing.border.Border; * 点地图和区域地图的各种配置 */ public class VanMapAreaPointAndLineGroupPane extends VanChartGroupPane { - 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"); + private static final String AREA_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"); + private static final String POINT_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"); + private static final String LINE_MAP_STRING = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 845de7d646..8517e64fb8 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 @@ -37,7 +37,7 @@ public class AreaPane extends AbstractReportDataContentPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 59c22771f6..f8fc771828 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 @@ -16,7 +16,7 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { protected Component[][] getComponent () { return new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitude}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Latitude")), latitude}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_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 1cd5ab2732..f03cda28ac 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 @@ -40,9 +40,9 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - 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} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 fb5b955c2b..d765ed425f 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 @@ -52,7 +52,7 @@ public class AreaPane extends AbstractTableDataContentPane { protected Component[][] getComponent () { return new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 af52884a40..bb0f7a5bbe 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 @@ -21,7 +21,7 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane { protected Component[][] getComponent () { return new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Longitude")), longitudeCom}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Chart_End_Latitude")), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_Latitude")), latitudeCom}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_End_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 b1ee95d6ab..68e71f7e3e 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 @@ -42,9 +42,9 @@ public class LongLatAreaPane extends AreaPane { protected Component[][] getComponent () { return new Component[][]{ - 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} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitudeCom}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 133f19ae2d..3de16e047a 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 @@ -36,7 +36,7 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte protected void initLayout() { this.setLayout(new BorderLayout(4, 0)); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Series_Name"), - com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 ae9cee5da9..3f82744eab 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 @@ -99,7 +99,7 @@ public class VanPointMapPlotReportDataContentPane extends VanAreaMapPlotReportDa double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 fd95479be8..331b7a843c 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 @@ -63,7 +63,7 @@ public class VanAreaMapPlotTableDataContentPane extends AbstractTableDataContent } protected JPanel createAreaNamePane() { - UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")); + UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 7cebaea4a2..40ea3fe3a3 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 @@ -124,7 +124,7 @@ public class VanPointMapPlotTableDataContentPane extends VanAreaMapPlotTableData double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Geographic")),locationType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/type/VanChartMapPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java index b7b1c62951..76a47afd84 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map"); private VanChartMapSourceChoosePane sourceChoosePane; @@ -36,10 +36,10 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Map"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PointMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_LineMap"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Combine_Map") }; } @@ -60,7 +60,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map"); } 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 b85e1854e1..43fcb5df0d 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), panel); + JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), panel); Component[][] comps = new Component[][]{ new Component[]{BasePane}, @@ -317,9 +317,9 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { private void refreshZoomLevel(){ //gis图层不同，对应的缩放等级不同。 ZoomLevel[] levels; - if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Blue"))) { + if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Blue"))) { levels = BLUE_ZOOM_LEVELS; - } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_GaoDe"))) { + } else if (ComparatorUtils.equals(gisLayer.getSelectedItem(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_GaoDe"))) { levels = GAODE_ZOOM_LEVELS; } else { levels = ZOOM_LEVELS; @@ -402,7 +402,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { if(list != null && list.size() > 0) { resetWMSLayerPane(list); } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Invalid_WMS")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Invalid_WMS")); } } }.execute(); @@ -485,8 +485,8 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { final JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps,rowSize,columnSize); Component[][] longAndLatComps = new Component[][]{ - 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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Longitude")), longitude}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Latitude")), latitude} }; longAndLatPane =TableLayout4VanChartHelper.createGapTableLayoutPane(longAndLatComps,rowSize,column); longAndLatPane.setBorder(BorderFactory.createEmptyBorder(0,12,0,0)); 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 59724280b7..fadef10db7 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); @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[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPieChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Chart") }; } @@ -35,7 +35,7 @@ public class VanChartMultiPiePlotPane extends AbstractVanChartTypePane { @Deprecated public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMultiPie"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_MultiPie"); } @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 64ef68006d..12eba5581a 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 @@ -92,9 +92,9 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent nameField.setPreferredSize(new Dimension(WD, HT)); Component[][] components_north = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField}, new Component[]{new JSeparator(), null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Level_Number")), levelNumEdit}, }; return TableLayoutHelper.createTableLayoutPane(components_north, rowSize_north, columnSize_north); @@ -137,7 +137,7 @@ public class MultiPiePlotReportDataContentPane extends AbstractReportDataContent value = new TinyFormulaPane(); components_center[levelNum] = new Component[]{new JSeparator(), null}; - components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), value}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), 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 597089812c..fddef0ec55 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } } @@ -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(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}; + components_center[levelNum+1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")), value}; + components_center[levelNum+2] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name")), nameField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), nameField}, new Component[]{getJSeparator(),null }, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Number")), levelNumEdit}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + levelNameList.get(i).setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/VanChartMultiPiePlotTooltipNoCheckPane.java b/designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java index 3c377276c4..779c288ff8 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 @@ -18,7 +18,7 @@ public class VanChartMultiPiePlotTooltipNoCheckPane extends VanChartMultiPiePlot } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip")); 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 0008114a09..f5d5c4ea47 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 @@ -16,6 +16,6 @@ public class MultiPieLevelNameFormatPaneWithCheckBox extends CategoryNameFormatP @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Level_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 0925836b47..59cd774973 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 @@ -18,6 +18,6 @@ public class MultiPieSeriesNameFormatPaneWithCheckBox extends SeriesNameFormatPa @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } } 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 ef222c6205..df967518b7 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 @@ -63,7 +63,7 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane { }; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel); } protected void populatePieAttr() { 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 94652696f0..981956be0a 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 @@ -13,7 +13,7 @@ import com.fr.van.chart.designer.type.AbstractVanChartTypePane; * 饼图(新特性) 属性表 选择类型 布局界面. */ public class VanChartPiePlotPane extends AbstractVanChartTypePane { - public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); private static final long serialVersionUID = 6163246902689597259L; @@ -28,9 +28,9 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SameArc_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DifferArc_Pie") }; } @@ -39,7 +39,7 @@ public class VanChartPiePlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewPie"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Pie"); } /** 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 b212706e8c..0ec79c3b8a 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 @@ -67,7 +67,7 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel); } public void populateBean(Plot plot) { @@ -111,4 +111,4 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane { piePlot4VanChart.setSupportRotation(supportRotation.getSelectedItem()); } } -} \ No newline at end of file +} 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 5f081a3bb5..3123cf6069 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar"); private static final long serialVersionUID = -4599483879031804911L; @@ -26,8 +26,8 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radar"), - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StackColumnTypeRadar") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Chart"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StackColumn_Radar") }; } @@ -36,7 +36,7 @@ public class VanChartRadarPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewRadar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Radar"); } /** 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 c1ffd5f14e..6838969229 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 @@ -66,7 +66,7 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane { radarType = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Circle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polygonal")}, new String[]{RadarType.CIRCLE.getType(), RadarType.POLYGON.getType()}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape"), radarType); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 f901399488..b930c689d0 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 @@ -73,8 +73,8 @@ public class GradualIntervalConfigPane extends JPanel{ protected Component[][] getPaneComponents(){ return new Component[][]{ new Component[]{minMaxValuePane, null}, - 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[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), colorSelectBox}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), numberDragPane}, new Component[]{null, legendGradientBar}, }; } 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 17ae768568..79038cdd79 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 @@ -74,7 +74,7 @@ public class LegendLabelFormatPane extends JPanel{ }); labelFormatStyle.setSelectedIndex(0); - JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"), contentPane); + JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Format"), contentPane); this.setLayout(new BorderLayout()); this.add(panel,BorderLayout.CENTER); } 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 1d846aa8eb..94bb9a4dae 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 @@ -28,8 +28,8 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula { protected Component[][] createComponents(){ return new Component[][]{ new Component[]{null,null}, - 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("Fine-Design_Chart_Subject_Color")), getFillStyleCombox()}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")), getRegionNumPane()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),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 d4a9055be7..eff5060620 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 @@ -48,7 +48,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF @Override protected Component[][] createComponents() { - numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")); + numLabel = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Value_Divided_Stage")); setRegionVisible(false); 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 15879ff14c..e0de77fc86 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter"); private static final long serialVersionUID = -3481633368542654247L; @@ -30,7 +30,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_XYScatter") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter") }; } @@ -39,7 +39,7 @@ public class VanChartScatterPlotPane extends AbstractVanChartTypePane { * @return 界面标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewScatter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Scatter"); } /** 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 7bc731243f..b9dac828c6 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 @@ -33,7 +33,7 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane { Component[][] components = new Component[][]{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), 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("Fine-Design_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 b69bd8af1d..396510e699 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 @@ -19,7 +19,7 @@ public class VanChartScatterPlotTooltipNoCheckPane extends VanChartScatterPlotTo } protected void addComponents(Plot plot) { - isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip")); + isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip")); 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 584605745b..6bbec6b93b 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 @@ -19,17 +19,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT protected void initBubbleSize() { bubbleSize = new UIComboBox(); bubbleSize.setPreferredSize(new Dimension(100, 20)); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override protected void refreshBoxListWithSelectTableData(java.util.List list) { refreshBoxItems(seriesName, list); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); refreshBoxItems(xCombox, list); refreshBoxItems(yCombox, list); refreshBoxItems(bubbleSize, list); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override @@ -38,17 +38,17 @@ public class VanChartScatterPlotTableDataContentPane extends VanChartBubblePlotT */ public void clearAllBoxList(){ clearBoxItems(seriesName); - seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + seriesName.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); clearBoxItems(xCombox); clearBoxItems(yCombox); clearBoxItems(bubbleSize); - bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")); + bubbleSize.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None")); } @Override protected void populateBubbleSize(BubbleTableDefinition definition) { - 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")); + if (ComparatorUtils.equals(definition.getBubbleSize(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_None"))){ + bubbleSize.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 a7d84c3d69..3f3529e7ac 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 @@ -62,7 +62,7 @@ public class StructureIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"), com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 a49e410b67..dfb1a820ba 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 @@ -40,11 +40,11 @@ public class StructurePlotReportDataContentPane extends AbstractReportDataConten nodeValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeID}, - 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}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parentID}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 d31319e225..bc1f7f73b1 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 @@ -45,12 +45,12 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP calculateCombox = new CalculateComboBox(); Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name")), nodeName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name")), nodeName}, new Component[]{new UILabel("id"), nodeId}, - 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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parent_ID")), parenrId}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), seriesName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Value")), nodeValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/VanChartStructureLabelContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureLabelContentPane.java index 824c8d63d8..af4d721756 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 @@ -35,13 +35,13 @@ public class VanChartStructureLabelContentPane extends VanChartLabelContentPane categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 1f53dd0712..b9e5427112 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 @@ -82,7 +82,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane Component[][] components = new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), linkColor}, new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), linkOpacity} }; 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 dcfb74ad8a..63490eaffa 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 @@ -35,13 +35,13 @@ public class VanChartStructureTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 6631db4d8d..39d024c3f1 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 @@ -26,9 +26,9 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Vertical_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Horizontal_Structure"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radial_Structure") }; } @@ -44,7 +44,7 @@ public class VanChartStructureTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewStructure"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Structure"); } 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 abe843eee6..b21f9dc79a 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_TreeMap"); 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[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TreeMapChart") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TreeMap_Chart") }; } @@ -32,7 +32,7 @@ public class VanChartTreeMapPlotPane extends VanChartMultiPiePlotPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewTreeMap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_TreeMap"); } 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 eeb7b00e24..db8bfa94b1 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 @@ -23,7 +23,7 @@ public class VanChartTreeMapSeriesPane extends VanChartMultiPieSeriesPane { supportDrill = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill"), supportDrill); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 a225ecea36..e6e89c0d93 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 @@ -87,7 +87,7 @@ public class WordCloudIndependentVanChartInterface extends AbstractIndependentVa @Override protected String[] getNameArray() { - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_XYAxis"),com.fr.design.i18n.Toolkit.i18nText("Chart-Use_None")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_XY_Axis"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 493c4ca0da..d95a9ddc19 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 @@ -36,9 +36,9 @@ public class WordCloudPlotReportDataContentPane extends AbstractReportDataConten wordValue = new TinyFormulaPane(); Component[][] components = new Component[][]{ - 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("Fine-Design_Chart_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 9d220de440..e7f5f2af08 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 @@ -43,10 +43,10 @@ public class WordCloudPlotTableDataContentPane extends AbstractTableDataContentP Component[][] components = new Component[][]{ - 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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name")), name}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name")), wordName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Value")), wordValue}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java index 9fa5b64993..d5ab61b950 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 @@ -96,7 +96,7 @@ 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")), fontNameComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")), fontNameComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name"), panel); } private JPanel createCloudShapePane() { 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 f5213816dd..08845b2b7a 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 @@ -25,19 +25,19 @@ public class VanChartWordCloudTooltipContentPane extends VanChartTooltipContentP categoryNameFormatPane = new CategoryNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MultiPie_Series_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MultiPie_Series_Name"); } }; seriesNameFormatPane = new SeriesNameFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Name"); } }; valueFormatPane = new ValueFormatPaneWithCheckBox(parent, showOnPane){ @Override protected String getCheckBoxText() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Word_Value"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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 bf10c1b743..d2d505caf8 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); + public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud"); @Override protected String[] getTypeIconPath() { return new String[]{ @@ -24,7 +24,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { @Override protected String[] getTypeTipName() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WordCloud") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud") }; } @@ -45,7 +45,7 @@ public class VanChartWordCloudTypePane extends AbstractVanChartTypePane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewWordCloud"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Word_Cloud"); } protected Plot getSelectedClonedPlot(){ diff --git a/designer-form/pom.xml b/designer-form/pom.xml index 19df80505a..274032bd38 100644 --- a/designer-form/pom.xml +++ b/designer-form/pom.xml @@ -6,16 +6,16 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + 10.0 \ No newline at end of file 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 6d288cc5b0..57c70a7662 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 @@ -17,7 +17,7 @@ public class ChangeNameAction extends FormUndoableAction { public ChangeNameAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 55ceb7ccf3..c9f84d8373 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 @@ -16,7 +16,7 @@ public class ConnectionAction extends UpdateAction implements ToggleButtonUpdate public ConnectionAction(FormDesigner fd) { this.fd = fd; - this.setName(com.fr.design.i18n.Toolkit.i18nText("Connectionline")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Connecti_Online")); 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 1becf8be35..969f474838 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 @@ -6,7 +6,6 @@ import com.fr.design.mainframe.FormDesigner; import javax.swing.*; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -15,7 +14,7 @@ public class CopyAction extends FormWidgetEditAction { public CopyAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 3951cd9fc5..3b70b0d2a3 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 @@ -1,6 +1,5 @@ package com.fr.design.designer.beans.actions; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import javax.swing.KeyStroke; @@ -16,7 +15,7 @@ public class CutAction extends FormWidgetEditAction { public CutAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 8b9bcb83e0..7492f8cc8b 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 @@ -10,9 +10,7 @@ import javax.swing.*; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.actions.behavior.ComponentEnable; -import com.fr.design.designer.creator.XCreator; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.FormSelection; /** * @author richer @@ -23,7 +21,7 @@ public class FormDeleteAction extends FormWidgetEditAction { public FormDeleteAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")); this.setMnemonic('D'); // Richie:删除菜单图标 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png")); @@ -60,4 +58,4 @@ public class FormDeleteAction extends FormWidgetEditAction { return false; } -} \ No newline at end of file +} 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 047a182164..4663d37599 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 @@ -10,8 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -25,7 +23,7 @@ public class MoveDownAction extends FormWidgetEditAction { public MoveDownAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)); @@ -49,4 +47,4 @@ public class MoveDownAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} 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 1f9141ca6e..a5f76ee833 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 @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -25,7 +24,7 @@ public class MoveToBottomAction extends FormWidgetEditAction { public MoveToBottomAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Bottom")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)); @@ -55,4 +54,4 @@ public class MoveToBottomAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} 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 d3a0c09bf3..05d42322ce 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 @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -25,7 +24,7 @@ public class MoveToTopAction extends FormWidgetEditAction { public MoveToTopAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Top")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)); @@ -54,4 +53,4 @@ public class MoveToTopAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} 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 0821f23241..81eae97f0c 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 @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -24,7 +23,7 @@ public class MoveUpAction extends FormWidgetEditAction { public MoveUpAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)); @@ -49,4 +48,4 @@ public class MoveUpAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} 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 46b2a92fb7..5bffe9c660 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 @@ -1,6 +1,5 @@ package com.fr.design.designer.beans.actions; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import javax.swing.KeyStroke; @@ -15,7 +14,7 @@ public class PasteAction extends FormWidgetEditAction { public PasteAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Paste")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/component/CompositeComponentAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java index ee873ba013..af1aaa12dd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java @@ -138,7 +138,7 @@ public class CompositeComponentAdapter implements ComponentAdapter { public void adjustGroupNamesPosition(ArrayList groupNames){ for(String groupName : groupNames){ - if(groupName.equals("Form-Basic_Properties")){ + if(groupName.equals("Fine-Design_Basic_Form_Basic_Properties")){ groupNames.remove(groupName); groupNames.add(0,groupName); break; 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 ab2e4ded9b..f7e162a922 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 @@ -82,7 +82,7 @@ public abstract class AbstractPainter implements HoverPainter { g2d.setStroke(XCreatorConstants.STROKE); g2d.setColor(bColor); if (!accept) { - g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Cannot-Add_To_This_Area") + "!", x + width / 3, y + height / 2); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 e30957139d..e94022ebe8 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 @@ -90,28 +90,28 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( - ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( - 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont")) + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), + new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")) .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), + new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")) .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("hotkeys", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setEditorClass(ShortCutTextEditor.class) }; @@ -163,7 +163,7 @@ public class XButton extends XWidgetCreator { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("text", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -173,7 +173,7 @@ public class XButton extends XWidgetCreator { }), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( - ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -181,12 +181,12 @@ public class XButton extends XWidgetCreator { checkButonType(); } }), - new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) + new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")) .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 86777b91fe..29ce253f56 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 @@ -1,34 +1,41 @@ package com.fr.design.designer.creator; -import java.awt.*; -import java.awt.event.MouseEvent; -import java.beans.IntrospectionException; - -import javax.swing.*; - import com.fr.base.GraphHelper; import com.fr.base.chart.BaseChartCollection; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; +import com.fr.design.designer.beans.events.DesignerEditor; import com.fr.design.designer.beans.models.SelectionModel; import com.fr.design.designer.properties.mobile.ChartEditorPropertyUI; -import com.fr.design.designer.properties.mobile.ElementCasePropertyUI; +import com.fr.design.form.util.XCreatorConstants; 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.BaseJForm; +import com.fr.design.mainframe.CoverReportPane; +import com.fr.design.mainframe.EditingMouseListener; +import com.fr.design.mainframe.FormDesigner; +import com.fr.design.mainframe.HelpDialogManager; import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.module.DesignModuleFactory; -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.stable.Constants; -import com.fr.stable.GraphDrawHelper; import com.fr.stable.core.PropertyChangeAdapter; +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Rectangle; +import java.awt.event.MouseEvent; +import java.beans.IntrospectionException; + /** * form中的图表按钮弹出的控件, 创建初始化图表内容. * @@ -98,9 +105,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -108,7 +115,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -332,4 +339,4 @@ public class XChartEditor extends XBorderStyleWidgetCreator { public boolean isSupportShared() { return true; } -} \ No newline at end of file +} 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 408560277f..ab74ccd984 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 @@ -29,8 +29,8 @@ 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(com.fr.design.i18n.Toolkit.i18nText("Text")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -40,7 +40,7 @@ public class XCheckBox extends XWidgetCreator { }), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -53,7 +53,7 @@ public class XCheckBox extends XWidgetCreator { }), new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 1d9416911a..26f1421a64 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 @@ -35,37 +35,37 @@ public class XCheckBoxGroup extends XFieldEditor { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( - DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; } private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class), + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class), new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") }; if (((CheckBoxGroup) this.toData()).isReturnString()) { crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") }); } if (!((CheckBoxGroup) this.toData()).isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 3368dd1378..22393ca847 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 @@ -40,9 +40,9 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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") + new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), + new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 6ec877ad95..241c11bb94 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 @@ -26,30 +26,30 @@ public class XComboCheckBox extends XComboBox { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), !((ComboCheckBox) this.toData()) .isReturnString() ? new CRPropertyDescriptor[] { new CRPropertyDescriptor("supportTag", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass( - InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Return-String")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] { + InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") } : new CRPropertyDescriptor[] { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") }); } @Override protected String getIconName() { return "combo_check_16.png"; } -} \ No newline at end of file +} 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 b8a707f7cf..ba3ebca140 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.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 +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("Fine-Design_Form_Allow_Custom_Data")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate")}); } } \ No newline at end of file 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 fe1a33d00d..c6ec47a3bc 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 @@ -3,14 +3,6 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; -import java.util.Date; - -import javax.swing.JComponent; - import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; @@ -21,11 +13,17 @@ 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.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; +import javax.swing.JComponent; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; +import java.util.Date; + /** * @author richer * @since 6.5.3 @@ -62,19 +60,19 @@ public class XDateEditor extends XDirectWriteEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt, new CRPropertyDescriptor[]{ new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass( - DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format")).setEditorClass(formatClass()).setRendererClass( + DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Start_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_End_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 316b387791..5df9d81d03 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue( + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_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 029cb1b746..1797ce9fbd 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 @@ -79,9 +79,9 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -99,11 +99,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Layout_Padding")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_toolbar")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") }; CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor(); return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraTableEditor); @@ -357,4 +357,4 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public boolean isSupportShared() { return true; } -} \ No newline at end of file +} 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 fb16892b8c..606bee9932 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 @@ -3,22 +3,20 @@ */ package com.fr.design.designer.creator; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.BorderFactory; -import javax.swing.border.Border; - +import com.fr.design.form.util.XCreatorConstants; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; 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.stable.ArrayUtils; import com.fr.stable.StringUtils; +import javax.swing.BorderFactory; +import javax.swing.border.Border; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -40,14 +38,14 @@ public abstract class XFieldEditor extends XWidgetCreator { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow-Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")) + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); return !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize} : new CRPropertyDescriptor[]{allowBlank, fontSize}; @@ -61,4 +59,4 @@ public abstract class XFieldEditor extends XWidgetCreator { } return displayRegField; } -} \ No newline at end of file +} 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 fe0878dbe1..f3f880ce14 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 @@ -34,7 +34,7 @@ public class XFileUploader extends XFieldEditor { new CRPropertyDescriptor[]{ new CRPropertyDescriptor("allowTypes", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 06c56f70dd..576bfcdd32 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 @@ -3,24 +3,22 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.JPanel; - -import com.fr.stable.core.PropertyChangeAdapter; +import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; 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.stable.ArrayUtils; import com.fr.stable.StringUtils; +import com.fr.stable.core.PropertyChangeAdapter; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; /** * @author richer @@ -35,7 +33,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(com.fr.design.i18n.Toolkit.i18nText("Form-Url")) + new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -44,13 +42,13 @@ public class XIframeEditor extends XWidgetCreator { } }), new CRPropertyDescriptor("overflowx", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Preference-Horizontal_Scroll_Bar_Visible")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("overflowy", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Preference-Vertical_Scroll_Bar_Visible")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("parameters", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Parameters")).setEditorClass(ParameterEditor.class) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters")).setEditorClass(ParameterEditor.class) .setRendererClass(ParameterRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -98,4 +96,4 @@ public class XIframeEditor extends XWidgetCreator { protected String getIconName() { return "iframe_16.png"; } -} \ No newline at end of file +} 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 8ca2b64494..233c369c41 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 @@ -59,7 +59,7 @@ public class XLabel extends XWidgetCreator { new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -69,18 +69,18 @@ public class XLabel extends XWidgetCreator { } }), new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Wrap_Text")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-Vertically")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")).setEditorClass(ItemCellEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")).setEditorClass(ItemCellEditor.class) .setRendererClass(LabelHorizontalAlignmentRenderer.class).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")) + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), + new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")) .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}); + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")}); } @Override 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 89f04c13e3..edf6018989 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 @@ -63,10 +63,10 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -75,8 +75,8 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), }; } @@ -87,7 +87,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme * @throws IntrospectionException */ public CRPropertyDescriptor createWidgetNameDescriptor() throws IntrospectionException { - return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")); + return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")); } /** @@ -98,8 +98,8 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException { return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"); } /** @@ -570,4 +570,4 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme return false; } -} \ No newline at end of file +} 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 b487c169d7..da2bf7cd03 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 @@ -37,14 +37,14 @@ public class XMultiFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("singleFile", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Single_File_Upload")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("accept", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("maxSize", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 70b4955a77..b886ad6c49 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 @@ -36,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(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_NameWidget-Invalid"), Style.getInstance() + BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Invalid"), Style.getInstance() .deriveHorizontalAlignment(SwingConstants.CENTER).deriveVerticalAlignment(SwingConstants.CENTER) .deriveFRFont(FRFont.getInstance().applyForeground(Color.RED)), ScreenResolution .getScreenResolution()); @@ -50,8 +50,8 @@ public class XNameWidget extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - 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( + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), + new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Name")).setEditorClass( NameWidgetComboboxEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -144,4 +144,4 @@ public class XNameWidget extends XWidgetCreator { return creator.shouldScaleCreator(); } -} \ No newline at end of file +} 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 09622002bf..7083f087a7 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 @@ -3,13 +3,6 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; - import com.fr.base.BaseUtils; import com.fr.base.ScreenResolution; import com.fr.base.Style; @@ -20,10 +13,15 @@ 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.stable.ArrayUtils; import com.fr.stable.Constants; +import javax.swing.JComponent; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -46,37 +44,37 @@ public class XNumberEditor extends XWrapperedFieldEditor { new CRPropertyDescriptor("widgetValue", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")) .setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")} + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")} ,super.supportedDescriptor()); CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass()) .setEditorClass(InChangeBooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Decimals")) + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Negative")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Negative")) .setEditorClass(InChangeBooleanEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), new CRPropertyDescriptor("minValue", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Value")) .setEditorClass(SpinnerMinNumberEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), new CRPropertyDescriptor("maxValue", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Max_Value")) .setEditorClass(SpinnerMaxNumberEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), new CRPropertyDescriptor("waterMark", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Verify-Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message")) + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_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 6a76b0325c..4194e4be03 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 @@ -3,20 +3,18 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; - import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.ibutton.UIPasswordField; 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.stable.ArrayUtils; +import javax.swing.JComponent; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -52,18 +50,18 @@ public class XPassword extends XWrapperedFieldEditor { new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")} + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")} , super.supportedDescriptor()); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")) .setEditorClass(RegexEditor.RegexEditor4TextArea.class) .putKeyValue("renderer", RegexCellRencerer.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) : 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 5b7d2129e2..3e122d070e 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 @@ -3,17 +3,15 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.JRadioButton; - import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.Radio; - import com.fr.stable.ArrayUtils; +import javax.swing.JComponent; +import javax.swing.JRadioButton; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -32,7 +30,7 @@ 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(com.fr.design.i18n.Toolkit.i18nText("Text")), + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); } 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 f0a81a165c..af10fbc170 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 @@ -42,22 +42,22 @@ public class XRadioGroup extends XFieldEditor { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( - DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; } private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class)}; if (!toData().isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")); } return crp; } 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 624b32ece8..845fe43d9e 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 @@ -3,27 +3,25 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.SwingConstants; - import com.fr.base.BaseUtils; import com.fr.base.ScreenResolution; import com.fr.base.Style; +import com.fr.design.form.util.XCreatorConstants; 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.TextArea; -import com.fr.design.form.util.XCreatorConstants; import com.fr.general.FRFont; - import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; +import javax.swing.JComponent; +import javax.swing.SwingConstants; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -40,15 +38,15 @@ public class XTextArea extends XFieldEditor { new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor()); + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")}, super.supportedDescriptor()); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).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"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) + .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "FR-Designer_Advanced"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Fine-Design_Report_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) : 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 43a8b87d15..0ba6e5fe4c 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 @@ -3,13 +3,6 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; - import com.fr.base.BaseUtils; import com.fr.base.ScreenResolution; import com.fr.base.Style; @@ -19,10 +12,15 @@ 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.stable.ArrayUtils; import com.fr.stable.Constants; +import javax.swing.JComponent; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -43,15 +41,15 @@ public class XTextEditor extends XWrapperedFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( - "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( + "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "FR-Designer_Advanced"); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "Fine-Design_Report_Advanced"); CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor()); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); 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 1cd334a7ce..d7e1c2d37b 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 @@ -3,20 +3,18 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; - 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.stable.ArrayUtils; +import javax.swing.JComponent; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -46,20 +44,20 @@ public class XTreeComboBoxEditor extends XTreeEditor { protected CRPropertyDescriptor[] addWaterMark(CRPropertyDescriptor[] crp) throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")); } protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{ return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue( + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate")); } protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{ return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data")).putKeyValue( + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate")); } @Override @@ -110,4 +108,4 @@ public class XTreeComboBoxEditor extends XTreeEditor { return true; } -} \ No newline at end of file +} 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 880a3021ff..c5672b389f 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 @@ -40,48 +40,48 @@ public class XTreeEditor extends XWidgetCreator { new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( - TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Verify-Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Verify_Message")) + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), } : new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( - TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),}; crp = this.addWaterMark(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced").setEditorClass(InChangeBooleanEditor.class)); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("ajax", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Widget-Load_By_Async")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Tree-Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("returnFullPath", this.data - .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Tree-Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); + .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 fe67fef17a..6190ffaebb 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 @@ -71,10 +71,10 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 4b20fe5b99..b219530f7f 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 @@ -446,7 +446,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Widget_Name")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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); @@ -589,4 +589,4 @@ public class XWAbsoluteLayout extends XLayoutContainer { public boolean isSupportShared() { return true; } -} \ No newline at end of file +} 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 9aa0598b4c..a7b74d0fd9 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 @@ -73,7 +73,7 @@ public class XWBorderLayout extends XLayoutContainer { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")) + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_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 d2d8daad8a..73c1949fb9 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 @@ -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, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Invalid_Setting_Cause_Reach_Min_Widget_Size", widgetName)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 1e4da367be..cb288c98cc 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 @@ -25,7 +25,6 @@ import com.fr.stable.ArrayUtils; import java.awt.*; import java.beans.IntrospectionException; -import java.beans.PropertyDescriptor; /** * 表单参数界面container @@ -59,19 +58,19 @@ public class XWParameterLayout extends XWAbsoluteLayout { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class) - .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Background")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class) - .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("useParamsTemplate", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_Params_Template")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), }; return ArrayUtils.addAll(propertyTableEditor, getExtraTableEditor()); @@ -252,4 +251,4 @@ public class XWParameterLayout extends XWAbsoluteLayout { return false; } -} \ No newline at end of file +} 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 99ae2f7217..8b72102459 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 @@ -38,8 +38,8 @@ public abstract class XWidgetCreator extends XCreator { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ - 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")) + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), + new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enabled")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -48,7 +48,7 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -56,8 +56,8 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("labelName", this.data.getClass(), "getLabelName", "setLabelName") - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") }; } @@ -172,10 +172,10 @@ public abstract class XWidgetCreator extends XCreator { */ public void ChangeCreatorName(FormDesigner designer, XCreator creator) { String oldName = creator.toData().getWidgetName(); - String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name_Discription"), oldName); + String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Change_Widget_Name_Discription"), oldName); if (value != null) { designer.renameCreator(creator, value); } } -} \ No newline at end of file +} 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 cd5c40c3b3..d6ff25d73e 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 @@ -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(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"), + new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), + new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), }); } -} \ No newline at end of file +} 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 b3277945d3..a25ca05046 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 @@ -180,7 +180,7 @@ public class XCardAddButton extends XButton { //新增时去tabFitLayout名字中最大的Index+1，防止重名 private String getTabTitleName(WCardTagLayout layout){ int size = layout.getWidgetCount(); - String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title"); + String prefix = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title"); String newTextName = prefix + size; for (int i = 0; i < size; i++) { @@ -199,4 +199,4 @@ public class XCardAddButton extends XButton { public XLayoutContainer getTopLayout() { return this.getBackupParent().getTopLayout(); } -} \ No newline at end of file +} 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 29f96dea64..72d0669c83 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 @@ -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, 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); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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, 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); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); if (value != JOptionPane.OK_OPTION) { return; } @@ -498,4 +498,4 @@ public class XCardSwitchButton extends XButton { } } } -} \ No newline at end of file +} 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 207c936916..53a72e9112 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 @@ -212,7 +212,7 @@ public class XWCardLayout extends XLayoutContainer { //第一个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); + firstBtn.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title") + 0); xTag.setCurrentCard(firstBtn); XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag); xFirstBtn.setBackupParent(xTag); @@ -328,8 +328,8 @@ public class XWCardLayout extends XLayoutContainer { 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") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Carousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -339,8 +339,8 @@ public class XWCardLayout extends XLayoutContainer { }), 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") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Carousel_Interval")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") }; } @@ -348,8 +348,8 @@ public class XWCardLayout extends XLayoutContainer { 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") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Carousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -363,7 +363,7 @@ public class XWCardLayout extends XLayoutContainer { 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() { + Toolkit.i18nText("Fine-Design_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -373,7 +373,7 @@ public class XWCardLayout extends XLayoutContainer { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( CardTagWLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -486,4 +486,4 @@ public class XWCardLayout extends XLayoutContainer { } } -} \ 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 4635b22f62..c7f235154e 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 @@ -24,6 +24,7 @@ import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.WidgetHelpDialog; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.form.event.Listener; +import com.fr.form.ui.CardSwitchButton; import com.fr.form.ui.LayoutBorderStyle; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WAbsoluteLayout.BoundsWidget; @@ -168,8 +169,14 @@ public class XWCardMainBorderLayout extends XWBorderLayout { //新tab默认都有标题 borderStyle.setType(LayoutBorderStyle.TITLE); } - cardLayout.setWidgetName(XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, "")); - wCardTitleLayout.setCardName(cardLayout.getWidgetName()); + String newCardLayoutName = XWCardLayout.DEFAULT_NAME + tabpaneName.replaceAll(XWCardTagLayout.DEFAULT_NAME, ""); + cardLayout.setWidgetName(newCardLayoutName); + //修改cardswitchbutton所绑定的cardlayoutname + for (int i = 0, len = wCardTagLayout.getWidgetCount(); i < len; i++) { + CardSwitchButton button = wCardTagLayout.getSwitchButton(i); + button.setCardLayoutName(newCardLayoutName); + } + wCardTitleLayout.setCardName(newCardLayoutName); wCardTagLayout.setNewTab(true); //这边需要设置成默认值兼容之前的title高度(不知道为啥之前的title的高度会改变) if(this.toData().getNorthSize() != 0){ @@ -383,7 +390,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout { g2d.setColor(Color.WHITE); //画编辑文字 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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); @@ -504,4 +511,4 @@ public class XWCardMainBorderLayout extends XWBorderLayout { return true; } -} \ No newline at end of file +} 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 3de1c6b6b4..f2f58f17b3 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 @@ -177,7 +177,7 @@ public class XWTabFitLayout extends XWFitLayout { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( - ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -192,16 +192,16 @@ public class XWTabFitLayout extends XWFitLayout { CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( - ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"), new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( - ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")).putKeyValue( - XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue( + XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_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 df54fd031a..23be631fba 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 @@ -1,20 +1,18 @@ package com.fr.design.designer.properties; -import java.awt.Rectangle; - -import javax.swing.*; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XWAbsoluteLayout; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WAbsoluteLayout; +import javax.swing.JOptionPane; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Rectangle; + /** * 绝对布局时候的属性组 */ @@ -36,7 +34,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override @@ -59,13 +57,13 @@ public class BoundsGroupModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Height"); } } else { switch (row) { @@ -107,7 +105,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { break; case 3: if(v < MINHEIGHT){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Height") + "21"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Height") + "21"); v = component.getHeight(); } if (bounds.height == v){ @@ -136,4 +134,4 @@ public class BoundsGroupModel implements ConstraintsGroupModel { //这里不需要为自定义按钮屏蔽大小属性 return true; } -} \ No newline at end of file +} 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 0359cd902e..bef7c05fd6 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 @@ -1,17 +1,16 @@ package com.fr.design.designer.properties; -import java.awt.Component; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - import com.fr.design.designer.beans.ConstraintsGroupModel; 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 javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Component; + public class CardLayoutConstraints implements ConstraintsGroupModel { @@ -31,7 +30,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints"); } @Override @@ -52,7 +51,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Index"); } else { return layout.getWidgetIndex(widget) + 1; } @@ -83,4 +82,4 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 e653db126f..f11f86c087 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 @@ -32,7 +32,7 @@ public class CardLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Widget_Size"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Tab_Layout_Widget_Size"); } @Override @@ -69,9 +69,9 @@ public class CardLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Tab_Layout_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Tab_Layout_Height"); } @@ -122,4 +122,4 @@ public class CardLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return false; } -} \ No newline at end of file +} 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 bbff5e1bb2..77cb10734b 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 @@ -15,6 +15,7 @@ import com.fr.design.form.javascript.FormEmailPane; import com.fr.form.ui.Widget; import com.fr.general.NameObject; +import com.fr.report.web.util.ReportEngineEventMapping; import com.fr.stable.Nameable; import javax.swing.*; @@ -32,7 +33,7 @@ public class EventPropertyTable extends UIListControlPane { @Override public String getAddItemText() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Event"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event"); } public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane { @@ -47,7 +48,7 @@ public class EventPropertyTable extends UIListControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function"); } @Override protected EmailPane initEmaiPane() { @@ -72,7 +73,9 @@ public class EventPropertyTable extends UIListControlPane { } private String switchLang(String eventName) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Event_" + eventName); + // 在 properties 文件中找到相应的 key 值 + String localeKey = ReportEngineEventMapping.getLocaleName(eventName); + return com.fr.design.i18n.Toolkit.i18nText(localeKey); } /** @@ -140,4 +143,4 @@ public class EventPropertyTable extends UIListControlPane { } updateWidgetListener(creator); } -} \ No newline at end of file +} 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 2e395eae31..3191f76316 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 @@ -42,7 +42,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout"); } @Override @@ -65,7 +65,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type"); default: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"); } 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 2aec61be2f..53f5a7e945 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 @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormWidget_Area_Scaling"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Area_Scaling"); } @Override 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 cb8c3e9181..3f8f0855a7 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 @@ -1,27 +1,25 @@ package com.fr.design.designer.properties; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - -import com.fr.stable.StringUtils; -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; -import com.fr.design.mainframe.widget.editors.StringEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWBorderLayout; import com.fr.design.designer.creator.XWidgetCreator; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; +import com.fr.design.mainframe.widget.editors.StringEditor; import com.fr.form.ui.FreeButton; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBorderLayout; +import com.fr.stable.StringUtils; + +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; public class FRBorderLayoutConstraints implements ConstraintsGroupModel { @@ -47,7 +45,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints_Duplicate"); } @Override @@ -84,9 +82,9 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Title"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"); default: return getSizeDisplayName(); } @@ -128,9 +126,9 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { private String getSizeDisplayName() { Object obj = layout.getConstraints(widget); if (BorderLayout.NORTH.equals(obj) || BorderLayout.SOUTH.equals(obj)) { - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } else if (BorderLayout.WEST.equals(obj) || BorderLayout.EAST.equals(obj)) { - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); } else { return StringUtils.EMPTY; } @@ -210,4 +208,4 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { } return true; } -} \ No newline at end of file +} 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 d9dbd5c576..0de7ba6708 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 @@ -1,21 +1,20 @@ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - import com.fr.design.beans.GroupModel; +import com.fr.design.designer.creator.XWBorderLayout; +import com.fr.design.designer.properties.items.Item; +import com.fr.design.form.layout.FRBorderLayout; import com.fr.design.mainframe.widget.editors.BorderLayoutDirectionEditor; import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.mainframe.widget.renderer.PropertyCellRenderer; -import com.fr.design.designer.creator.XWBorderLayout; -import com.fr.design.designer.properties.items.Item; -import com.fr.design.form.layout.FRBorderLayout; import com.fr.form.ui.container.WBorderLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + public class FRBorderLayoutPropertiesGroupModel implements GroupModel { private DefaultTableCellRenderer renderer; @@ -54,7 +53,7 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("BorderLayout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Border_Layout"); } @Override @@ -83,9 +82,9 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); default: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Style"); } @@ -141,4 +140,4 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 1e6d55e7be..9d60be9dd0 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 @@ -59,7 +59,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"); } @Override @@ -111,11 +111,11 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Scale"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Scale"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"); } } else { switch (row) { @@ -204,4 +204,4 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 c444c4506b..b4a94de5a7 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 @@ -30,7 +30,7 @@ public class FRFormLayoutPropertiesGroupModel implements GroupModel{ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override 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 7ec9e222a8..8111c15d66 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 @@ -3,10 +3,6 @@ */ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; @@ -19,6 +15,10 @@ 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 javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + /** * tab布局tabFit属性表 @@ -51,7 +51,7 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Current_Tab"); } @Override @@ -79,9 +79,9 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro if (column == PROPERTY_NAME_COLUMN) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"); default : - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Tab_Layout_Title"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Tab_Layout_Title"); } } else { switch (row) { @@ -154,4 +154,4 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro return true; } -} \ No newline at end of file +} 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 39cb00d19f..6f84aaa321 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 @@ -8,12 +8,10 @@ import java.awt.event.ItemListener; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; -import javax.swing.SwingConstants; import com.fr.design.constants.LayoutConstants; import com.fr.design.file.HistoryTemplateListPane; 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.design.mainframe.AuthorityEditPane; @@ -34,8 +32,8 @@ import com.fr.general.ComparatorUtils; public class FormWidgetAuthorityEditPane extends AuthorityEditPane { private FormDesigner designer; private Widget[] widgets = null; - 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 UICheckBox widgetVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")); + private UICheckBox widgetAvailable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Enabled")); private ItemListener visibleItemListener = new ItemListener() { public void itemStateChanged(ItemEvent e) { String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); @@ -55,7 +53,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, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Role"))) { + if (ComparatorUtils.equals(selectedRoles, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Role"))) { return; } if (selectedRoles == null) { @@ -93,7 +91,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane { * @date 2014-12-21-下午6:19:43 */ public void populateType() { - type.setText(com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Config")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Config")); } /** @@ -207,4 +205,4 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane { } -} \ No newline at end of file +} 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 bef5811c76..b6eb65e1fa 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 @@ -33,7 +33,7 @@ public abstract class HVLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints_Duplicate"); } @Override @@ -62,4 +62,4 @@ public abstract class HVLayoutConstraints implements ConstraintsGroupModel { } return true; } -} \ No newline at end of file +} 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 b9be5326ed..feaf0c0bf9 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 @@ -3,13 +3,12 @@ */ package com.fr.design.designer.properties; -import java.awt.Component; - - import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWHorizontalBoxLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; +import java.awt.Component; + /** * @author richer * @since 6.5.3 @@ -28,9 +27,9 @@ public class HorizontalLayoutConstraints extends HVLayoutConstraints{ if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Index"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); } } else { switch (row) { @@ -60,4 +59,4 @@ public class HorizontalLayoutConstraints extends HVLayoutConstraints{ } return true; } -} \ No newline at end of file +} 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 c2a20d6c89..14665dd3d7 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 @@ -37,7 +37,7 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout-HBox"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Horizontal_Box"); } @Override @@ -74,11 +74,11 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); default: - return com.fr.design.i18n.Toolkit.i18nText("Alignment"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alignment"); } } else { switch (row) { @@ -124,4 +124,4 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 9666f348d7..8526c19058 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 @@ -10,6 +10,6 @@ public class HorizontalSplitProperties extends VerticalSplitProperties { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Horizontal-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 b9ae47ebf5..3a8996bc12 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 @@ -1,17 +1,15 @@ package com.fr.design.designer.properties; -import java.awt.Rectangle; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - +import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; -import com.fr.design.designer.beans.ConstraintsGroupModel; + +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Rectangle; /** * 多个组件时候的属性组 @@ -36,7 +34,7 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override @@ -54,13 +52,13 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("X-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_X_Coordinate"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Y_Coordinate"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { Rectangle rec = designer.getSelectionModel().getSelection().getSelctionBounds(); @@ -118,4 +116,4 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { return false; } } -} \ No newline at end of file +} 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 efd9f9a501..0d0f6509d4 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 @@ -1,18 +1,17 @@ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - import com.fr.design.beans.GroupModel; -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.creator.XWVerticalBoxLayout; import com.fr.design.form.layout.FRVerticalLayout; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WVerticalBoxLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + public class VerticalBoxProperties implements GroupModel { private DefaultTableCellRenderer renderer; @@ -29,7 +28,7 @@ public class VerticalBoxProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("VerticalBoxLayout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Box_Layout_Duplicate"); } @Override @@ -52,9 +51,9 @@ public class VerticalBoxProperties implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); } } else { switch (row) { @@ -99,4 +98,4 @@ public class VerticalBoxProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 15e26438af..771fbbecbd 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 @@ -3,13 +3,12 @@ */ package com.fr.design.designer.properties; -import java.awt.Component; - - import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWVerticalBoxLayout; import com.fr.form.ui.container.WVerticalBoxLayout; +import java.awt.Component; + /** * @author richer * @since 6.5.3 @@ -28,9 +27,9 @@ public class VerticalLayoutConstraints extends HVLayoutConstraints { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Index"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { switch (row) { @@ -60,4 +59,4 @@ public class VerticalLayoutConstraints extends HVLayoutConstraints { } return true; } -} \ No newline at end of file +} 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 a6f0e6af32..306a2faf1f 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 @@ -23,7 +23,7 @@ public class VerticalSplitProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Vertical-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Split_Layout"); } @Override @@ -46,11 +46,11 @@ public class VerticalSplitProperties implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Ratio"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Ratio"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); } } else { switch (row) { @@ -102,4 +102,4 @@ public class VerticalSplitProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} 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 9a4ebd529c..19a6454b4c 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 @@ -9,11 +9,11 @@ import com.fr.form.ui.container.WAbsoluteLayout; public class FRAbsoluteConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - 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) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) }; public Item[] getItems() { return ITEMS; } -} \ No newline at end of file +} 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 45f3d89b5f..80085df89c 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Center"), + VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH); } else if (WBorderLayout.SOUTH == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH); } else if (WBorderLayout.WEST == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST); } else if (WBorderLayout.EAST == directions[i]) { - items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST); + items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 bad17f9d4e..9cfb961df2 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 @@ -13,11 +13,11 @@ import com.fr.form.ui.container.WFitLayout; public class FRFitConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - 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)}; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)}; public Item[] getItems() { return ITEMS; } -} \ No newline at end of file +} 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 b00bb15df1..7c223ae2eb 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 @@ -7,9 +7,9 @@ import java.awt.FlowLayout; public class HorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - 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) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), FlowLayout.LEFT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), FlowLayout.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 b52bfee8d4..b360aae6f5 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 @@ -7,9 +7,9 @@ import javax.swing.SwingConstants; public class LabelHorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - 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) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), SwingConstants.LEFT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), SwingConstants.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 4e6fa93e82..9f3aff8579 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 @@ -5,13 +5,13 @@ package com.fr.design.designer.properties.items; public class UnderlineItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - 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")}; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), ""), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), "overline"), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), "line-through"), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), "underline")}; @Override public Item[] getItems() { return VALUE_ITEMS; } -} \ No newline at end of file +} 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 2c867ea9ff..5c835e85e7 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 @@ -12,13 +12,13 @@ import com.fr.report.stable.FormConstants; public class WidgetDisplayPositionItems implements ItemProvider{ //这里为了和web端一致，只好设置成012了 private static Item[] VALUE_ITEMS = { - 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) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), FormConstants.LEFTPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FormConstants.CENTERPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"), FormConstants.RIGHTPOSITION) }; @Override public Item[] getItems() { return VALUE_ITEMS; } -} \ No newline at end of file +} 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 7e1b8feab8..3cfc0db69c 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 @@ -53,7 +53,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { FRContext.getLogger().error(e.getMessage()); } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 f591c639b5..5175b30dce 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 @@ -36,6 +36,6 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 ed1a6ebc23..e773fb0389 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 @@ -31,6 +31,6 @@ public class ChartEditorPropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 0038bc1470..6f7eb0396e 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Horizontal")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")), new CRPropertyDescriptor("verticalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class) .setRendererClass(MobileFitRender.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Vertical")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")), new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightrestrict")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightrestrict")) .setRendererClass(BooleanRender.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")) }; List defaultList = new ArrayList<>(); @@ -71,8 +71,8 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException { CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass()) .setEditorClass(RefinedDoubleEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightpercent")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightpercent")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Basic_Advanced"); ArrayList defaultList = (ArrayList) createNonListenerProperties(); defaultList.add(heightLimitProperty); return defaultList.toArray(new CRPropertyDescriptor[defaultList.size()]); @@ -96,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 fa6cff395a..c4b3bf33c5 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 @@ -31,6 +31,6 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 f81f8e1275..f05a8e4786 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 @@ -31,6 +31,6 @@ public class MultiFileUploaderPropertyUI extends AbstractWidgetPropertyUIProvide @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 119ea6952e..11a69e502d 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 @@ -31,6 +31,6 @@ public class ParaMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 0efcf02d87..5ff4f12389 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 @@ -11,22 +11,22 @@ import com.fr.design.layout.TableLayoutHelper; /** * 表单的邮件pane - * + * * @author jim * */ public class FormEmailPane extends EmailPane{ - + @Override protected void initCenterPane(UILabel mainTextLabel, JScrollPane scrollPane, double fill, double preferred) { double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred}; double[] columnSize = { preferred, fill}; centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ {new UILabel(), tipsPane1}, - 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()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_Mail_to"), maitoEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_HJS_CC_To"), ccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()), + createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), 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 384a080b07..297e854699 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 @@ -63,6 +63,6 @@ public class FormMobileAttrPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 03dae804f4..03499286d7 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 @@ -60,6 +60,6 @@ public class FormMobileOthersPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Other"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 5a853566bb..21f6d3b09f 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 @@ -2,7 +2,6 @@ package com.fr.design.form.mobile; import com.fr.design.beans.BasicBeanPane; import com.fr.design.designer.IntervalConstants; -import com.fr.design.dialog.mobile.MobileRadioCheckPane; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; @@ -13,10 +12,7 @@ import com.fr.form.main.mobile.FormMobileAttr; import javax.swing.*; -import javax.swing.border.Border; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; /** * Created by plough on 2018/1/4. @@ -45,7 +41,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane { UILabel uiLabel = new UILabel("html5"); uiLabel.setBorder(BorderFactory.createEmptyBorder(5, 15, 10, 15)); - this.refreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Refresh")); + this.refreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-ToolBar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 06a7aa25b3..0895d4c1dc 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 @@ -613,7 +613,7 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP } FormSubmitButton formSubmitButton = new FormSubmitButton(); formSubmitButton.setWidgetName("Search"); - formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)))) { @@ -699,4 +699,4 @@ public class FormParaDesigner extends FormDesigner implements ParameterDesignerP return new JComponent[]{new CutAction(this).createToolBarComponent(), new CopyAction(this).createToolBarComponent(), new PasteAction(this).createToolBarComponent(), new FormDeleteAction(this).createToolBarComponent()}; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java b/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java index 605b81136e..6092d2f8c4 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java @@ -1 +1 @@ -/* * 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 +/* * 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("Fine-Design_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("Fine-Design_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/form/util/XCreatorConstants.java b/designer-form/src/main/java/com/fr/design/form/util/XCreatorConstants.java index c504ed7ff6..54b32ca6cd 100644 --- a/designer-form/src/main/java/com/fr/design/form/util/XCreatorConstants.java +++ b/designer-form/src/main/java/com/fr/design/form/util/XCreatorConstants.java @@ -3,11 +3,10 @@ */ package com.fr.design.form.util; -import java.awt.BasicStroke; -import java.awt.Color; - import javax.swing.BorderFactory; import javax.swing.border.Border; +import java.awt.BasicStroke; +import java.awt.Color; /** * @author richer @@ -20,8 +19,8 @@ public class XCreatorConstants { public static final String WIDGETNAME = "widgetName"; // 描述属性的分类 public static final String PROPERTY_CATEGORY = "category"; - public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties"; - public static final String PROPERTY_VALIDATE = "FR-Designer_Validate"; + public static final String DEFAULT_GROUP_NAME = "Fine-Design_Basic_Form_Basic_Properties"; + public static final String PROPERTY_VALIDATE = "Fine-Design_Basic_Validate"; public static final Color FORM_BG = new Color(255, 255, 255); // 拖拽标识块的大小 public static final int RESIZE_BOX_SIZ = 5; 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 94a21d1923..4bb0c2d28d 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 @@ -1,7 +1,5 @@ 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; @@ -14,6 +12,8 @@ import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; +import javax.swing.Icon; + /** * Author : Shockway @@ -74,28 +74,28 @@ public class FormWidgetOption extends WidgetOption { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } - 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"), + public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"), WAbsoluteLayout.class); - public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), + public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); - 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"), + public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"), WCardLayout.class); - 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"), + public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); - public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), + public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Vertical_Box_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); - public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), + public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); - public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), + public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), ElementCaseEditor.class); } 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 70dddbd538..7afb15828e 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 @@ -33,11 +33,11 @@ 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(), 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); + if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"))) { + creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), EmailJavaScript.class, FormEmailPane.class); break; } } return creators; } -} \ No newline at end of file +} 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 88acae8d50..1b58d0a9b5 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 @@ -47,7 +47,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab public void initComponent() { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_A_Tree_DataSource_To_Build") + ": "); + UILabel selectTreeDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); + valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Columns"))}); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); + textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Columns")), formulaEditor}); Component[][] coms = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), valuePane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } catch (Exception e) { - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } } @@ -191,4 +191,4 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab valuePane.populate(1); } -} \ No newline at end of file +} 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 5f517c3d42..a70431700a 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 @@ -401,7 +401,7 @@ public class LayoutBorderPane extends BasicPane { } protected JComponent[] getBorderCornerSpinnerComp(){ - return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")+":"),borderCornerSpinner}; + return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")+":"),borderCornerSpinner}; } protected void switchBorderType(){ @@ -463,7 +463,7 @@ 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[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left") , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); hPaneContainer.add(hAlignmentPane); @@ -478,7 +478,7 @@ public class LayoutBorderPane extends BasicPane { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")), hPaneContainer}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")), hPaneContainer}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); @@ -929,6 +929,6 @@ public class LayoutBorderPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style"); } } 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 89a3c9adba..3d649f3b90 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 @@ -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 = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ZERO; + String paintText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ONE; + String rightLabel = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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) { @@ -181,4 +181,4 @@ public class LayoutBorderPreviewPane extends JPanel{ } } -} \ No newline at end of file +} 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 9d80e2119c..2f2eafd01f 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,12 +4,11 @@ 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 java.lang.reflect.Method; import com.fr.general.ComparatorUtils; import com.fr.report.stable.FormConstants; -import javax.swing.*; +import javax.swing.JOptionPane; +import java.lang.reflect.Method; public class ReportAppPropertyGroupModel extends PropertyGroupModel { @@ -35,8 +34,8 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { if (state > MAX_HEIGHT) { //弹窗提示 JOptionPane.showMessageDialog(null, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Warning"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Mobile_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.PLAIN_MESSAGE); return false; } @@ -56,4 +55,4 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { private Object dealCreatorData() { return creator.getPropertyDescriptorCreator().toData(); } -} \ No newline at end of file +} 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 11fb8a13e8..3c03ba38d7 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 @@ -105,7 +105,7 @@ public class EditingMouseListener extends MouseInputAdapter { this.designer = designer; stateModel = designer.getStateModel(); selectionModel = designer.getSelectionModel(); - UIButton promptButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); + UIButton promptButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); this.promptWindow.add(promptButton); } @@ -662,4 +662,4 @@ public class EditingMouseListener extends MouseInputAdapter { } currentEditor.getEditorTarget().setBounds(bounds); } -} \ No newline at end of file +} 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 75f1f253e9..762b412f1b 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 @@ -7,8 +7,6 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWBorderLayout; import com.fr.design.designer.creator.XWFitLayout; -import com.fr.design.event.TargetModifiedEvent; -import com.fr.design.event.TargetModifiedListener; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; @@ -156,7 +154,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(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); + JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{ tipsPane, new UILabel(), widthPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")), new UILabel("x"), heightPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")), new UILabel(), slidePane }}, rowSize, columnSize, RESIZE_PANE_GAP); this.add(FormRulerLayout.BOTTOM, resizePane); setWidgetsConfig(); // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小 @@ -834,4 +832,4 @@ public class FormArea extends JComponent implements ScrollRulerComponent { } -} \ No newline at end of file +} 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 6c9504e78d..0e8e77ed78 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Para_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Para_Pane")); promptWidgetForbidEnter(x, y, container); } else if (!addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class)) { - promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Adapt_Pane")); promptWidgetForbidEnter(x, y, container); } else { cancelPromptWidgetForbidEnter(); @@ -258,4 +258,4 @@ public class FormCreatorDropTarget extends DropTarget { //针对在表单中拖入一个控件直接ctrl+s无反应 designer.requestFocus(); } -} \ No newline at end of file +} 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 06fcd72efc..82ded472ed 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 @@ -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[]{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")}) + Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Query")); + formSubmitButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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)))) { @@ -358,7 +358,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection private void addParaPaneTooltips() { JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Please_Drag_ParaPane"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), 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 + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") - + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed") + + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(this, message, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 64caf83659..9ddee0b5ce 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 @@ -1,6 +1,5 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; import com.fr.base.Utils; @@ -169,7 +168,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 += com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel"); + text += com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel"); g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); GraphHelper.drawString(g2d, text, x1 + 3, y1 + 10); GraphHelper.drawLine(g2d, x1, y1, x2, y2); @@ -431,4 +430,4 @@ public class FormDesignerUI extends ComponentUI { ComponentUtils.resetBuffer(dbcomponents); } -} \ No newline at end of file +} 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 3f90e0569e..275730d8ff 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 @@ -149,7 +149,7 @@ public class FormEditToolBar extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"); } public void populate(FormToolBar ftoolbar) { @@ -208,7 +208,7 @@ public class FormEditToolBar extends BasicPane { private class MoveUpItemAction extends UpdateAction { public MoveUpItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("Utils-Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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, com.fr.design.i18n.Toolkit.i18nText("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("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Icon")); - text = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Text")); + icon = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Icon")); + text = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Text")); north.add(icon, BorderLayout.NORTH); north.add(text, BorderLayout.CENTER); @@ -359,9 +359,9 @@ public class FormEditToolBar extends BasicPane { private JPanel getCustomPane() { JPanel customPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_User_Defined_Event")); + button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_User_Defined_Event")); customPane.add(button); - customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit") + "JS", null)); + customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit") + "JS", null)); button.addActionListener(l); return customPane; } 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 542d5cdc3a..c2b8ff7f3d 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 @@ -66,7 +66,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree @Override public String getViewTitle() { - return com.fr.design.i18n.Toolkit.i18nText("Form-Hierarchy_Tree"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 b7fd82b73a..647a0dd8a5 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 @@ -91,7 +91,7 @@ public class FormParaPane extends JPanel { } }; predefineButton.set4ToolbarButton(); - predefineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined_Widget_Config")); + predefineButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_User_Defined_Widget_Config")); predefineButton.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { @@ -186,4 +186,4 @@ public class FormParaPane extends JPanel { } } -} \ No newline at end of file +} 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 e5711c1d4d..b78ecbf74b 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 @@ -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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"))); + add(createNormalCombinationPane(paraPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Block_Blank"))); + add(createNormalCombinationPane(layoutPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Block_Blank"))); jSeparatorLayout = createJSeparator(); add(jSeparatorLayout); @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter"), typeName)) { + if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 517be698b4..9a6a5d546e 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Large_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Small_To_Paste")); return; } } else { if (!adapter.accept(copiedXCreator, x, y)) { - designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Small_To_Paste")); return; } } @@ -308,4 +308,4 @@ public class FormSelectionUtils { } } } -} \ No newline at end of file +} 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 a8bfa05ea3..e3a5db6cd2 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_Button_ToolBar")); + setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Edit_Button_ToolBar")); setButton.setAction(new SetAction()); delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon); - delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Button_ToolBar")); + delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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/FormWebWidgetConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java index 84402fabf5..fb8ec7dd2a 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 @@ -27,16 +27,16 @@ public class FormWebWidgetConstants { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Page_Navi_Text"), IOUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class); // 首页 - 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"), + public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_First"), IOUtils.readIcon("/com/fr/web/images/first.png"), First.class); // 末页 - 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"), + public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Last"), IOUtils.readIcon("/com/fr/web/images/last.png"), Last.class); // 前一页 - public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Previous"), + public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Previous"), IOUtils.readIcon("/com/fr/web/images/previous.png"), Previous.class); // 后一页 - 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"), + public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Next"), IOUtils.readIcon("/com/fr/web/images/next.png"), Next.class); // 导出成Excel 分页导出 @@ -47,7 +47,7 @@ public class FormWebWidgetConstants { IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory - .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 4ec97bc007..76ae9926e3 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 @@ -54,7 +54,7 @@ public class FormWidgetDetailPane extends FormDockView{ private boolean isEdit; private CardLayout card; - private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report"); + private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Report"); private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"); public static FormWidgetDetailPane getInstance() { @@ -80,7 +80,7 @@ public class FormWidgetDetailPane extends FormDockView{ } public String getViewTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Tree_And_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LocalWidget"), + menutPanelNorthPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Local_Widget"), 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reset")); + resetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Item")); + deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Successful")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Share_Module_Removed_Successful")); refreshDownPanel(false); replaceButtonPanel(false); refreshComboxData(); } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Failed")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Refresh"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Download_Template")); + downloadButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set_default_browser")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Set_Default_Browser_Duplicate")); 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"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Install_Template"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Select")); + int returnValue = fileChooser.showDialog(new UILabel(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete_Template"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_OK")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Share_Module_OK")); } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Share_Module_Error")); } } catch (IOException e) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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[] {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AllCategories")}, ShareLoader.getLoader().getModuleCategory()); + return ArrayUtils.addAll(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 960f5cf6f0..df113a7bb9 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 @@ -58,6 +58,8 @@ import com.fr.form.ui.container.WLayout; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.page.PaperSettingProvider; +import com.fr.report.cell.Elem; +import com.fr.report.cell.cellattr.CellImage; import com.fr.report.worksheet.FormElementCase; import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; @@ -460,7 +462,10 @@ public class JForm extends JTemplate implements BaseJForm { // ////////////////for toolbarMenuAdapter////////////////////////////// // //////////////////////////////////////////////////////////////////// - + @Override + public void setPictureElem(Elem elem, CellImage cellImage) { + elem.setValue(cellImage.getImage()); + } /** * 目标菜单 * @@ -693,7 +698,7 @@ public class JForm extends JTemplate implements BaseJForm { * @return 菜单 */ public UIMenuItem[] createMenuItem4Preview() { - UIMenuItem form = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("M-Form_Preview"), UIConstants.RUN_SMALL_ICON); + UIMenuItem form = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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/WLayoutSelectionPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java index 5a5124f603..e54dd09682 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 @@ -1,38 +1,36 @@ package com.fr.design.mainframe; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.GridLayout; -import java.awt.Image; -import java.awt.Insets; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; - -import javax.swing.BorderFactory; -import javax.swing.JFrame; -import com.fr.design.gui.ilable.*; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JToolTip; - import com.fr.base.BaseUtils; -import com.fr.design.layout.TableLayoutHelper; - -import com.fr.stable.Constants; import com.fr.base.GraphHelper; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itooltip.MultiLineToolTip; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; -import com.fr.design.dialog.BasicDialog; -import com.fr.design.dialog.BasicPane; +import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WGridLayout; import com.fr.form.ui.container.WLayout; +import com.fr.stable.Constants; + +import javax.swing.BorderFactory; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JToolTip; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.Insets; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; public class WLayoutSelectionPane extends BasicPane { @@ -41,15 +39,15 @@ public class WLayoutSelectionPane extends BasicPane { private KindPane currentKindPane; public WLayoutSelectionPane() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Form-Please_Select_A_Kind_Of_Form_Container") + ":")); + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Please_Select_A_Kind_Of_Form_Container") + ":")); this.setLayout(FRGUIPaneFactory.createBorderLayout()); Component[][] coms = { - {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout")), new + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Border_Layout")), new BorderLayoutPane()}, - {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()}}; + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Grid_Layout")), new GridLayoutPane()}, + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Card_Layout")), new CardLayoutPane()}, + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Null_Layout")), new AbsoluteLayoutPane()}}; double p = TableLayout.PREFERRED; double f = TableLayout.FILL; double[] rowSize = {p, p, p, p, p}; @@ -65,7 +63,7 @@ public class WLayoutSelectionPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Widget-Form_Widget_Container"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Form_Widget_Container"); } @Override @@ -78,11 +76,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(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-LayoutContainer")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Border_Layout_Container")); 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(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ThreeContainer")); + b2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WLayout_Border_Three_Container")); KindPane b4 = new KindPane("/com/fr/web/images/form/layout_border_all.png", new WBorderLayout(0, 0)); - b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ToolTips")); + b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Border_ToolTips")); this.add(b1); this.add(b2); this.add(b4); @@ -115,7 +113,7 @@ public class WLayoutSelectionPane extends BasicPane { @Override protected String title4PopupWindow() { - return "GridLayout"; + return "Fine-Design_Form_Grid_Layout"; } } @@ -124,7 +122,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(com.fr.design.i18n.Toolkit.i18nText("WLayout-Card-ToolTip")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Card_ToolTip")); this.add(b1); this.add(new UILabel()); this.add(new UILabel()); @@ -249,4 +247,4 @@ public class WLayoutSelectionPane extends BasicPane { f.setSize(300, 200); f.setVisible(true); } -} \ No newline at end of file +} 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 92afcfd2b9..f61dc93ae3 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 @@ -52,7 +52,7 @@ public class WidgetHelpDialog extends UIDialog { contentPane.setLayout(new BorderLayout()); add(helpArea, BorderLayout.CENTER); this.applyClosingAction(); - this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help")); + this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 3957766971..d6ee253426 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 @@ -72,7 +72,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope @Override public String getViewTitle() { - return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Table"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Settings_Available")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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[]{ - 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") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal") }; final CardLayout tabbedPane = new CardLayout(); final JPanel center = new JPanel(tabbedPane); - 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")); + center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties")); + center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event")); + center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 bde1367c47..66093d7d48 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 @@ -134,7 +134,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide private void initFormButtons() { if (componentsList4Form.isEmpty()) { // 表单布局 - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"))); WidgetOption[] containerWidgetArray = FormWidgetOption.getFormContainerInstance(); for (WidgetOption no : containerWidgetArray) { this.componentsList4Form.add(new ToolBarButton(no)); @@ -144,9 +144,9 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide // 这个条件说明是否加载了图表模块 if (wo != null && wo.length > 0) { - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); - chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Me")); + chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 300b762f0b..7ddb8ae8d5 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 @@ -19,7 +19,6 @@ import com.fr.form.main.Form; import com.fr.form.main.FormEmbeddedTableDataExporter; import com.fr.log.FineLoggerFactory; -import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.project.ProjectConstants; @@ -86,10 +85,10 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ FineLoggerFactory.getLogger().error("Error In Make New File"); } fileChooserPane = null; - FRContext.getLogger().info("\"" + file.getName() + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Prepare_Export") + "!"); + FRContext.getLogger().info("\"" + file.getName() + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Prepare_Export") + "!"); (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exporting"), "", 0, 100)).start(); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exporting"), "", 0, 100)).start(); } private boolean isOk(int saveValue){ @@ -115,7 +114,7 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ } protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(new String[]{"frm"}, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form_EmbeddedTD")); + return new ChooseFileFilter(new String[]{"frm"}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EmbeddedTD")); } private SwingWorker createExportWork(FILE file, final Form tpl, final Map parameterMap) { @@ -135,13 +134,13 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ fileOutputStream.close(); this.setProgress(100); - FRContext.getLogger().info("\"" + fileGetName + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Finish_Export") + "!"); + FRContext.getLogger().info("\"" + fileGetName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exported_successfully") + "\n" + fileGetName); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + fileGetName); } catch (Exception exp) { this.setProgress(100); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_failed") + "\n" + filePath); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + filePath); } return null; } @@ -153,4 +152,4 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ return exportWorker; } -} \ No newline at end of file +} 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 7a68a04a52..255793e04b 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 @@ -82,7 +82,7 @@ public class FormMobileAttrAction extends JTemplateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 13cd907d82..9c9f7fec49 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 @@ -44,7 +44,7 @@ public class NewFormAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-New_FormBook"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_FormBook"); } @Override @@ -52,4 +52,4 @@ public class NewFormAction extends UpdateAction { return KeyStroke.getKeyStroke(KeyEvent.VK_F, DEFAULT_MODIFIER); } }; -} \ No newline at end of file +} 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 f1123a1403..8e5f964908 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 @@ -21,10 +21,10 @@ 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[]{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)}, + private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Red"), new Color(255, 0, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown"), new Color(153, 51, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("Custom") + "..."); + btnCustom = getBtn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") + "..."); bottom_bar.add(btnCustom); return bottom_bar; } @@ -130,4 +130,4 @@ public class ColorPalette extends JPopupMenu { } } } -} \ No newline at end of file +} 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 d5e1ff93ad..2cca7a0c5c 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 @@ -18,7 +18,7 @@ import com.fr.design.gui.icombobox.DictionaryComboBox; */ public class AdjustModeEditor extends AbstractPropertyEditor { public static final String[] AjustRowTypes = new String[] { - 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")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")}; private UIComboBox combobox; @@ -53,4 +53,4 @@ public class AdjustModeEditor extends AbstractPropertyEditor { public Component getCustomEditor() { return combobox; } -} \ No newline at end of file +} 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 3d6249f2be..f42f47be85 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 @@ -16,10 +16,10 @@ import com.fr.stable.StringUtils; public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { public static final Item[] ITEMS = new Item[] { - 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) }; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_East"), WBorderLayout.EAST) }; private ComboCheckBox comboBox; 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 8f739f8c13..9d9dae729c 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 @@ -7,7 +7,7 @@ import com.fr.stable.StringUtils; public class ButtonTypeEditor extends ComboEditor { public ButtonTypeEditor() { - super(new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Default"), false), new Item(com.fr.design.i18n.Toolkit.i18nText("Custom"), true), }); + super(new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), false), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 6270ebd6d2..19f414f3c8 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 @@ -184,7 +184,7 @@ public class DataTableConfigPane extends JComponent implements PropertyChangeLis * Constructor */ public CutAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 9d17e4199a..918e5293d7 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 @@ -1,15 +1,14 @@ package com.fr.design.mainframe.widget.editors; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.layout.FRGUIPaneFactory; + +import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridLayout; -import javax.swing.JPanel; - -import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - public class DimensionEditingPane extends BasicPane { @@ -24,8 +23,8 @@ public class DimensionEditingPane extends BasicPane { private void initComponents() { setLayout(new/**/ GridLayout(2, 1)); - 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") + ":"); + jLabel1 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widge_Width_Duplicate") + ":"); + jLabel2 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Height_Duplicate") + ":"); spWidth = new UISpinner(0, Integer.MAX_VALUE, 1, 0); spHeight = new UISpinner(0, Integer.MAX_VALUE, 1, 0); @@ -46,7 +45,7 @@ public class DimensionEditingPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Widget-Sizing"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Sizing"); } public Dimension update() { @@ -57,4 +56,4 @@ public class DimensionEditingPane extends BasicPane { spWidth.setValue(d.width); spHeight.setValue(d.height); } -} \ No newline at end of file +} 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 a8e901b0bf..4288d47caa 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 @@ -39,7 +39,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane private int row = 6; private DefaultTableModel toolbarButtonTableModel; private JTable layoutTable; - private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_ToolBar") + ":"); // 是否使用工具栏 + private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Restore_Default")); + UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Choose_One_Button")); } } }); @@ -123,7 +123,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane southToolBar.validate(); southToolBar.repaint(); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Choose_One_Button")); } } }); @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Top"), northToolBar); + FormSettingToolBar top = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Bottom"), southToolBar); + FormSettingToolBar bottom = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LayoutTable_Column_Width")); + int columnWidth = Integer.parseInt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Table_Column_Width")); for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); } 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 ca75fa9949..4e71ca9e7c 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 @@ -40,7 +40,7 @@ public class PaddingMarginPane extends BasicPane { topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Top") + " "), BorderLayout.WEST); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); topPane.add(topSpinner, BorderLayout.CENTER); - UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); topPane.add(topLabel, BorderLayout.EAST); contentPane.add(topPane); @@ -48,7 +48,7 @@ public class PaddingMarginPane extends BasicPane { leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Left") + " "), BorderLayout.WEST); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); leftPane.add(leftSpinner, BorderLayout.CENTER); - UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); leftPane.add(leftLabel, BorderLayout.EAST); contentPane.add(leftPane); @@ -56,7 +56,7 @@ public class PaddingMarginPane extends BasicPane { bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Bottom") + " "), BorderLayout.WEST); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); bottomPane.add(bottomSpinner, BorderLayout.CENTER); - UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); bottomPane.add(bottomLabel, BorderLayout.EAST); contentPane.add(bottomPane); @@ -64,7 +64,7 @@ public class PaddingMarginPane extends BasicPane { rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Right") + " "), BorderLayout.WEST); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); rightPane.add(rightSpinner, BorderLayout.CENTER); - UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); rightPane.add(rightLabel, BorderLayout.EAST); contentPane.add(rightPane); } 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 724e840aa7..5b359c9ac5 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 @@ -26,8 +26,8 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane { if(otherOtherConfig != null){ pane2.add(otherOtherConfig); } - visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Visible"), true); - visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true); + visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 5755e19598..138434d306 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 @@ -16,8 +16,8 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane { } public UICheckBox createOtherConfig() { - enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Enabled"), true); - enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enabled"), true); + enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 b1b149c2f6..65e2f66598 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 @@ -152,7 +152,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { widgetPropertyPane = WidgetBasicPropertyPaneFactory.createBasicPropertyPane(innerCreator); - UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 280, 20, widgetPropertyPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 280, 20, widgetPropertyPane); jPanel.add(uiExpandablePane, BorderLayout.NORTH); @@ -212,11 +212,11 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { public void updateCreator() { currentEditorDefinePane.setGlobalName(getGlobalName()); Widget widget = currentEditorDefinePane.updateBean(); - if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")) && widgetPropertyPane != null) { + if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(), 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")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png")); return; } widgetPropertyPane.update(widget); @@ -229,7 +229,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public void updateWidgetBound() { - if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"))) { + if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 6647f50132..9216705515 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 @@ -27,8 +27,8 @@ public class ElementCaseToolBarWrapper implements Encoder, Decoder { } FormToolBarManager[] toolBarManager = (FormToolBarManager[])v; if (toolBarManager.length != 0) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open"); } - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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 6c666dfb2c..571ab98871 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 @@ -12,7 +12,7 @@ public class EventHandlerWrapper implements Encoder { return null; } else { NameWithListeners handler = (NameWithListeners) v; - 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"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Total") + handler.getCountOfListeners4ThisName() + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge") + handler.getName() + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 f6dc5361bb..33fc019f00 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 @@ -40,6 +40,6 @@ public class FormulaWrapper implements Encoder, Decoder{ if (txt.length() > 0 && txt.charAt(0) == '=') { return; } - throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Formula_Tips")); + throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Formula_Tips")); } } \ No newline at end of file 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 9a335e27a4..74f4476d2f 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 @@ -14,7 +14,7 @@ public class ParameterWrapper implements Encoder, Decoder { if (v == null) { return StringUtils.EMPTY; } - return com.fr.design.i18n.Toolkit.i18nText("Total") + ((ParameterProvider[]) v).length + com.fr.design.i18n.Toolkit.i18nText("Parameters"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Total") + ((ParameterProvider[]) v).length + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameters"); } @Override @@ -26,4 +26,4 @@ public class ParameterWrapper implements Encoder, Decoder { public void validate(String txt) throws ValidationException { } -} \ No newline at end of file +} 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 f03fffa123..6eadb4dbf5 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 @@ -1,5 +1,12 @@ package com.fr.design.parameter; +import com.fr.base.Parameter; +import com.fr.design.beans.BasicBeanPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.BorderFactory; +import javax.swing.SwingConstants; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; @@ -8,14 +15,6 @@ import java.awt.event.ActionListener; import java.awt.event.MouseListener; import java.util.ArrayList; -import javax.swing.BorderFactory; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.SwingConstants; - -import com.fr.base.Parameter; -import com.fr.design.beans.BasicBeanPane; -import com.fr.design.gui.ibutton.UIButton; - /** * 参数点击动作条 @@ -48,12 +47,12 @@ public class ParameterToolBarPane extends BasicBeanPane { return new Dimension(super.getPreferredSize().width, 18); } }; - label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Following_parameters_are_not_generated") + ":"); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_all")); + addAll = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Add_all")); this.add(addAll); } @@ -171,4 +170,4 @@ public class ParameterToolBarPane extends BasicBeanPane { } } -} \ No newline at end of file +} 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 65e66af08e..75a8c61fe5 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 @@ -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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane); + UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane); this.add(advanceExpandablePane, BorderLayout.NORTH); JPanel layoutPane = createBoundsPane(); - UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Size"), 280, 20, layoutPane); + UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("Form-Desin_Width")), designerWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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,15 +85,15 @@ public class RootDesignDefinePane extends AbstractDataModify { public JPanel createAdvancePane() { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); labelNameTextField = new UITextField(); - 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")); + displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")); + useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left") , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; @@ -101,11 +101,11 @@ public class RootDesignDefinePane extends AbstractDataModify { double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - 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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")), background}, new Component[]{displayReport, null}, new Component[]{useParamsTemplate, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position")), 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 0e2dda3b4f..6d8191c2f9 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 @@ -42,22 +42,22 @@ public abstract class ButtonDefinePane extends AbstractDataMod labelNameTextField = new UITextField(); Component[] backgroundCompPane = createBackgroundComp(); Component[] frFont = createFontPane(); - UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")); + UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")); backgroundLabel.setVerticalAlignment(SwingConstants.TOP); Component[][] n_components = { - {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}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, backgroundCompPane, frFont, - {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} + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")), iconPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), 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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane); + UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, boundsPane); this.add(advancedPane); } @@ -97,4 +97,4 @@ public abstract class ButtonDefinePane extends AbstractDataMod return btn; } -} \ No newline at end of file +} 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 83916c729b..500d42a1cd 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 @@ -30,9 +30,9 @@ public class ButtonGroupDictPane extends JPanel { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); + adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); + this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 31ec3da191..339ff9baa8 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 @@ -40,10 +40,10 @@ public class CheckBoxDefinePane extends AbstractDataModify { double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - 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[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text")), text }, new Component[]{widgetValueLabel, formWidgetValuePane }, - 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("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, boundsPane); this.add(uiExpandablePane); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java index 3ac50e85f8..900072b7c0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java @@ -20,14 +20,14 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } public Component[] createWaterMarkPane() { waterMarkField = new UITextField(); - return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkField}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkField}; } protected void populateSubDictionaryEditorBean(ComboBox ob){ @@ -54,4 +54,4 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { public DataCreatorUI dataUI() { return null; } -} \ No newline at end of file +} 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 a8b70c943d..1684ad4d32 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 @@ -26,19 +26,19 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } public Component[] createWaterMarkPane() { waterMarkDictPane = new UITextField(); - return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane}; + return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane}; } public JPanel createOtherPane(){ - supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag"), true); + supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag"), true); supportTagCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); checkBoxDictPane = new CheckBoxDictPane(); @@ -83,4 +83,4 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane return "ComboCheckBox"; } -} \ No newline at end of file +} 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 9cb8e10475..415a392f4c 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 @@ -24,7 +24,7 @@ public abstract class CustomWritableRepeatEditorPane(new String[] {com.fr.design.i18n.Toolkit.i18nText("Date") , com.fr.design.i18n.Toolkit.i18nText("String")}); + returnTypeComboBox = new UIButtonGroup<>(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane}, new Component[]{formatLabel, formatHead}, new Component[]{startDateLabel, startDv}, new Component[]{endDateLabel, endDv}, - 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} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox} }; double[] rowSize = {p, p, p, p, p, p, p, p, p, p}; @@ -140,10 +140,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane e double f = TableLayout.FILL; double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ - 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("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane }, dicPane, removeRepeatPane, waterMarkComponent, - 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("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit"), false); + directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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 039c754c46..45c2cd9686 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 @@ -37,7 +37,7 @@ public abstract class FieldEditorDefinePane extends Abstr protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); labelNameTextField = new UITextField(); - allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Null")); + allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, jPanel); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")); + final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Validate"), 280, 20, validatePane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Validate"), 280, 20, validatePane); this.add(uiExpandablePane, BorderLayout.CENTER); } @@ -151,4 +151,4 @@ public abstract class FieldEditorDefinePane extends Abstr return null; } -} \ No newline at end of file +} 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 1168cb9dee..843f402f01 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 @@ -31,7 +31,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane { public Component[] createFontPane() { JPanel fontLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")); + fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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 e3b539354b..563553551d 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 @@ -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(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"))); + attr.add(horizontalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible"))); + attr.add(verticalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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(com.fr.design.i18n.Toolkit.i18nText("Form-Url") + ":"), srcTextField = new UITextField() }, - { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } }; + { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url") + ":"), srcTextField = new UITextField() }, + { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, contentPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, contentPane); this.add(uiExpandablePane, BorderLayout.NORTH); } @@ -81,4 +81,4 @@ public class IframeEditorDefinePane extends AbstractDataModify { ob.setOverflowy(this.verticalCheck.isSelected()); return ob; } -} \ No newline at end of file +} 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 06fe0a5e0d..b983118651 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 @@ -38,23 +38,23 @@ public class LabelDefinePane extends AbstractDataModify