diff --git a/designer-base/pom.xml b/designer-base/pom.xml index d97a420933..25e3c1ec51 100644 --- a/designer-base/pom.xml +++ b/designer-base/pom.xml @@ -6,8 +6,11 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 + com.fr.report + designer-base + ${branch}-SNAPSHOT io.socket @@ -15,7 +18,5 @@ 0.7.0 - com.fr.report - designer-base - 10.0-RELEASE-SNAPSHOT + \ 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 a9cadd709f..4222144ae3 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -208,7 +208,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } String installHome = StableUtils.getInstallHome(); if (installHome != null && !".".equals(installHome)) { - String name = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_DEFAULT"); + 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); 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/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/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 72b4d81afe..aec3f42f3e 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 @@ -24,6 +24,7 @@ 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; @@ -177,8 +178,8 @@ public class PreferencePane extends BasicPane { functionPane.add(supportUndoCheckBox); //添加maxUndoLimit //String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"}; - String[] undoTimes = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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); @@ -394,7 +395,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); 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 ebf6b7cdca..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,7 +67,7 @@ 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("Fine-Design_Basic_Cancel")); private int ifHasBeenWriten = 0; @@ -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(); } 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/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/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/condition/ConditionAttributesPane.java b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java index 2e2024aa8c..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,7 +35,7 @@ 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(); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index a684e45198..d4905b645b 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -74,9 +74,9 @@ public class JDBCDefPane extends JPanel { private IntegerEditor DBCP_MAX_WAIT = new IntegerEditor(); private UITextField DBCP_VALIDATION_QUERY = new UITextField(); - private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Yes")}); - private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Yes")}); - private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Yes")}); + private UIComboBox DBCP_TESTONBORROW = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")}); + private UIComboBox DBCP_TESTONRETURN = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")}); + private UIComboBox DBCP_TESTWHILEIDLE = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Yes")}); private IntegerEditor DBCP_TIMEBETWEENEVICTIONRUNSMILLS = new IntegerEditor(); private IntegerEditor DBCP_NUMTESTSPEREVICTIONRUN = new IntegerEditor(); @@ -131,13 +131,13 @@ public class JDBCDefPane extends JPanel { JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":")); JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":"), passwordTextField}}; + Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}}; double[] userRowSize = {p}; double[] userColumnSize = {f, p, f}; userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4); JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":")); + passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":")); Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBox}, {urlPane, urlComPane}, {userPane, userComPane},}; @@ -289,7 +289,7 @@ public class JDBCDefPane extends JPanel { if (ComparatorUtils.equals(dbtypeComboBox.getSelectedItem(), ("Access"))) { // ben:这个能不能换种处理方案- - JFileChooser filechooser = new JFileChooser(); - filechooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Open")); + filechooser.setDialogTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open")); filechooser.setMultiSelectionEnabled(false); filechooser.addChoosableFileFilter(new ChooseFileFilter(new String[]{"accdb", "mdb"}, "Microsoft Office Access")); int result = filechooser.showOpenDialog(DesignerContext.getDesignerFrame()); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java index 02fd23cd48..4fa695fd21 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java @@ -17,7 +17,7 @@ public class PreviewLabel extends UIButton { public PreviewLabel(Previewable previewable) { super(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png")); - this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Preview")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.previewable = previewable; this.addActionListener(new ActionListener() { 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 b33b030c4e..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 @@ -122,19 +122,19 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel { if(((String) value).length() > 0 && ((String) value).charAt(0) == '=') 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("Fine-Design_Basic_Double"); else if(value instanceof 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("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/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 8901f4b942..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)); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java index 16682c4157..18938a96cd 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java @@ -33,8 +33,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ private UIButton del; private static String[] TYPE = { - com.fr.design.i18n.Toolkit.i18nText("String"), - com.fr.design.i18n.Toolkit.i18nText("Integer"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_String"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") }; 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 340b8971f9..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 @@ -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 cd137544fb..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 @@ -140,7 +140,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane 0 && ((String) value).charAt(0) == '=') 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("Fine-Design_Basic_Double"); else if(value instanceof 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("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 6fce66b482..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("Fine-Design_Basic_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()); 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/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 8d6302662a..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,13 +103,13 @@ 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(); @@ -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/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java index 53eb4866fc..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 @@ -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; } @@ -303,7 +303,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, if (designerEnvManager.isSupportStringToFormula()) { if (!designerEnvManager.isDefaultStringToFormula()) { 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("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); + + "?", 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/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java index e304d96a86..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 @@ -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; } @@ -284,7 +284,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName if (designerEnvManager.isSupportStringToFormula()) { if (!designerEnvManager.isDefaultStringToFormula()) { 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("FR-Designer_Tooltips"), JOptionPane.YES_NO_OPTION); + + "?", 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/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/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/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/extra/PluginOperateUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java index 36f325521f..b0b1f54324 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java @@ -94,7 +94,7 @@ public class PluginOperateUtils { public void run() { int rv = JOptionPane.showConfirmDialog( null, - com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Delete_Confirmed"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Confirmed"), 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/PluginUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java index 6856bc003d..50f81d5741 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginUtils.java @@ -139,7 +139,7 @@ public class PluginUtils { String startVersion = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Start_Version"); String developer = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Developer"); String desc = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Function_Description"); - String updateLog = com.fr.design.i18n.Toolkit.i18nText("FR-Plugin-Update_Log"); + String updateLog = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Plugin_Update_Log"); Map map = new HashMap(); map.put("name", pluginName); @@ -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 ba2ee26f34..de96c10b9b 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; @@ -571,13 +570,6 @@ public class PluginWebBridge { //todo 初始化设计器其他部分 } - /** - * 国际化 - */ - public String parseI18(final String key) { - return com.fr.design.i18n.Toolkit.i18nText(I18N_PREFIX + 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/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/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java index 7c2f09becf..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 @@ -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("Fine-Design_Basic_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); 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 301959423b..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,7 +22,7 @@ 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("Fine-Design_Basic_Plugin_Warning"), JOptionPane.ERROR_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 6e85e9c4b1..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 @@ -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/TinyFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java index 40826b6a19..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 @@ -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/columnrow/ColumnRowVerticalPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java index 10f7680d98..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 @@ -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 6957f05dd0..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); } /** @@ -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("Fine-Design_Basic_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) { - 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("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) { - 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("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) { - 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..5fc72214c5 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,7 +22,7 @@ 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(); } catch (Exception e) { 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..ff9e48e5db 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 @@ -2,7 +2,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 +11,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 +23,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 +46,30 @@ 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) { + UIControlPane(BasePlot plot) { + super(); 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 +78,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 +104,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 +134,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 +154,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 +183,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() - }; +// return AbstractShortCutFactory.getInstance(this).createNewShortCuts(); + 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(); - - - public void populate(Nameable[] nameableArray) { - } - - /** - * 检查按钮可用状态 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 +208,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 +346,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 eac81beb07..de2a42fa80 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,81 @@ 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 +96,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 +131,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 +146,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 +188,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 +198,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("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)) { - 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 +257,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("Fine-Design_Basic_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) { - 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("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) { - 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("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) { - 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); - } + getHelper().checkButtonEnabled(); } - 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(); - } - } - } - } - } - - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { try { return creator.getUpdatePane().newInstance(); } catch (InstantiationException e) { @@ -950,7 +380,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 +395,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 +407,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 +420,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/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/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 b28caa1c7a..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,7 +45,7 @@ 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_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("Fine-Design_Chart_Sun"), com.fr.design.i18n.Toolkit.i18nText("Mon"), + 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("Fri"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sat") + 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(); 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/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index 0f8ba6dacb..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 @@ -56,8 +56,8 @@ public abstract class EditingStringListPane extends BasicBeanPane> }); addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify")); - removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove")); + 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")); 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 9a531c60d6..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); 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/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 fc62de0806..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("Fine-Design_Basic_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/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 70faa46be3..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) { 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 d1c2a087af..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,7 +377,7 @@ 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("Fine-Design_Basic_Email"), 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 ee8661a835..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,7 +113,7 @@ 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("Fine-Design_Basic_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); 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 ea994849ce..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 @@ -22,8 +22,8 @@ public class DictionaryConstants { 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("Phone"), - com.fr.design.i18n.Toolkit.i18nText("MobilePhone"), + 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")}; 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 9555c282dc..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 @@ -211,7 +211,7 @@ 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("Fine-Design_Basic_Email"), diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java index b00971474b..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 @@ -75,7 +75,7 @@ public class UIMenuTableUI extends UITableUI{ public void mousePressed(MouseEvent e) { if (e.getX() >= table.getWidth() - 20) { 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("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + 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(); 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/UITableUI.java b/designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java index f04b644417..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 @@ -133,7 +133,7 @@ public class UITableUI extends BasicTableUI { } if (!table.isEditing()) { 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("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); + 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(); 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 0cfa26f9ef..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()); 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 273fbdcb63..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 @@ -252,7 +252,7 @@ public abstract class UITableModelAdapter extends AbstractTabl component = DesignerContext.getDesignerFrame(); } int val = JOptionPane.showConfirmDialog(component, - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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; 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 02facbb76a..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,7 +62,7 @@ public class UISearchTextField extends UITextField { private void initTextField() { iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Search")); + 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(); 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 f8a0552213..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 @@ -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/syntax/ui/rsyntaxtextarea/ErrorStrip.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/ErrorStrip.java index 508fb93b27..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,17 +35,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -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; @@ -287,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; @@ -673,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); 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 757de93d2c..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 @@ -86,13 +86,13 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane { } }); - 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,7 +84,7 @@ 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("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/ProcessParameterTableModel.java b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java index fc7d140647..5f2e359b31 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java @@ -30,7 +30,7 @@ public class ProcessParameterTableModel extends UITableModelAdapter> if (isLowerThanHBB(xmlDesignerVersion)) { 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("FR-Designer_Tooltips")).show(); + new InformationWarnPane(info, moreInfo, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips")).show(); return true; } return false; @@ -884,7 +884,7 @@ public abstract class JTemplate> 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("Fine-Design_Basic_Server_Version_Tip_More_Info"); - new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show(); + 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/loghandler/LogHandlerBarUI.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java index 4eb214358c..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,7 +100,7 @@ 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("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); } 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/widget/accessibles/TemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java index 8effcd10f3..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) { 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 f6c8011e3a..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 @@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder { } else if (v instanceof GradientBackground) { 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"); } } 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 a538d3218e..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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 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 f0f880369b..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(); @@ -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"); } /** 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 c9ab1224e6..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,7 +45,7 @@ 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("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; @@ -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/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/DatabaseDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java index 5c3c3bd933..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}); @@ -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/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/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/roleAuthority/RoleSourceOP.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RoleSourceOP.java index 92c48187bf..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("Fine-Design_Basic_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("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("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/RolesAlreadyEditedPane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/RolesAlreadyEditedPane.java index d9eea8ad07..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 @@ -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 0cf743ba81..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("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 +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 06622d7caf..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 @@ -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"); } /** 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 4ec840e63e..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,11 +146,11 @@ 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); 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 806c2f937c..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); @@ -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. 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 1bec102891..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 @@ -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() { 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 062dc7f94f..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 @@ -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"); } /** 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 64099e4b6a..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,7 +37,7 @@ 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); 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 7b53952260..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 @@ -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")); } } 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 3fe70120f5..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 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 4abacdd4b5..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; - /** * 颜色选择器更多颜色对话框 @@ -98,7 +97,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ 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/DetailColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java index 5232ab3afa..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 @@ -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/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index d80f374492..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()); 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 078fe05d0e..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("Fine-Design_Basic_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(); 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 7bfb135c12..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 @@ -143,7 +143,7 @@ public class CustomIconPane extends BasicPane { }else { // add failed - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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); @@ -174,7 +174,7 @@ public class CustomIconPane extends BasicPane { // remove failed JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message2"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } @@ -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("Fine-Design_Basic_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); @@ -410,7 +410,7 @@ public class CustomIconPane extends BasicPane { if (WidgetInfoConfig.getInstance().getIconManager().contains(nameTextField.getText())) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom_Icon_Message3"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.WARNING_MESSAGE); } } 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/component/CheckBoxDictPane.java b/designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java index 4cb8dfe9fb..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 @@ -41,7 +41,7 @@ public class CheckBoxDictPane extends JPanel { }; returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); - returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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) { 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 6bff9638f6..59eaea4e6e 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -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 3aac639974..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 @@ -66,7 +66,7 @@ public class LocalEnvPane extends BasicBeanPane { @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/RemoteSignInPane.java b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java index 2ca95160f9..99b0fe0699 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteSignInPane.java @@ -24,7 +24,7 @@ public class RemoteSignInPane extends BasicPane { 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); 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 c31f72f31c..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 @@ -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) { // diff --git a/designer-chart/pom.xml b/designer-chart/pom.xml index 472b1e62ba..6a6bc80c09 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 + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file 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/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/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/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/javascript/ChartEmailPane.java b/designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java index 1eb6dc9256..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 @@ -55,7 +55,7 @@ public class ChartEmailPane extends EmailPane{ } 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); } 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 8212e65eda..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); 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 ef043c8385..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 f8e543f43a..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("Fine-Design_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); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java index 66d47ddd90..2be0679dfb 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableDataSinglePane.java @@ -82,7 +82,7 @@ public class MapTableDataSinglePane 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() { 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 dba412613b..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("Fine-Design_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; } 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 df82492731..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 @@ -55,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; @@ -300,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.i18nText("FR-Chart-Map_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(); @@ -332,11 +332,11 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } 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)){ @@ -407,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")); // 地图已经保存. } }; 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 c06aa1c156..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() { 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 7b28ec4324..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 @@ -68,16 +68,16 @@ public class ConditionTrendLinePane extends BasicBeanPane { 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(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); @@ -99,10 +99,10 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置 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("Fine-Design_Chart_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_TrendLine_Backward") + ":")); extendsPane.add(backwardLabel = new UITextField("0", 5)); extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); @@ -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/DataSeriesAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java index 54ee8c54fc..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 @@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane { @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"); } 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 dd19bdfabd..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 858fa605e9..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 @@ -61,7 +61,7 @@ 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); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java index d1e39f755e..ddb54b5323 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/MapEditPane.java @@ -60,9 +60,9 @@ public class MapEditPane extends BasicBeanPane{ 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 87c12b26c5..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); } }; 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..a301af6971 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 @@ -215,7 +215,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/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/PaneTitleConstants.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java index d600a1d85e..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 @@ -5,21 +5,21 @@ package com.fr.design.mainframe.chart; public class PaneTitleConstants { 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("Style"); + 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("Fine-Design_Report_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_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("Chart_Data_Sheet"); + 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("Fine-Design_Chart_D_Chart_Area"); - public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot"); + 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"); } 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 c8517c05cd..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 @@ -111,7 +111,7 @@ public class ChangeConfigPane extends BasicBeanPane { 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("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} }; @@ -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/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/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 36da971146..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 @@ -25,8 +25,8 @@ public class PresentComboBox extends UIComboBox{ private String[] ITEMS = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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_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..da79f2691b 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 @@ -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 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 be18db2850..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"); @@ -36,8 +36,8 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa protected String[] columnNames() { return new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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_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 d4b4557592..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 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("Chart_Project"); + private static final String PRO = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project"); public GanttPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/MeterPlotReportDataContentPane.java index 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 816aea72b2..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 @@ -32,8 +32,8 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten protected String[] columnNames() { return new String[]{ com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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_Scatter") + "x", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Scatter") + "y" }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java index 961ac66b3e..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; @@ -58,14 +58,14 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane 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..ec3f57744b 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_Category_Name")); categoryLabel.setPreferredSize(new Dimension(85,COMBOX_HEIGHT)); addButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/CategoryPlotTableDataContentPane.java index 4c2e70850a..e1a0bfde37 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_Category_Name")) ; 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..ad3a2fc4e4 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_Category_Use_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 a2eca6347d..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)); @@ -52,10 +52,10 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP Component[][] components = new Component[][]{ 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("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_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/ChartInteractivePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java index 0f5a1307d3..24128ec286 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")); + 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("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")); + 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(); @@ -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(); //用来调整对齐 @@ -408,11 +408,11 @@ public class ChartInteractivePane extends BasicScrollPane implements UIOb Component[][] components = new Component[][]{ new Component[]{isAutoRefresh, null}, new Component[]{GUICoreUtils.createFlowPane(new Component[]{ - new UILabel(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); } @@ -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 7277791efa..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,7 +41,7 @@ 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("Fine-Design_Chart_Sun"); private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"); @@ -49,7 +49,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver { 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("Fine-Design_Chart_Sun"), + 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") }; @@ -66,7 +66,7 @@ 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("Fine-Design_Chart_Sun")); INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); 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 c305609836..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 @@ -85,10 +85,10 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ 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)); @@ -161,7 +161,7 @@ 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("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}, @@ -215,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); } @@ -289,7 +289,7 @@ 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("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}, @@ -316,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 778be9a298..eaffb94983 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"), 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..ccd7f08981 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,7 +75,7 @@ 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); 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 9e4fcecfec..ed7666cf84 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 @@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane{ public ChartBeautyPane() { String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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("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") //新加的两种风格，注意兼容处理 }; 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 6aefe3f72a..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("Fine-Design_Chart_Use_Value")); - 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")); 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 d5bdc1c954..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")); + 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("FR-Chart-Area_Value")); - valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format")); + 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 bd39b15fca..8e198ea6c5 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_Category_Use_Name")); } 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/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 59548d18e4..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,14 +48,14 @@ 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("Fine-Design_Chart_Sun"), + 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("Fine-Design_Chart_Sun"), ChartConstants.DAY_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), ChartConstants.HOUR_TYPE); @@ -65,7 +65,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ 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("Fine-Design_Chart_Sun")); INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); @@ -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() { 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..64987d571c 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 @@ -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/Plot3DAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java index df60e41d7b..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; 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 51c165743e..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,9 +33,9 @@ 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("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); 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..289bef4eb0 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); } @@ -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 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 740f1fc7d2..844f3f81f3 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 @@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane{ * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Value_Axis"); } @Override 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 c544698701..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 @@ -95,11 +95,11 @@ public class ChartDataLabelPane extends BasicScrollPane{ if(plot instanceof BarPlot){ 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("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]; } 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..91326f6371 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() { 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 6fb2789984..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,7 +52,7 @@ 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(); 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..f06d0aa399 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_Line_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 8acb014fc7..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 @@ -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..cea38295e0 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_Line_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_Line_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 a1d6687f6f..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 @@ -49,7 +49,7 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { 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); 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..ee16c281f8 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_Line_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_Line_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/LineSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java index 3154522c5d..2fc587dada 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_Line_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 4406b2b10c..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 @@ -77,7 +77,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { }; 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}, 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 a004d96239..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,7 +35,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { protected void initCom() { stylePane = new ChartBeautyPane(); - isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); + 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); 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..81fa1b93d7 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,7 +54,7 @@ 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")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} 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 af308adc87..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 @@ -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 7796be1fb6..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; 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 0ebc26685d..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; 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 3543661210..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 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("FR-Chart-Chart_3D"); + 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 fb20ec1be0..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 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("FR-Chart-Chart_3D"); + 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 4efcbe459b..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 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("FR-Chart-Chart_3D"); + 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/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java index 099c008d21..e2e3e67c4b 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 @@ -97,7 +97,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 +105,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/van/chart/area/VanChartAreaPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java index b035f86b48..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 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 a6b74cbb71..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 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 c2b64cf1c5..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(); @@ -59,12 +59,12 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon 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/VanChartColumnPlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java index 8bc69a75af..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 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 3b11b4c608..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); 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 eb28690f12..b0da618442 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 @@ -74,7 +74,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); @@ -111,8 +111,8 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { } @Override - protected AddItemMenuDef getAddItemMenuDef (NameableCreator[] creators) { - return new AddVanChartItemMenuDef(creators); + protected void initShortCutFactory() { + this.shortCutFactory = VanChartShortCutFactory.newInstance(this); } public void populate(NameJavaScriptGroup nameHyperlink_array) { @@ -236,24 +236,24 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane { protected java.util.List refreshList(HashMap map) { java.util.List list = new ArrayList(); - list.add(new UIMenuNameableCreator(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 +272,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/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/VanChartTrendLinePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java index f5bc468dda..ca28a6624c 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java @@ -55,7 +55,7 @@ public class VanChartTrendLinePane extends BasicPane{ double[] c = {f, p, f, p}; Component[][] periodComps = new Component[][]{ new Component[]{prePeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")), afterPeriod, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward")), null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_After_Period")), null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine_Forward")), null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_After_Period")), null}, }; JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c); @@ -66,8 +66,8 @@ public class VanChartTrendLinePane extends BasicPane{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name")), trendLineName}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")), trendLineStyle}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), trendLineColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), trendLineType}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color")), trendLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Type")), trendLineType}, new Component[]{label, periodPane} }; @@ -75,7 +75,7 @@ public class VanChartTrendLinePane extends BasicPane{ this.add(panel, BorderLayout.CENTER); } protected String title4PopupWindow(){ - return com.fr.design.i18n.Toolkit.i18nText("Chart-Trend_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TrendLine"); } public void populate(VanChartAttrTrendLine trendLine) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java index e6dfa45cfa..202df532e9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java @@ -37,7 +37,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Chart-Default_Name"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Default_Name"); } }); paneList.add(new ColorBackgroundQuickPane()); 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 f38a167209..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,7 +29,7 @@ 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("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..9547808d6f 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_Category_Use_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/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..16a40fdef9 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 @@ -130,7 +130,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 +138,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}, }; } 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/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 914d973a92..871b3afd4d 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 @@ -41,7 +41,7 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane } - protected BasicBeanPane createPaneByCreators(NameableCreator creator) { + public BasicBeanPane createPaneByCreators(NameableCreator creator) { Constructor constructor = null; try { constructor = creator.getUpdatePane().getConstructor(Plot.class); 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 d07d86ce6d..c1b43e946d 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"), panel); } private void initPositionListener(){ 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 6cb4567c37..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; @@ -159,7 +159,7 @@ 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(){ 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 2bf7ef516f..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}, }; @@ -255,14 +255,14 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane { } ; 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(){ 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 de77633651..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); 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/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 7d55280505..b482b027e7 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 @@ -25,7 +25,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)}; } @@ -40,9 +40,9 @@ public class AlertLineListControlPane extends VanChartUIListControlPane { protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } 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..19936829e8 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 @@ -26,7 +26,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,9 +42,9 @@ public class BackgroundListControlPane extends VanChartUIListControlPane { protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } 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 58d122ff16..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("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("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 4e14640639..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 @@ -67,11 +67,11 @@ public class VanChartCustomIntervalBackgroundPane 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..e5138a668f 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 @@ -31,7 +31,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,9 +40,9 @@ public class VanChartStackedAndAxisListControlPane extends VanChartUIListControl protected ShortCut4JControlPane[] createShortcuts() { return new ShortCut4JControlPane[]{ - moveUpItemShortCut(), - moveDownItemShortCut(), - removeItemShortCut() + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.removeItemShortCut() }; } @@ -96,6 +96,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/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 0b31d7a19c..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 @@ -42,15 +42,15 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{ private void initAllComponent() { 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 e651bd93a6..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; @@ -69,11 +69,11 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{ Component[][] components = new Component[][]{ 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("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_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/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..e2c4799fe4 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 @@ -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} }; } 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..92a688a71f 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 @@ -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); 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 783717f2ca..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() { 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 5de757af83..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.i18nText("Fine-Design_Chart_Line_Chart"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"), - com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") + 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/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 59d7af22ba..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,8 +40,8 @@ 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("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/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 7cbf2ca501..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,8 +42,8 @@ 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("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 111dd57e94..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 @@ -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/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 a4cae47376..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 @@ -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") }; } 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 1758622a92..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 @@ -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/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/pie/VanChartPiePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPiePlotPane.java index 94652696f0..610f6417e1 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,8 +28,8 @@ 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("Fine-Design_Chart_New_Pie"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SameArc_Pie"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DifferentArcPie") }; } @@ -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/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 7a34ac565c..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 @@ -74,7 +74,7 @@ public class GradualIntervalConfigPane extends JPanel{ return new Component[][]{ new Component[]{minMaxValuePane, null}, 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("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}, }; } @@ -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 5aa474b45b..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 @@ -29,7 +29,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula { return new Component[][]{ new Component[]{null,null}, 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("FR-Chart-Value_Divided_stage")), getRegionNumPane()}, + 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/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/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 0af05be11a..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 @@ -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..31c439f0cb 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 + ${branch}-SNAPSHOT com.fr.report designer-base - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file 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/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/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index 2d3f3dac46..8045ed8ec7 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,32 +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.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.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中的图表按钮弹出的控件, 创建初始化图表内容. * @@ -106,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, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java index 408560277f..2399496ce1 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,7 +29,7 @@ public class XCheckBox extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")) + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { 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 52f9d0092e..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("Fine-Design_Form_Allow_Custom_Data")) .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/XDirectWriteEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java index 25a04c0bb7..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 @@ -26,6 +26,6 @@ public abstract class XDirectWriteEditor extends XFieldEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); + 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/XFieldEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java index 8ef52455a8..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 @@ -39,10 +39,10 @@ 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("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"); CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .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("Fine-Design_Form_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_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 472eda7160..42747042ed 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 @@ -48,7 +48,7 @@ public class XIframeEditor extends XWidgetCreator { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "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") }); } 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 adb16c44bc..9671d3b868 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 @@ -49,10 +49,10 @@ public class XNumberEditor extends XWrapperedFieldEditor { CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass()) .setEditorClass(InChangeBooleanEditor.class) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Decimals")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .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, @@ -60,21 +60,21 @@ public class XNumberEditor extends XWrapperedFieldEditor { new CRPropertyDescriptor("allowNegative", this.data.getClass()) .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("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("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("Fine-Design_Form_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") + .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 33a60cbb0e..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 @@ -53,12 +53,12 @@ public class XPassword extends XWrapperedFieldEditor { 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("Fine-Design_Report_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("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("Fine-Design_Form_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); 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/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index 4eb0af9994..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 @@ -41,9 +41,9 @@ public class XTextArea extends XFieldEditor { 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("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) - .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + .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("Fine-Design_Report_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("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); 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 fb272d2102..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 @@ -44,9 +44,9 @@ public class XTextEditor extends XWrapperedFieldEditor { 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("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( - "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + "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("Fine-Design_Report_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("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); 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 a18706189b..d4083ecc9a 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 @@ -51,13 +51,13 @@ public class XTreeComboBoxEditor extends XTreeEditor { 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("Fine-Design_Form_Allow_Edit")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); + 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("Fine-Design_Form_Allow_Custom_Data")).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate")); } @Override 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 54a450fc2a..d17f5cca53 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 @@ -46,10 +46,10 @@ public class XTreeEditor extends XWidgetCreator { TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Verify_Message")) - .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), + .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"), } : new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( @@ -60,7 +60,7 @@ public class XTreeEditor extends XWidgetCreator { TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( - XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),}; + XCreatorConstants.PROPERTY_VALIDATE, "Fine-Design_Basic_Validate"),}; crp = this.addWaterMark(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, 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/properties/EventPropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java index 46b802fe12..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.*; @@ -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); } /** 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 3ff873e64b..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 @@ -46,7 +46,7 @@ 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("Fine-Design_Form_Hgap"); case 2: 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 742ffdb979..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,8 +7,8 @@ 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("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) }; 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 55a1baab77..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,8 +7,8 @@ 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("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) }; 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..b19fff9363 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 @@ -21,7 +20,7 @@ public class XCreatorConstants { // 描述属性的分类 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 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/xtable/ReportAppPropertyGroupModel.java b/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java index 9022f05d17..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 { @@ -36,7 +35,7 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { //弹窗提示 JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Mobile_Warning"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.PLAIN_MESSAGE); return false; } 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 86257317db..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("Fine-Design_Report_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); @@ -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); } /** 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 df250a0ac7..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 @@ -144,7 +144,7 @@ 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("Fine-Design_Form_Click_Me")); chartButton.addMouseListener(new MouseAdapter() { 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 31aba0ea5e..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,9 +21,9 @@ 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("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("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("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("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)}, + 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)}, 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 58db814736..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("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")}; + 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; 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/wrappers/ParameterWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ParameterWrapper.java index f2f523dd4b..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("Fine-Design_Form_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 diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 9e434fb03e..e43e567f42 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -62,7 +62,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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(); 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 8b918ccf62..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 @@ -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); } 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 cfd0a61143..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 @@ -46,7 +46,7 @@ public class IframeEditorDefinePane extends AbstractDataModify { { horizontalCheck, null }, { verticalCheck, null }, { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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_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); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java index d3dc315e57..1fe824156f 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ParameterTreeComboBox.java @@ -142,7 +142,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox { // 报表参数 parameters = model.getReportParameters(); if (!ArrayUtils.isEmpty(parameters)) { - groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("ParameterD-Report_Parameter"), parameters)); + groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ParameterD_Report_Parameter"), parameters)); } // 数据源参数 parameters = model.getTableDataParameters(); @@ -154,7 +154,7 @@ public class ParameterTreeComboBox extends FRTreeComboBox { // 全局参数 parameters = ParameterConfig.getInstance().getGlobalParameters(); if (!ArrayUtils.isEmpty(parameters)) { - groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("M_Server-Global_Parameters"), parameters)); + groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Server_Global_Parameters"), parameters)); } // 全局数据源参数 parameters = new Parameter[0]; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java index 0b92ce468d..9e833f0ae4 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java @@ -76,7 +76,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{ // 弹窗提示 JOptionPane.showMessageDialog(null, warningText, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), JOptionPane.PLAIN_MESSAGE); } super.setValue(value); diff --git a/designer-realize/pom.xml b/designer-realize/pom.xml index 1e9d72c76e..a0b56b093a 100644 --- a/designer-realize/pom.xml +++ b/designer-realize/pom.xml @@ -6,21 +6,21 @@ com.fr.report design - 10.0-RELEASE-SNAPSHOT + 10.0 com.fr.report designer-realize - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-form - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT com.fr.report designer-chart - 10.0-RELEASE-SNAPSHOT + ${branch}-SNAPSHOT \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java index ad669ca0df..3ea8d984b2 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java @@ -26,7 +26,7 @@ public class NewPresentAction extends PresentCheckBoxAction { @Override public boolean executeActionReturnUndoRecordNeeded() { if (!ComparatorUtils.equals(this.itemName, "NOPRESENT")) { - CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"), this.itemName); + CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"), this.itemName); } else { TemplateCellElement ce = getSelectedCellElement(); // 只有原来ce设置了形态的情况下才有undo操作 diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java index 2271baa872..1f77f9b935 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java @@ -27,7 +27,7 @@ public class StyleAction extends UpdateAction { * @param e 事件 */ public void actionPerformed(ActionEvent e) { - CellElementPropertyPane.getInstance().GoToPane(new String[] { com.fr.design.i18n.Toolkit.i18nText("Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") }); + CellElementPropertyPane.getInstance().GoToPane(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") }); } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java index adc5409ef5..1a50b3f53b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java @@ -3,20 +3,18 @@ */ package com.fr.design.actions.cell.style; -import java.awt.Color; - -import javax.swing.JComponent; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.base.core.StyleUtils; import com.fr.design.actions.core.ActionFactory; -import com.fr.general.ComparatorUtils; - import com.fr.design.mainframe.ElementCasePane; import com.fr.design.style.color.UIToolbarColorButton; +import com.fr.general.ComparatorUtils; + +import javax.swing.JComponent; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.Color; /** * Foreground. diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java index 3d1aa2225d..1acf4a4042 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontNameAction.java @@ -24,7 +24,7 @@ public class ReportFontNameAction extends AbstractStyleAction { public ReportFontNameAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Family")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Family")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java index 54dd60424c..d96d22b88f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java @@ -23,7 +23,7 @@ public class ReportFontUnderlineAction extends ReportFontBoldAction { public ReportFontUnderlineAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Underline")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FRFont_Underline")); this.setSmallIcon(ICONS, true); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java index 3593925d0d..b7e3485425 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java @@ -52,7 +52,7 @@ public class DeleteRowAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Row"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java index c58719995c..edd4dd98ee 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java @@ -37,7 +37,7 @@ public class InsertRowAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Row"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java index 99ea5ac08c..85cfdce1bd 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java @@ -12,7 +12,7 @@ public class ClearWidgetAction extends ClearAction { public ClearWidgetAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Widget")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget")); this.setMnemonic('W'); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java index da9a4b5c89..6f634eb8a0 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/order/SendFloatElementBackwardAction.java @@ -9,11 +9,6 @@ import com.fr.design.mainframe.ElementCasePane; import com.fr.report.cell.FloatElement; import com.fr.report.elementcase.ElementCase; -import javax.swing.*; -import java.awt.event.KeyEvent; - -import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; - /** * Send FloatElement backward. */ @@ -24,7 +19,7 @@ public class SendFloatElementBackwardAction extends AbstractFloatElementOrderAct public SendFloatElementBackwardAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Send_Backward")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Send_Backward")); this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); // this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); diff --git a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java index 1b7385c2e1..b9b2e4ad77 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java +++ b/designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java @@ -94,15 +94,15 @@ public class DeprecatedActionManager { final MenuDef presentMenu = new MenuDef(KeySetUtils.PRESENT.getMenuKeySetName()); presentMenu.setIconPath("com/fr/design/images/data/source/dataDictionary.png"); presentMenu.setMnemonic(KeySetUtils.PRESENT.getMnemonic()); - NewPresentAction dataDictAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("M_Format-Data_Map"), DictPresent.class.getName()); + NewPresentAction dataDictAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Format_Data_Map"), DictPresent.class.getName()); dataDictAction.setMnemonic('D'); - NewPresentAction formulaAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"), FormulaPresent.class.getName()); + NewPresentAction formulaAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"), FormulaPresent.class.getName()); formulaAction.setMnemonic('F'); - NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"), BarcodePresent.class.getName()); + NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Insert_Barcode"), BarcodePresent.class.getName()); barcodeAction.setMnemonic('B'); NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"), CurrencyLinePresent.class.getName()); currencyLineAction.setMnemonic('L'); - NewPresentAction nonePresentAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"), "NOPRESENT"); + NewPresentAction nonePresentAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_No_Present"), "NOPRESENT"); nonePresentAction.setMnemonic('N'); presentMenu.addShortCut(dataDictAction); presentMenu.addShortCut(formulaAction); diff --git a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java index 9c1ef42dff..6961b06c13 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java @@ -33,7 +33,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Style"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java index dafef86580..029f7e9c85 100644 --- a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java @@ -167,14 +167,14 @@ public class BarCodePane extends FurtherBasicBeanPane { double[] columnSize = {p, f}; double[] rowSize = {p, p, p}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}}; - UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("RCodeVersion"), UILabel.LEFT); + UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCode_Version"), UILabel.LEFT); uiLabel.setPreferredSize(typeSetLabel.getPreferredSize()); RCodeVersionComboBox.setPreferredSize(new Dimension(155,20)); RCodeErrorCorrectComboBox.setPreferredSize(new Dimension(155,20)); RCodesizespinner.setPreferredSize(new Dimension(155,20)); Component[][] components_special = new Component[][]{ new Component[]{uiLabel, RCodeVersionComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("RCodeErrorCorrect"), UILabel.LEFT), RCodeErrorCorrectComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCode_Error_Correct"), UILabel.LEFT), RCodeErrorCorrectComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCodeDrawPix"), UILabel.LEFT), RCodesizespinner} }; @@ -230,7 +230,7 @@ public class BarCodePane extends FurtherBasicBeanPane { } private void initErrorCorrectComboBox() { - String[] array = {"L" + com.fr.design.i18n.Toolkit.i18nText("Level") + "7%", "M" + com.fr.design.i18n.Toolkit.i18nText("Level") + "15%", "Q" + com.fr.design.i18n.Toolkit.i18nText("Level") + "25%", "H" + com.fr.design.i18n.Toolkit.i18nText("Level") + "30%"}; + String[] array = {"L" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "7%", "M" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "15%", "Q" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "25%", "H" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "30%"}; initcombobox(this.RCodeErrorCorrectComboBox, array, 1); } diff --git a/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java b/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java index a44d997562..e0c27d8341 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java +++ b/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java @@ -9,7 +9,7 @@ import com.fr.stable.ColumnRow; public class ColumnRowTableModel extends AbstractTableModel { - private String[] columnNames = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), com.fr.design.i18n.Toolkit.i18nText("Row") }; + private String[] columnNames = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") }; private java.util.List columnRowList = new ArrayList(); public ColumnRowTableModel() { diff --git a/designer-realize/src/main/java/com/fr/design/present/PresentPane.java b/designer-realize/src/main/java/com/fr/design/present/PresentPane.java index 3c4ee0845e..fa7683bb02 100644 --- a/designer-realize/src/main/java/com/fr/design/present/PresentPane.java +++ b/designer-realize/src/main/java/com/fr/design/present/PresentPane.java @@ -33,7 +33,7 @@ public class PresentPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } public void setSelectedByName(String radioName) { diff --git a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java index 9b1e840369..f829616c7a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java @@ -32,7 +32,7 @@ public class ExcelExportPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Excel" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export")); + JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Excel" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export")); JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); this.add(outnorthPane); outnorthPane.add(northPane); diff --git a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java index 87f3d3fcf9..7fa71fe950 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java @@ -27,7 +27,7 @@ public class PDFExportPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("PDF" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export")); + JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("PDF" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export")); JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); this.add(outnorthPane); outnorthPane.add(northPane); diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 89b8e84c4c..db9234925e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -85,7 +85,7 @@ public class PageSetupPane extends BasicPane { pagePane = new PagePane(); otherPane = new OtherPane(); centerTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), pagePane); - centerTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Other"), otherPane); + centerTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"), otherPane); } @Override @@ -165,14 +165,14 @@ public class PageSetupPane extends BasicPane { twoPane.add(orientationPane); JPanel portraitpanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - portraitRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Portrait")); + portraitRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Portrait")); portraitRadioButton.setMnemonic('t'); portraitpanel.add(portraitRadioButton); innerorientationPane.add(portraitpanel); portraitRadioButton.addActionListener(previewListener); JPanel landscapepanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - landscapeRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Landscape")); + landscapeRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Landscape")); innerorientationPane.add(landscapepanel); landscapeRadioButton.setMnemonic('L'); landscapepanel.add(landscapeRadioButton); @@ -184,7 +184,7 @@ public class PageSetupPane extends BasicPane { portraitRadioButton.setSelected(true); - JPanel spp = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preview")); + JPanel spp = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")); showPagePane = new ShowPagePane(); spp.add(showPagePane); defaultPane.add(spp); @@ -293,13 +293,13 @@ public class PageSetupPane extends BasicPane { // peter:这个一个垂直的上下的字符panel. JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginRightPane.add(marginRightTextPane); - marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Left") + ":")); + marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left") + ":")); marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightTextPane.add(marginLeftUnitFieldPane); JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginRightPane.add(marginRightUnitPane); - marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Right") + ":")); + marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":")); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitPane.add(marginRightUnitFieldPane); @@ -311,7 +311,7 @@ public class PageSetupPane extends BasicPane { marginPane.add(zeroMarginWarn); // header and footer - JPanel outhfHeightPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Height")); + JPanel outhfHeightPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Height")); JPanel hfHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); defaultPane.add(outhfHeightPane); outhfHeightPane.add(hfHeightPane); @@ -649,13 +649,13 @@ public class PageSetupPane extends BasicPane { sbuf.append('x'); sbuf.append(Utils.convertNumberStringToString(new Float(paperSize.getHeight().toINCHValue4Scale3()))); sbuf.append(' '); - sbuf.append(com.fr.design.i18n.Toolkit.i18nText("PageSetup-inches")); + sbuf.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup-inches")); } else { sbuf.append(Utils.convertNumberStringToString(new Float(paperSize.getWidth().toMMValue4Scale2()))); sbuf.append('x'); sbuf.append(Utils.convertNumberStringToString(new Float(paperSize.getHeight().toMMValue4Scale2()))); sbuf.append(' '); - sbuf.append(com.fr.design.i18n.Toolkit.i18nText("PageSetup-mm")); + sbuf.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_mm")); } sbuf.append(']'); } @@ -933,7 +933,7 @@ public class PageSetupPane extends BasicPane { JPanel autoShrinkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); autoShrinkPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Shrink_To_Fit_Content"))); - isShrinkToFit4None = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("No")); + isShrinkToFit4None = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_No")); isShrinkToFit4Height = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height")); isShrinkToFit4Width = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width")); diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java index d470e858b1..fff627e04a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java @@ -95,11 +95,11 @@ public class ReportColumnsPane extends BasicPane{ }; onOffButtonGroup.addActionListener(onOffListener); - UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ReportColumns-Columns")); + UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportColumns_Columns")); FRFont uiLableFont = FRFont.getInstance(FONT_NAME, Font.PLAIN, FONT_SIZE); uiLabel.setFont(uiLableFont); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - int uiLabelWidth = GraphHelper.getLocTextWidth("FR-Designer_ReportColumns-Columns", uiLableFont); + int uiLabelWidth = GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportColumns_Columns"), uiLableFont); uiLabel.setPreferredSize(new Dimension(uiLabelWidth, 20)); north.add(uiLabel,BorderLayout.WEST); diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java index 00d28b7c97..f2c180abd5 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java @@ -41,7 +41,7 @@ public class ReportExportAttrPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"); } public void populate(ReportExportAttr reportExportAttr) { diff --git a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java index ce11a13c4e..77a662d6d1 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java @@ -63,7 +63,7 @@ public class SelectImagePane extends BasicPane { JPanel previewOwnerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); - previewOwnerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null)); + previewOwnerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null)); previewPane = new ImagePreviewPane(); previewOwnerPane.add(new JScrollPane(previewPane)); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index cb2077f8f0..0254f5e85c 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -1,15 +1,7 @@ package com.fr.design.report; -import java.awt.BorderLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; - -import javax.swing.BorderFactory; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - import com.fr.base.core.KV; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.ReportletParameterViewPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icheckbox.UICheckBox; @@ -17,11 +9,10 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.FILEFactory; - import com.fr.main.TemplateWorkBook; import com.fr.main.impl.LinkWorkBookTemplate; import com.fr.report.cell.CellElement; @@ -29,7 +20,14 @@ import com.fr.report.cell.cellattr.core.SubReport; import com.fr.report.elementcase.ElementCase; import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.BorderFactory; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; public class SubReportPane extends BasicPane { private UITextField pathTextField; @@ -46,7 +44,7 @@ public class SubReportPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); - 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); pathTextField.setEditable(false); UIButton browseButton = new UIButton("..."); diff --git a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java index 8913edbbd1..df808c1bcb 100644 --- a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java @@ -24,7 +24,7 @@ public class WordExportPane extends BasicPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export")); + JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export")); this.add(outnorthPane); JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); diff --git a/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java b/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java index 94167884da..d9b9741d63 100644 --- a/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/WriteShortCutsPane.java @@ -73,7 +73,7 @@ public class WriteShortCutsPane extends JPanel{ JPanel panel2 =FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); panel2.setBounds(20, 170, 600, 150); panel2.setLayout(null); - panel2.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"))); + panel2.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"))); UILabel systemDefault = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_System_Default"), SwingConstants.CENTER); systemDefault.setBounds(38, 30, 84, 50); UILabel preColText = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cursor_To_Previous_Column"), SwingConstants.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java index 13fee93848..2e9a17c4dc 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FormECRepeatAndFreezeSettingPane.java @@ -21,7 +21,7 @@ public class FormECRepeatAndFreezeSettingPane extends RepeatAndFreezeSettingPane * */ protected String getPageFrozenTitle(){ - return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Frozen") + ":"; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Frozen") + ":"; } protected void initWriteListener(){ diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java index 3ad31a8f09..edfacb396e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java @@ -13,7 +13,7 @@ public class FreezePagePane extends FreezeAndRepeatPane { public FreezePagePane(boolean isNumber) { this.isNumber = isNumber; start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER); - end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER); + end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER); super.initComponent(); } @@ -25,7 +25,7 @@ public class FreezePagePane extends FreezeAndRepeatPane { @Override public void populateBean(FT ob) { if (isNumber) { - ((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Row")); + ((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row")); } else { ((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java index cf999c8d24..729887e263 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java @@ -12,7 +12,7 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane { start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1); super.initComponent(); - 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"))); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index f3551e31f6..349735ac0b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -204,7 +204,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel outrepeatPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Repeat")); JPanel cenrepeatPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); outrepeatPanel.add(cenrepeatPanel); - JPanel outfreezePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Frozen")); + JPanel outfreezePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Frozen")); this.add(outrepeatPanel, BorderLayout.NORTH); this.add(outfreezePanel, BorderLayout.CENTER); JPanel repeatPanel = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); diff --git a/designer-realize/src/main/java/com/fr/design/report/share/ConfusionManagerPane.java b/designer-realize/src/main/java/com/fr/design/report/share/ConfusionManagerPane.java index 6546465f2c..aa0a4e4ca8 100644 --- a/designer-realize/src/main/java/com/fr/design/report/share/ConfusionManagerPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/share/ConfusionManagerPane.java @@ -77,7 +77,11 @@ public class ConfusionManagerPane extends JListControlPane { @Override protected ShortCut4JControlPane[] createShortcuts() { - return new ShortCut4JControlPane[] { moveUpItemShortCut(), moveDownItemShortCut(), sortItemShortCut() }; + return new ShortCut4JControlPane[] { + shortCutFactory.moveUpItemShortCut(), + shortCutFactory.moveDownItemShortCut(), + shortCutFactory.sortItemShortCut() + }; } } diff --git a/designer-realize/src/main/java/com/fr/design/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/style/StylePane.java index f0b670e4e2..e4cf4f4d82 100644 --- a/designer-realize/src/main/java/com/fr/design/style/StylePane.java +++ b/designer-realize/src/main/java/com/fr/design/style/StylePane.java @@ -69,7 +69,7 @@ public class StylePane extends BasicBeanPane