From 660d5c9dfad744652f1f9ea017328b01b915f4b3 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 10 Aug 2018 16:17:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gui/frpane/UICorrelationComboBoxPane.java | 2 +- .../fr/design/gui/imenutable/UIMenuTable.java | 20 +++++++++---------- .../fr/design/hyperlink/WebHyperlinkPane.java | 2 +- .../other/ChartDesignerInteractivePane.java | 2 +- .../fr/design/condition/HyperlinkPane.java | 2 +- .../fr/start/module/DesignerActivator.java | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) 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 1d7881d2f5..9d62d9ed63 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 @@ -383,7 +383,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class); data.add(reportlet); data.add(email); 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 dfc6e453cf..9aef9aa842 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); } - + /** * 清除所有的内容 */ @@ -217,7 +217,7 @@ public class UIMenuTable extends JTable { UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"), new EmailJavaScript(), EmailPane.class); - UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"), + UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), WebHyperlinkPane.class ); data.add(reportlet); data.add(email); 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 e17190b786..d6bfad8b04 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 @@ -51,7 +51,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Basic_Hyperlink_Web_Link"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"); } @Override 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 1bdaee3229..8e8ad1086a 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,7 +33,7 @@ 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("Fine_Design_Basic_Hyperlink_Web_Link"), + list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), new WebHyperlink(), getUseMap(map, WebHyperlink.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null)); diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java index 95532acc25..d497138115 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java @@ -100,7 +100,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane