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 0398d8fe75..973e301c95 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -511,7 +511,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { return env; } } - String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default"); + String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default"); LocalDesignerWorkspaceInfo newDefaultEnv = LocalDesignerWorkspaceInfo.create(name, defaultenvPath); this.putEnv(name, newDefaultEnv); return newDefaultEnv; @@ -534,7 +534,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } } } - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default"); } @@ -1891,4 +1891,4 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { .end(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java index 4d2b1d40a2..9d81481f78 100644 --- a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java @@ -18,7 +18,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction { public ExitAuthorityEditAction(TargetComponent t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png")); } @@ -60,4 +60,4 @@ public class ExitAuthorityEditAction extends TemplateComponentAction { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 37405bb55a..5617c51099 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 @@ -154,7 +154,7 @@ public class PreferencePane extends BasicPane { createJdkHomePane(advancePane); JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables")); - oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Show_All_Oracle_Tables")); + oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables")); oraclePane.add(oracleSpace); JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Product_improve")); @@ -198,11 +198,11 @@ public class PreferencePane extends BasicPane { private void createEditPane(JPanel generalPane) { //samuel:编辑器设置 - JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference")); + JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference")); generalPane.add(editPane); //设置是否支持将字符串编辑为公式 - supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Support_String_To_Formula")); + supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Support_String_To_Formula")); editPane.add(supportStringToFormulaBox); //是否默认转化 @@ -667,4 +667,4 @@ public class PreferencePane extends BasicPane { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 03ce167cc3..cbb21faa0c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -95,7 +95,7 @@ public class SwitchExistEnv extends MenuDef { workspace = DesignerWorkspaceGenerator.generate(selectedEnv); boolean checkValid = workspace == null ? false : selectedEnv.checkValid(); if (!checkValid) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return; } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 0981ea6805..af62e25fca 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -1,13 +1,10 @@ package com.fr.design.actions.help; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; +import com.fr.design.gui.frpane.UITabbedPane; +import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.stable.ProductConstants; import javax.swing.AbstractAction; import javax.swing.ActionMap; @@ -16,13 +13,14 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.KeyStroke; - -import com.fr.design.gui.frpane.UITabbedPane; -import com.fr.design.gui.ibutton.UIButton; -import com.fr.design.layout.FRGUIPaneFactory; - -import com.fr.stable.ProductConstants; -import com.fr.design.utils.gui.GUICoreUtils; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; /** * Dialog displaying information about the application. @@ -42,13 +40,13 @@ public class AboutDialog extends JDialog implements ActionListener { JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); okButton.addActionListener(this); tabbedPane = new UITabbedPane(); sysPane = new SystemInfoPane(); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane); buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); @@ -97,4 +95,4 @@ public class AboutDialog extends JDialog implements ActionListener { private JPanel buttonPanel; private UITabbedPane tabbedPane; private UIButton okButton; -} \ No newline at end of file +} 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 3017899768..a72b35e31e 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 @@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane { 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 UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; @@ -96,7 +96,7 @@ public class FeedBackPane extends BasicPane { public FeedBackPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); initDetailArea(); - UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info")); + UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Info")); tip.setBorder(TIP_BORDER); this.add(tip, BorderLayout.NORTH); UIScrollPane scrollPane = new UIScrollPane(initDetailPane()); @@ -135,7 +135,7 @@ public class FeedBackPane extends BasicPane { } }; this.detailField.setForeground(Color.gray); - this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip")); + this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip")); detailField.addKeyListener(new KeyAdapter() { @Override @@ -156,7 +156,7 @@ public class FeedBackPane extends BasicPane { detailField.setForeground(Color.black); String text = detailField.getText(); // 判断在中文输入状态是否还包含提示符 要删掉 - String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip"); + String tip = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip"); if (text.contains(tip)) { text = text.substring(0, text.indexOf(tip)); detailField.setText(text); @@ -348,4 +348,4 @@ public class FeedBackPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index dfc6ccf13c..22bdc0a737 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java @@ -219,7 +219,7 @@ public interface UIConstants { @Override public String toString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."; } }; /** @@ -228,7 +228,7 @@ public interface UIConstants { public static final Object CONNECTION_FAILED = new Object() { public String toString() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!"; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed") + "!"; } }; @@ -236,4 +236,4 @@ public interface UIConstants { * 自动补全的默认快捷键，一般来说是 alt + /. */ public static final String DEFAULT_AUTO_COMPLETE = "alt + SLASH"; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java index cf671e526a..0bd400eb2a 100644 --- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java @@ -121,14 +121,14 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp dg.setButtonEnabled(true); String tempName = nPanel.getObjectName(); if (StringUtils.isBlank(tempName)) { - nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips")); dg.setButtonEnabled(false); } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) { - nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName)); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName)); dg.setButtonEnabled(false); } else if (isProcedureName(oldName)) { if (isIncludeUnderline(tempName)) { - nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); + nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips")); dg.setButtonEnabled(false); } } else { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index 0932e1569f..7f51d8f16d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -455,7 +455,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha } if (!connect) { DesignerFrame designerFrame = DesignerContext.getDesignerFrame(); - JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), + JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE); failedToFindTable(); return null; @@ -631,4 +631,4 @@ public class ChoosePane extends BasicBeanPane implements Refresha } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 158a11b8c4..0b298fdc93 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -34,22 +34,22 @@ public class TableDataCreatorProducer { TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"), "ds", "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class); - TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), + TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class); - TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), + TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), "Embedded", "/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class); - TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), + TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), "Multi", "/com/fr/design/images/data/multi.png", ConditionTableData.class, MultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), + TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), "File", "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallHeightPane.class); - TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), + TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), "Tree", "/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { @@ -69,28 +69,28 @@ public class TableDataCreatorProducer { } public TableDataNameObjectCreator[] createServerTableDataCreator() { - TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, + TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class, DBTableDataPane.class); - TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, + TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class, ClassTableDataPane.class); - TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class, + TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class); - TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class, + TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallPane.class); - TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png", + TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png", RecursionTableData.class, GlobalTreeTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png", + TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png", ConditionTableData.class, GlobalMultiTDTableDataPane.class) { public boolean isNeedParameterWhenPopulateJControlPane() { return true; } }; - TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png", + TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class) { public boolean shouldInsertSeparator() { return true; @@ -126,4 +126,4 @@ public class TableDataCreatorProducer { } return (TableDataNameObjectCreator[])ArrayUtils.addAll(creators, list.toArray(new TableDataNameObjectCreator[list.size()])); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java index d5e52586d1..59880cc4ef 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java @@ -49,7 +49,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData if (StringUtils.isEmpty(tempName)) { isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips")); setIllegalIndex(editingIndex); return; } @@ -58,12 +58,12 @@ public class TableDataPaneListPane extends JListControlPane implements TableData && isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName)); setIllegalIndex(editingIndex); } else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) { isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips")); setIllegalIndex(editingIndex); } if (nameableList.getSelectedValue() instanceof ListModelElement) { @@ -247,7 +247,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData NameObject nameObject = (NameObject) tableDataArray[i]; if (exsitTableDataNameList.contains(nameObject.getName())) { - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", nameObject.getName())); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", nameObject.getName())); } exsitTableDataNameList.add(nameObject.getName()); @@ -275,4 +275,4 @@ public class TableDataPaneListPane extends JListControlPane implements TableData public JPanel getPanel() { return this; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 71866d7c7d..3d5c4d01ac 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { protected void initbuttonGroup() { // Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")}; final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA}; - String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")}; + String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")}; buttonGroup = new UIHeadGroup(textArray) { public void tabChanged(int index) { if (op != null) { @@ -324,4 +324,4 @@ public class TableDataTreePane extends BasicTableDataTreePane { dataTree.refresh(); return Collections.unmodifiableMap(tdNameMap); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java index d9ec8f5f58..32f89ac25d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TreeTableDataDictPane.java @@ -53,7 +53,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { public TreeTableDataDictPane(String treeName) { this.setLayout(new BorderLayout(5, 30)); this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0)); - selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_TableData_Select_One") + " :"); + selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") + " :"); setTableDataNameComboBox(treeName); tableDataNameComboBox.setPreferredSize(new Dimension(180, 20)); JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); @@ -306,4 +306,4 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable { treeDataFieldLabel2.setEnabled(true); originFieldDependsOnLengthPane.setEnabled(true); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java index 69dd0bc327..ae577234dd 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java @@ -40,7 +40,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER)); UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT); UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT); - UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT); + UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT); if (labelSize > 0) { Dimension pSize = new Dimension(labelSize, 20); @@ -66,4 +66,4 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean { initDsNameComboBox(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index d0ec909518..484a9c1161 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -43,7 +43,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name")); setIllegalIndex(editingIndex); isNamePermitted = false; return; @@ -52,7 +52,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); + String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); setIllegalIndex(editingIndex); } @@ -158,4 +158,4 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh connectionConfig.addConnection(nameObject.getName(), (Connection) nameObject.getObject()); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index cf0e93d2a5..e867febd53 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane { private UITextField classNameTextField; @@ -93,7 +92,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, - {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} + {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.add(northPane, BorderLayout.NORTH); @@ -174,4 +173,4 @@ public class ClassTableDataPane extends AbstractTableDataPane { } -} \ No newline at end of file +} 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 90abadde5d..de0d6974c1 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 @@ -93,7 +93,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Embedded_Column_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Column_Setting"); } public void checkValid() throws Exception { @@ -318,4 +318,4 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ embeddedTableData.clear(); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java index 22c38f0a6d..a1be0efc2f 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java @@ -107,7 +107,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane { FRContext.getLogger().error(e.getMessage(), e); } if (in == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } else { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); @@ -759,7 +759,7 @@ public class FileTableDataPane extends AbstractTableDataPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"); } private void preview() { @@ -1012,4 +1012,4 @@ public class FileTableDataPane extends AbstractTableDataPane { } } -} \ No newline at end of file +} 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 ad688e5900..42cdbda84b 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 @@ -66,7 +66,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane extends UITableModelAdapter { @@ -64,7 +63,7 @@ public abstract class OneListTableModel extends UITableModelAdapter { @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); + FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); if(file == null) { @@ -90,7 +89,7 @@ public abstract class OneListTableModel extends UITableModelAdapter { @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); + FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); if(file == null) { @@ -108,4 +107,4 @@ public abstract class OneListTableModel extends UITableModelAdapter { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java index 7c00fa0f43..ad9095f920 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java @@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp warningLabel.setText(StringUtils.EMPTY); } catch (Exception ex) { if (ex instanceof SQLException) { - warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } else { warningLabel.setText(ex.getMessage()); } @@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane imp storeProcedureContext.setText(procedureText); warningLabel.setText(""); } catch (Exception e) { - warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); storeProcedureContext.setText(""); editorPane.populate(new StoreProcedureParameter[0]); } @@ -369,4 +369,4 @@ public class ProcedureDataPane extends AbstractTableDataPane imp public void checkEnabled() { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TreeTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TreeTableDataPane.java index 7da5c680f2..0970f2fdd1 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TreeTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/TreeTableDataPane.java @@ -39,7 +39,7 @@ public class TreeTableDataPane extends AbstractTableDataPane @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index c3ad8fa4e4..6a17b18ac2 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java @@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { connectionBar.close(); // bug 61345 预览失败时，关闭窗口 dialog.setVisible(false); - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } connectionBar.close(); storeProcedure.resetDataModelList(); @@ -306,4 +306,4 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper { } -} \ No newline at end of file +} 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 40eff17079..2fc2f53e06 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 @@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{ private JPanel createControlButtonPane() { controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - okButton = new UIButton("" + com.fr.design.i18n.Toolkit.i18nText("OK") + "") { + okButton = new UIButton("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK") + "") { @Override public Dimension getPreferredSize() { // TODO Auto-generated method stub diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index dad7a8731a..c704705885 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog { } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); okButton.setName(OK_BUTTON); okButton.setMnemonic('O'); buttonsPane.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java index 9bfb26987d..ade55ae8bf 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor { protected String[] columnNames; public ColumnSelectedEditor() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column")); this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); columnNames = new String[0]; @@ -107,4 +107,4 @@ public class ColumnSelectedEditor extends Editor { tableDataComboBox.setSelectedItem(null); columnNameComboBox.setSelectedItem(null); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java index 6d828ccafd..eff4291e44 100644 --- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java +++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java @@ -16,7 +16,6 @@ import com.fr.design.module.DesignModuleFactory; import com.fr.design.utils.gui.GUIPaintUtils; import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; -import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.log.FineLoggerFactory; @@ -122,7 +121,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C try { historyList.remove(contains(selected)); selected.getEditingFILE().closeTemplate(); - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Closed_Warn_Text", selected.getEditingFILE().getName())); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Closed_Warn_Text", selected.getEditingFILE().getName())); MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); @@ -441,4 +440,4 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C return isNameAreadyExist; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java index 0190e60784..4e991c05c3 100644 --- a/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java @@ -738,7 +738,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } } HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate); diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java index fae11eed75..a3c54113a0 100644 --- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java @@ -1 +1 @@ -package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file +package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Utils-Would_you_like_to_save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 74798a7757..a6818827c5 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -156,7 +156,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { @Override public void refresh() { reportletsTree.refresh(); - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Tree_Refresh_Successfully") + "!"); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Tree_Refresh_Successfully") + "!"); } /** @@ -175,7 +175,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false)); if (nodeFile.isLocked()) { - if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"), + if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"), com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) { refreshDockingView(); } @@ -286,4 +286,4 @@ public class TemplateTreePane extends JPanel implements FileOperations { } } } -} \ No newline at end of file +} 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 72ff977766..9c4a7f3909 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 @@ -933,7 +933,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"), variableResolver.resolveCurReportVariables()).createMutableTreeNode()); - rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"), + rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"), BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"), variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode()); @@ -1026,4 +1026,4 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { } FRContext.getLogger().debug(buffer.toString()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java index 4d0da51eb4..60b4cf5dfb 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java @@ -129,7 +129,7 @@ public abstract class FunctionConstants { new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT), new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER), - new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA) + new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA) }; public static FunctionGroup ALL = new FunctionGroup() { @@ -261,4 +261,4 @@ public abstract class FunctionConstants { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java index cf8071cbaf..4bfd27189f 100644 --- a/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java @@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane { this.add(jt, BorderLayout.CENTER); UILabel label = new UILabel(); label.setText("" + - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") + + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Save_Attention") + ""); label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20)); this.add(label, BorderLayout.SOUTH); @@ -157,11 +157,11 @@ public class JavaEditorPane extends BasicPane { } try { WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8)); - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！"); fireSaveActionListener(); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "！"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！"); } } @@ -282,4 +282,4 @@ public class JavaEditorPane extends BasicPane { " }\n" + "}\n"; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/NameInspector.java b/designer-base/src/main/java/com/fr/design/gui/NameInspector.java index fa9b90278c..c1d2f6ee71 100644 --- a/designer-base/src/main/java/com/fr/design/gui/NameInspector.java +++ b/designer-base/src/main/java/com/fr/design/gui/NameInspector.java @@ -4,5 +4,5 @@ import com.fr.design.i18n.Toolkit; public class NameInspector { - public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips"); + public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Basic_Illegal_Name_Tips"); } diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index febdaa0b86..ec165b5a6a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -126,7 +126,7 @@ public abstract class WidgetOption implements Serializable { NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR}; } - public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Date"), + public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"), DateEditor.class); @@ -137,62 +137,62 @@ public abstract class WidgetOption implements Serializable { TreeComboBoxEditor.class); public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class); public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"), RadioGroup.class); public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class); public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"), Label.class); public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"), Button.class); public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"), FreeButton.class); public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"), MultiFileEditor.class); public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"), ComboBox.class); public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"), ComboCheckBox.class); public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"), CheckBox.class); public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"), ListEditor.class); public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Text") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text") , BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"), TextEditor.class); public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"), TextArea.class); public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Password"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class); public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), IframeEditor.class); -} \ No newline at end of file +} 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 00d31d3dd8..9a8f1c0116 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 @@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel { gap.setPreferredSize(new Dimension(26,1)); sPane.add(gap); - UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) { + UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) { public Dimension getPreferredSize() { return new Dimension(32,18); } 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 627d3ac24f..225d5bcdf7 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 @@ -46,7 +46,7 @@ public class ImgChoosePane extends BasicPane { if (image == null) { imgSizeLabel.setText(""); } else { - imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", + imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null))); } } @@ -117,4 +117,4 @@ public class ImgChoosePane extends BasicPane { protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Image"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 6182e36ec6..49402b9504 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { @@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java index 0633c14062..a7776e26be 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPane.java @@ -55,7 +55,7 @@ public abstract class LoadingBasicPane extends BasicPane { card = new CardLayout(); setLayout(card); JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER); + UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER); loadingDisPane.add(loadingPane, BorderLayout.CENTER); progressBar = new JProgressBar(); progressBar.setIndeterminate(true); @@ -94,4 +94,4 @@ public abstract class LoadingBasicPane extends BasicPane { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index df5430ee32..69af3a7299 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 @@ -17,7 +17,7 @@ public class DictionaryConstants { "^\\d{6}$" }; public final static String[] regexpsDisplays = new String[] { - com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), com.fr.design.i18n.Toolkit.i18nText("Required"), com.fr.design.i18n.Toolkit.i18nText("Length"), com.fr.design.i18n.Toolkit.i18nText("Float"), @@ -55,7 +55,7 @@ public class DictionaryConstants { }; public static final String[] symbolDisplays = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"), com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes") }; diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java index 8ef44bf573..be83cf5b1a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBox.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException; public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener { private static final int NUM = 80; - private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."}; + private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."}; /** * 是否加载完成 @@ -189,4 +189,4 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen filtering = false; } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java index 4b04e63d41..74cd42a7ef 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java @@ -10,7 +10,6 @@ import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.geom.GeneralPath; -import java.awt.geom.Line2D; import java.awt.geom.Point2D; import javax.swing.DefaultComboBoxModel; @@ -20,8 +19,6 @@ import javax.swing.JList; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; -import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.general.FRFont; import com.fr.stable.Constants; @@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox { FontMetrics fm = GraphHelper.getFontMetrics(rfont); if (style == Constants.LINE_NONE) { //draw "none" string - GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); + GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); } else { GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style); } diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java index 93505d2049..0fd211adfe 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java @@ -99,7 +99,7 @@ public class TableViewList extends UIList { count--; } if (!status) { - throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter)); return null; @@ -278,4 +278,4 @@ public class TableViewList extends UIList { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java index 6b2f50c7c5..3fe7471c34 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenu/UIScrollMenuDemo.java @@ -16,7 +16,7 @@ public class UIScrollMenuDemo extends JFrame { UIMenuBar menuBar = new UIMenuBar(); // File Menu, F - Mnemonic - JMenu fileMenu = new JMenu("File"); + JMenu fileMenu = new JMenu("Fine-Design_Basic_File"); fileMenu.setMnemonic(KeyEvent.VK_F); menuBar.add(fileMenu); @@ -68,4 +68,4 @@ public class UIScrollMenuDemo extends JFrame { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java index a6ba742830..56dfbbdae2 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("OK"); + b = new JButton("Fine-Design_Report_OK"); getRootPane().setDefaultButton(b); b.addActionListener(new OKAction()); p3.add(b); 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 113342a023..c101f1207d 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 @@ -235,7 +235,7 @@ public abstract class UITableModelAdapter extends AbstractTabl public void actionPerformed(ActionEvent e) { int[] selectedRow = table.getSelectedRows(); if (ismultiSelected()) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Select_Warn_Text")); return; } if (table.getCellEditor() != null) { @@ -327,4 +327,4 @@ public abstract class UITableModelAdapter extends AbstractTabl } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java index a589491c34..0c894ff924 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java @@ -68,7 +68,7 @@ public class EnvFileTree extends RefreshableJTree { String name = node.getName(); if (treeNode.hasFullAuthority()) { if (lock != null && !node.getUserID().equals(lock)) { - name = name + Toolkit.i18nText("Fine-Design_Template_Status_Locked", "(", ")"); + name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")"); this.setIcon(FileTreeIcon.getIcon(node)); } else { this.setIcon(FileTreeIcon.getIcon(node, false)); @@ -360,4 +360,4 @@ public class EnvFileTree extends RefreshableJTree { return false; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java index ad8da4dd6a..b2008f3867 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java @@ -6,7 +6,6 @@ import com.fr.design.gui.itree.checkboxtree.CheckBoxTree; import com.fr.design.i18n.Toolkit; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; -import com.fr.locale.InterProviderFactory; import com.fr.stable.StringUtils; import javax.swing.Icon; @@ -37,7 +36,7 @@ public abstract class RefreshableJTree extends CheckBoxTree { @Override public String toString() { - return Toolkit.i18nText("Fine-Design_Loading") + "..."; + return Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."; } }; @@ -301,4 +300,4 @@ public abstract class RefreshableJTree extends CheckBoxTree { tip.setOpaque(false); return tip; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java index 1ebef3d858..3e9d65c357 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 @@ -151,7 +151,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Custom"); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } } \ No newline at end of file +package com.fr.design.javascript; import com.fr.data.ClassSubmitJob; import com.fr.design.write.submit.CustomSubmitJobPane; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.js.CustomActionJavaScript; import java.awt.*; /** * Author : Shockway * Date: 13-8-12 * Time: 下午7:47 */ public class CustomActionPane extends FurtherBasicBeanPane { CustomSubmitJobPane classPane = new CustomSubmitJobPane(); public CustomActionPane() { this.setLayout(new BorderLayout()); this.add(classPane, BorderLayout.CENTER); } /** * 判断界面是否为js 传入 * @param ob 对象是否为js * @return 是否是js对象 */ @Override public boolean accept(Object ob) { return ob instanceof CustomActionJavaScript; } /** * 标题 * @return 标题 */ @Override public String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Type_Custom"); } /** * 重置 */ @Override public void reset() { this.classPane.reset(); } @Override public void populateBean(CustomActionJavaScript ob) { classPane.populateBean(ob.getJob()); } @Override public CustomActionJavaScript updateBean() { CustomActionJavaScript cs = new CustomActionJavaScript(); cs.setJob((ClassSubmitJob)classPane.updateBean()); return cs; } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index 2c56fb7fe0..89d7d8cf72 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -62,7 +62,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } if (tempSet.contains(list.get(i).toString())) { list.remove(i); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!"); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!"); parameterChanger(list); return; } @@ -228,4 +228,4 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { public boolean accept(Object ob) { return ob instanceof JavaScriptImpl; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java index 7fa703b8a5..6d515cec4f 100644 --- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java +++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java @@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame UITextField textfieldState = new UITextField(2); UITextField textfieldZip = new UITextField(5); - UIButton buttonOk = new UIButton("OK"); + UIButton buttonOk = new UIButton("Fine-Design_Report_OK"); UIButton buttonCancel = new UIButton("Cancel"); JPanel panelButton = new JPanel(); panelButton.add(buttonOk); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java index d596291426..675b04953d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityPropertyPane.java @@ -22,7 +22,7 @@ public class AuthorityPropertyPane extends JPanel { public AuthorityPropertyPane(TargetComponent t) { this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -46,4 +46,4 @@ public class AuthorityPropertyPane extends JPanel { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index 81e1ccfe8a..4c7205a34c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -40,7 +40,6 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.file.FILE; import com.fr.file.FILEFactory; import com.fr.file.FileFILE; -import com.fr.file.FileNodeFILE; import com.fr.general.ComparatorUtils; import com.fr.general.GeneralContext; @@ -53,7 +52,6 @@ import com.fr.plugin.observer.PluginEventListener; import com.fr.stable.CoreConstants; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; -import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.image4j.codec.ico.ICODecoder; import com.fr.stable.project.ProjectConstants; @@ -846,13 +844,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) { editingTemplate.saveTemplate(); - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", editingTemplate.getEditingFILE().getName())); } } else { if (editingTemplate.saveTemplate()) { editingTemplate.saveTemplate(); - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", editingTemplate.getEditingFILE().getName())); } } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 55ba067c12..a433542d1b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -578,7 +578,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt if (selectedOperation.isNameAlreadyExist(userInput, oldName, suffix)) { jt.selectAll(); // 如果文件名已存在，则灰掉确认按钮 - hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Name_Duplicate", userInput)); + hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Name_Duplicate", userInput)); hintsLabel.setVisible(true); confirmButton.setEnabled(false); } else { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index b9cc68da41..8718abaff9 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -1,6 +1,5 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.Parameter; import com.fr.base.ScreenResolution; @@ -537,7 +536,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } collectInfo(); @@ -587,7 +586,7 @@ public abstract class JTemplate> FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE); return false; } editingFILE = fileChooser.getSelectedFILE(); @@ -883,7 +882,7 @@ public abstract class JTemplate> public boolean isOldDesigner() { String xmlDesignerVersion = getTarget().getXMLDesignerVersion(); if (isHigherThanCurrent(xmlDesignerVersion)) { - String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion)); + String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion)); String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo"); new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show(); return true; 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 14c4d60a00..4b2b6445c1 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 @@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) { + UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -59,4 +59,4 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane { public JPanel populateCheckPane() { return null; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index 47036317f3..a3459ad3de 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -13,14 +13,12 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.utils.DesignUtils; import com.fr.env.EnvListPane; -import com.fr.event.EventDispatcher; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; import com.fr.stable.EnvChangedListener; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; -import com.fr.workspace.WorkspaceEvent; import com.fr.workspace.connect.AuthException; import javax.swing.BorderFactory; @@ -149,7 +147,7 @@ public class TemplatePane extends JPanel implements MouseListener { Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv); boolean checkValid = workspace == null ? false : selectedEnv.checkValid(); if (!checkValid) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java index 6e28656092..d861d80bed 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java @@ -86,11 +86,11 @@ public class DesignerLogHandler { caption.clearMessage(); } }; - showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true); + showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true); showInfo.addItemListener(itemlistener); - showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true); + showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true); showError.addItemListener(itemlistener); - showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true); + showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true); showServer.addItemListener(itemlistener); caption.addSetListener(new ActionListener() { @@ -320,4 +320,4 @@ public class DesignerLogHandler { public void printLoggingEvent(LoggingEvent event) { logHandlerArea.printStackTrace(event); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java index fac44a5bc8..9e3adf672c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java @@ -24,7 +24,7 @@ public class DataTableEditor extends Editor { public DataTableEditor() { this.initCompontents(); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FieldBinding")); } private void initCompontents() { @@ -81,4 +81,4 @@ public class DataTableEditor extends Editor { return "bind_ds_column"; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index f7ba64bfc4..30307a4b2d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: 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 815495bd23..952a0e07e2 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("Gradient-Color"); } else { - return com.fr.design.i18n.Toolkit.i18nText("None"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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 0a73895375..32436be621 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 @@ -4,13 +4,9 @@ package com.fr.design.menu; -import com.fr.general.ComparatorUtils; -import com.fr.general.GeneralContext; - import javax.swing.*; import java.awt.event.KeyEvent; -import java.util.Locale; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -661,7 +657,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Attribute"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Attribute"); } @Override @@ -678,7 +674,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status"); } @Override @@ -883,7 +879,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"); } @Override @@ -994,7 +990,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float"); } @Override @@ -1041,4 +1037,4 @@ public class KeySetUtils { -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java index 76c5265fbe..39a89bac6a 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 @@ -36,7 +36,7 @@ public class ParameterArrayPane extends JListControlPane { String tempName = getEditingName(); if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name")); setIllegalIndex(editingIndex); return; } @@ -44,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane { && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) { nameableList.stopEditing(); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name")); setIllegalIndex(editingIndex); } } @@ -92,4 +92,4 @@ public class ParameterArrayPane extends JListControlPane { return res_array; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index ecbfe9011d..08f377b79f 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -142,7 +142,7 @@ public class UserManagerPane extends BasicPane { sync2AddedMembersFormAdded(); // 不需要重复更新右侧列表显示 但是更新一下计数显示 countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) ) ); @@ -211,7 +211,7 @@ public class UserManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member"); + return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Add_Member"); } private JPanel createLeftPanel() { @@ -221,7 +221,7 @@ public class UserManagerPane extends BasicPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), UITitledBorder.createBorderWithTitle( - Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member") + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member") ) ) ); @@ -233,7 +233,7 @@ public class UserManagerPane extends BasicPane { keyField.requestFocus(); keyField.addKeyListener(keyFieldKeyListener); keyField.getDocument().addDocumentListener(documentListener); - keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search")); + keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search")); keyButton.addActionListener(keyButtonActionListener); searchPanel.add(keyField); searchPanel.add(keyButton); @@ -279,14 +279,14 @@ public class UserManagerPane extends BasicPane { content.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member") + UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member") ) ) ); // 计数 countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size())) ); countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0)); @@ -332,7 +332,7 @@ public class UserManagerPane extends BasicPane { addedList.revalidate(); addedList.repaint(); countLabel.setText( - Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) )); } 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 ef96135a0a..515473c778 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 @@ -158,12 +158,12 @@ public class AlignmentPane extends BasicPane { leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); leftIndentSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(leftIndentSpinner, 3); - indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Left"), leftIndentSpinner)); + indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Left"), leftIndentSpinner)); rightIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1))); rightIndentSpinner.addChangeListener(changeListener); GUICoreUtils.setColumnForSpinner(rightIndentSpinner, 3); - indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Right") , rightIndentSpinner)); + indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Right") , rightIndentSpinner)); return indentPane; } @@ -383,4 +383,4 @@ public class AlignmentPane extends BasicPane { public static class Alignment { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java index 143a937f66..4560f84dfd 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java @@ -50,7 +50,7 @@ public class AlphaPane extends JPanel { alphaPane.setBorder(BorderFactory.createEmptyBorder()); this.add(alphaPane, BorderLayout.CENTER); - alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":")); + alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha") + ":")); alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE)); alphaSlider.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 3138de5e0a..8be6e4cf9a 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 @@ -106,9 +106,9 @@ public class BorderPane extends BasicPane { borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No"))); // Button setting all borders to active with // current color and current style excepting inside borders - borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); + borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"))); - borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); + borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"))); // Control JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); @@ -728,4 +728,4 @@ public class BorderPane extends BasicPane { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java index 53a7d65b29..2fa5acf578 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java @@ -32,13 +32,13 @@ public class FontSizeStylePane extends JPanel { this.add(fontVSizPane); // fontVSizPane.setLayout(new BoxLayout(fontVSizPane, BoxLayout.X_AXIS)); - fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null)); + fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"), null)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; styleField = new UITextField(); styleField.setEditable(false); @@ -103,4 +103,4 @@ public class FontSizeStylePane extends JPanel { sizeList.setSelectedValue(new Integer(frFont.getSize()), true); sizeField.setValue(frFont.getSize2D()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java index e6c45fa63f..00fd0eec5a 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java @@ -61,7 +61,7 @@ public class BackgroundUIComboBoxPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); labelPane.add(northPane, BorderLayout.NORTH); - northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting") + ":")); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting") + ":")); northPane.add(selectBox); cardLayout = new CardLayout(); @@ -161,6 +161,6 @@ public class BackgroundUIComboBoxPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java index fb8501e19b..4569487712 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientBackgroundPane.java @@ -34,7 +34,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane { public GradientBackgroundPane() { // bug 5452 简化GradientPane - JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color")); + JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color")); jpanel.setPreferredSize(new Dimension(450, 320)); jpanel.setLayout(new BorderLayout()); @@ -132,4 +132,4 @@ public class GradientBackgroundPane extends BackgroundDetailPane { this.changeListener.stateChanged(evt); } } -} \ No newline at end of file +} 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 0a84a8b645..53c6fa962c 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 @@ -1,19 +1,17 @@ package com.fr.design.style.background.gradient; -import java.awt.BorderLayout; -import java.awt.Dimension; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.background.GradientBackground; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.general.Background; - import com.fr.design.style.AlphaPane; import com.fr.design.style.background.BackgroundPane4BoxChange; +import com.fr.general.Background; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; /** * @author kunsnat E-mail:kunsnat@gmail.com @@ -58,12 +56,12 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { JPanel secondFloorPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); mainPane.add(secondFloorPane); - secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Area") + ":")); + secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Area") + ":")); changeBox = new GradientChangeBoxPane(); secondFloorPane.add(changeBox); - secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Repeat_Show"))); + secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Repeat_Show"))); } public void populate(Background background) { @@ -112,7 +110,7 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java index 8272eb5b98..93cc92b8e9 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientChangeBoxPane.java @@ -1,28 +1,26 @@ package com.fr.design.style.background.gradient; -import java.awt.BorderLayout; -import java.awt.CardLayout; -import java.awt.Rectangle; -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.JPanel; -import javax.swing.JPopupMenu; - import com.fr.base.background.GradientBackground; import com.fr.design.constants.UIConstants; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - import com.fr.stable.Constants; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + /** * @author kunsnat E-mail:kunsnat@gmail.com * @version 创建时间：2011-11-29 上午10:42:43 @@ -30,8 +28,8 @@ import com.fr.stable.Constants; */ public class GradientChangeBoxPane extends BasicPane { private static final long serialVersionUID = -6747468244414651602L; - private static final String CURRENT = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Current_Area"); - private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Custom_Area"); + private static final String CURRENT = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Current_Area"); + private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Custom_Area"); private JPanel cardPane; private CardLayout cardLayout; @@ -124,7 +122,7 @@ public class GradientChangeBoxPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java b/designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java index f965482334..2112446b32 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 @@ -61,7 +61,7 @@ public class GradientFromToPixPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java index a122e42ca2..110a5c42e2 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java @@ -220,7 +220,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane { if (image == null) { imageSizeLabel.setText(""); } else { - imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null))); + imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null))); } } }; 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 56f6acc770..0dc0ca42ba 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 @@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ buttonPane.add(ok); buttonPane.add(cancel); - ok.setActionCommand("OK"); + ok.setActionCommand("Fine-Design_Report_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/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index d7c6013b25..c9ee82253c 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 @@ -4,7 +4,6 @@ import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.Icon; import com.fr.base.IconManager; -import com.fr.design.constants.UIConstants; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; @@ -454,7 +453,7 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB); @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Add_Icon"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Add_Icon"); } // 用户自定义的只有name 和 imgae两属性， path不要去管 @@ -478,4 +477,4 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB); return new Icon(nameTextField.getText(), iconImage); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java index 88fe545cf5..36990287e9 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java @@ -32,7 +32,7 @@ public class ButtonConstants { com.fr.design.i18n.Toolkit.i18nText("Custom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"), com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"), com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode") }; @@ -44,4 +44,4 @@ public class ButtonConstants { StableFactory.getMarkedClass(BridgeMark.SUBMIT_BUTTON, Widget.class), StableFactory.getMarkedClass(BridgeMark.TREE_NODE_TOGGLE_BUTTON, Widget.class) }; -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index 0e922bfc68..ddcb98f86f 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -21,9 +21,9 @@ import java.awt.*; public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; - private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None"); + private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); - private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"); + private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"); public DateValuePane() { @@ -45,7 +45,7 @@ public class DateValuePane extends JPanel { @Override public void stateChanged(ChangeEvent e) { int index = widgetValueHead.getSelectedIndex(); - if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) { + if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) { customPane.setVisible(false); } else { customPane.setVisible(true); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index 550270dea4..aeba80fe1a 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -3,7 +3,6 @@ package com.fr.design.widget.component; import com.fr.design.designer.IntervalConstants; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; @@ -16,7 +15,6 @@ import com.fr.stable.StringUtils; import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import javax.swing.text.DefaultFormatter; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -77,7 +75,7 @@ public class NumberEditorValidatePane extends JPanel { JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0)); errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER); - UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")); + UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")); limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0)); double f = TableLayout.FILL; diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index 1c228d8534..956b9878c3 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -93,7 +93,7 @@ public abstract class CustomJobPane extends BasicBeanPane { this.add(objectProperiesPane, BorderLayout.CENTER); UITextArea area = new UITextArea(2, 1); - area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask")); + area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask")); JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); dsPane.add(area); dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null)); @@ -137,4 +137,4 @@ public abstract class CustomJobPane extends BasicBeanPane { this.classNameTextField.setText(null); this.checkAddButtonEnable(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index d46ae06b8a..7476ca241f 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -106,10 +106,10 @@ public class DBManipulationPane extends BasicBeanPane { private String subMitName; private static final String[] DML_CONFIG_TYPES = new String[] { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Delete_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Update_Submit")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Delete_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Update_Submit")}; /** * 无单元格。没有智能添加单元格等按钮 @@ -128,9 +128,9 @@ public class DBManipulationPane extends BasicBeanPane { dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES); - JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox }, + JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox }, FlowLayout.LEFT, 10); - typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Type"))); + typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))); northPane.add(typePane, BorderLayout.NORTH); chooseTable = new ChoosePaneSupportFormula(); @@ -477,7 +477,7 @@ public class DBManipulationPane extends BasicBeanPane { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); // Richie:全部覆盖 if (returnValue == 0) { @@ -1095,4 +1095,4 @@ public class DBManipulationPane extends BasicBeanPane { return this; } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java index 5eadb5f66b..face6e7d1a 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/SubmitJobListPane.java @@ -28,12 +28,12 @@ public class SubmitJobListPane extends ObjectJControlPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[] { new NameObjectCreator( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Event"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Submit_Event"), "/com/fr/web/images/reportlet.png", DMLConfigJob.class, DMLJobPane.class), new NameObjectCreator( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Custom_Event"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Custom_Event"), "/com/fr/web/images/reportlet.png", ClassSubmitJob.class, CustomSubmitJobPane.class) @@ -59,4 +59,4 @@ public class SubmitJobListPane extends ObjectJControlPane { protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Set_Submit_Event"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/env/EnvListPane.java b/designer-base/src/main/java/com/fr/env/EnvListPane.java index f5a1e9e83c..61a4dfcd41 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -33,13 +33,13 @@ public class EnvListPane extends JListControlPane { allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY; if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Empty_Name_Warn_Text")); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text")); setIllegalIndex(editingIndex); return; } if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) { nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Duplicate_Name_Warn_Text", tempName)); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName)); setIllegalIndex(editingIndex); } } @@ -108,4 +108,4 @@ public class EnvListPane extends JListControlPane { protected boolean filterNameableCreator(NameableCreator creator) { return false; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index ff4ec66608..4cf96c2b48 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -66,7 +66,7 @@ public class RemoteEnvPane extends BasicBeanPane { private JDialog dialog; private UILabel message = new UILabel(); private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK")); - private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel")); + private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel")); private UILabel uiLabel = new UILabel(); /** @@ -523,9 +523,7 @@ public class RemoteEnvPane extends BasicBeanPane { DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey()); try { return WorkContext.getConnector().testConnection(connection); - } catch (AuthException e) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); - uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); + } catch (AuthException ignored) { return null; } } @@ -534,13 +532,18 @@ public class RemoteEnvPane extends BasicBeanPane { protected void done() { okButton.setEnabled(true); try { - if (get()) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); - uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); - } else { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + Boolean result = get(); + if (result == null) { + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); - + } else { + if (result) { + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); + uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); + } else { + message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); + } } } catch (InterruptedException | ExecutionException e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); @@ -661,4 +664,4 @@ public class RemoteEnvPane extends BasicBeanPane { fileChooserButton.setEnabled(isHttps); updateHttpsConfigPanel(); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/start/BaseDesigner.java b/designer-base/src/main/java/com/fr/start/BaseDesigner.java index 50613edc94..932a1ebb8b 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { private void init(String[] args) { //初始化 - EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing")); + EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing")); // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到 DesignUtils.initLookAndFeel(); // 初始化Log Handler @@ -156,4 +156,4 @@ public abstract class BaseDesigner extends ToolBarMenuDock { protected void collectUserInformation() { } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index af5c7b7f7e..8e13f0e9d9 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog { this.setModal(true); this.setLayout(new BorderLayout()); final ChartTypePane chartTypePane = new ChartTypePane(); - setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")); this.applyClosingAction(); this.applyEscapeAction(); @@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); - ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); buttonPane.add(ok); 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 9b7ca0b781..028591d550 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 @@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane { JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"))); + spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))); this.add(spane); iconViewList.setSelectedIndex(0); diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java index 6608c55aaf..d0244cebab 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java @@ -88,7 +88,7 @@ public class ChartAlertValuePane extends BasicBeanPane { JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); alertLinePane.add(lineStylePane); - lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":")); + lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":")); lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); lineStylePane.add(lineCombo); @@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane { double[] rowSize = {t, t, t, t, t}; double[] columnSize = {0.1, 0.2, 0.5, 0.2}; Component[][] components= { - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"), contentField = new UITextField(3)}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"), fontNameBox}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"), fontSizeBox}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"), contentField = new UITextField(3)}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font") + ":"), fontNameBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") + ":"), fontSizeBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, {null, null, rightButton = new UIRadioButton(getRightName())}, }; @@ -148,11 +148,11 @@ public class ChartAlertValuePane extends BasicBeanPane { } protected String getLeftName() {// 居左 居右 - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Left"); } protected String getRightName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Right"); } @Override @@ -226,4 +226,4 @@ public class ChartAlertValuePane extends BasicBeanPane { chartAlertValue.setAlertPosition(Constants.RIGHT); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java index deedb9aeea..f3e26baeff 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java @@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { } protected String getValueAxisName() { - return com.fr.design.i18n.Toolkit.i18nText("Main_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"); } protected String getSecondValueAxisName() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java index 02eb1a2e11..a84cfd693e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java @@ -31,9 +31,9 @@ public class MinMaxValuePane extends JPanel { protected UITextField secUnitField; public MinMaxValuePane() { - minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value")); + minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value")); minValueField = new UITextField(6); - maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value")); + maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value")); maxValueField = new UITextField(6); isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit")); mainUnitField = new UITextField(6); @@ -201,4 +201,4 @@ public class MinMaxValuePane extends JPanel { axis.setCustomSecUnit(false); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java index 832d1c84c5..de2d67cb5c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java @@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane { private ColorSelectBox colorSelectBox; public BorderAttriPane() { - this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); + this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); } public BorderAttriPane(String lineString, String colorSting) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java index eda97f42f4..188db90c28 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java @@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction { public SetChartStyleAciton(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java index e60cb36f39..60e550db80 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java @@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("LayerData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java index 96de41b5b8..95411c936f 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java @@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit TextEditor textEidtor = new TextEditor(); initListeners(textEidtor); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); initListeners(formulaEditor); Editor[] editors = new Editor[]{textEidtor, formulaEditor}; diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java index 73e473e8db..2e914e37ab 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java @@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer { private ValueEditorPane cellEditor; public MapReportRenderer() { - Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"))}; + Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"))}; cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java index c600c13255..8552dbb984 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java @@ -33,7 +33,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane { UIScrollPane pane = new UIScrollPane(recordTable); pane.setPreferredSize(new Dimension(150, 320)); - pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"}))); + pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name"))); this.add(pane, BorderLayout.EAST); } @@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane { }); bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT); bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY()); - bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"})); + bg.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name_Edit")); bg.setVisible(true); } 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 f033358cc3..5350ffd4b8 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 @@ -53,12 +53,12 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pane.add(namePane); - namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null)); - namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"}))); + namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trendline_Name"), null)); + namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Name"))); namePane.add(nameLabel = new UITextField("", 6)); pane.add(linePane = new BorderAttriPane()); - linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null)); + linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Line_Style"), null)); JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(typePane); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java index 6fe7855111..611b85cb88 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java @@ -25,7 +25,7 @@ public class DataLabelContentsPane extends BasicPane { @Override protected String title4PopupWindow() { - return "Label"; + return "Fine-Design_Chart_Label"; } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java index 844dadb407..a2047b4e1c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java @@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane { nameBox.setPreferredSize(new Dimension(80, 20)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; this.add(fontStyleBox = new UIComboBox(styles)); fontStyleBox.setPreferredSize(new Dimension(80, 20)); @@ -66,7 +66,7 @@ public class DataLabelStylePane extends BasicPane { @Override protected String title4PopupWindow() { - return "Label"; + return "Fine-Design_Chart_Label"; } public void populate(AttrContents seriesAttrContents) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java index 79641b31aa..bf9ba9b094 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java @@ -29,7 +29,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane { } private JPanel createTitleStylePane() { - final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); + final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); styleAttrPane = new ChartTextAttrPane() { protected JPanel getContentPane(JPanel buttonPane) { double p = TableLayout.PREFERRED; 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 2fb202cfe5..8191066e75 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 @@ -81,7 +81,7 @@ public class TableDataPane extends FurtherBasicBeanPane{ * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tabledata"); } @@ -171,4 +171,4 @@ public class TableDataPane extends FurtherBasicBeanPane{ return null; } -} \ No newline at end of file +} 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 73559a8052..4393f45371 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 @@ -38,7 +38,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") + 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/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index b8db103079..e7d31960b7 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 @@ -33,7 +33,11 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; +<<<<<<< HEAD + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("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("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; +>>>>>>> 4c1c2515a1aee68b5a9e8d9b51be5a4a9d3fb1d6 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"), @@ -55,7 +59,7 @@ public class ChartAxisLineStylePane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} , new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null}, new Component[]{null, mainTickPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null}, new Component[]{null,secondTickPosition} @@ -88,4 +92,4 @@ public class ChartAxisLineStylePane extends BasicPane{ } } -} \ No newline at end of file +} 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 edc5e496fd..381fe56dd1 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("Common"), - com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java index b0c9ff66a8..a2b4f0bfff 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java @@ -34,7 +34,7 @@ public class ChartBorderPane extends BasicPane{ double[] columnSize = { p,f }; double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index 39f16e8615..dea30d0c97 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane { } protected Component[][] getComponents(JPanel buttonPane) { - UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{null, null}, new Component[]{text, fontNameComboBox}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 0a7e6bea65..66f7047111 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 @@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minValueField.setEnabled(false); @@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxValueField.setEnabled(false); @@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMain() { // 主要刻度单位 - mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit")); + mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Unit")); mainUnitField = new UITextField(); mainUnitField.setPreferredSize(new Dimension(30, 20)); mainUnitField.setEditable(false); 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 0bba886b55..4287b0f67c 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 @@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"); } private class ContentPane extends JPanel { private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); - private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units")); + private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units")); public ContentPane() { this.initComponents(); 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 6186f96e39..ab7efa200c 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 @@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane{ Component[][] components = new Component[][]{ new Component[]{null,textAttrPane}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} , + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),location} , new Component[]{new JSeparator(),null}, new Component[]{borderPane,null}, new Component[]{backgroundPane,null} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java index f72aa8982a..c43dbc64c2 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java @@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane { JPanel pane = new JPanel(); pane.setLayout(new BorderLayout()); - pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pitch_Percentage") + ":"), BorderLayout.WEST); pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER); gapPane.populateBean(100.0); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java index c2f6e941fb..e73f4a079a 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 @@ -249,9 +249,9 @@ public class CustomDefaultSeriesPane extends BasicPane{ 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("Line-Style")),lineStyle}, + 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("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; 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/CustomTypeConditionSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java index 1fb1b8d090..60c815be56 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 @@ -458,9 +458,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ 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("Line-Style")),lineStyle}, + 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("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; this.setLayout(new BorderLayout()); 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 7b2712f872..3154522c5d 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 @@ -58,9 +58,9 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ 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("Line-Style")),lineStyle}, + 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("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 859c8b556c..84fa6751b5 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 @@ -78,7 +78,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-Units") + ":", SwingUtilities.LEFT), unit}, + 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}, new Component[]{colorPickerPane, null}, @@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return components; } else { components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit}, + 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}, new Component[]{colorPickerPane, null}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java index db7ba4257c..50b485ae8c 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 @@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { protected void initCom() { stylePane = new ChartBeautyPane(); isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; Integer[] valueArray = {0, 1}; secondPlotType = new UIButtonGroup(nameArray, valueArray); smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); 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 5e07d0067f..e478a3f7b3 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 @@ -57,7 +57,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java index b7630cba38..e0dbd8ba08 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java @@ -72,7 +72,7 @@ public class ChartPreStyleAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Menu-Server_Chart_PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Server_PreStyle"); } @Override 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 d1cd31b2f7..099c008d21 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 @@ -112,7 +112,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private JPanel createHyperlinkPane() { hyperLinkPane = new ExtendedChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperLinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperLinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java index 5915d6a827..f399d90e81 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java @@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane { protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartCustomPlotHyperlinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java index c797285d82..d27b95f3bf 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java @@ -68,6 +68,6 @@ public class VanChartCustomTooltipPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java index e24b77639b..24400cacdc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java @@ -38,7 +38,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { }; transparent = new UINumberDragPane(0, 100); - JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha"), transparent); + JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent); this.setLayout(new BorderLayout()); this.add(fillColorPane, BorderLayout.NORTH); 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 a5ee0ce44b..97d24338f5 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 @@ -28,7 +28,7 @@ public class VanChartBeautyPane extends BasicBeanPane { double[] columnSize = {f, e}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Style")), styleBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")), styleBox}, } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java index e695f4d2fc..90e3302c3e 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java @@ -192,7 +192,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); buttonsPane.add(okButton); okButton.addActionListener(new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java index c7484ced9a..99306f4bac 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java @@ -101,7 +101,7 @@ public class VanChartBackgroundPane extends BasicPane { new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java index ab469c02a6..e6dfa45cfa 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 @@ -49,7 +49,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro return new Component[][]{ new Component[]{typeComboBox, null}, new Component[]{centerPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + 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/background/VanChartBackgroundWithOutShadowWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java index 212eb99591..c1c0aa909a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java @@ -25,7 +25,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java index 86278cbe03..565183e543 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java @@ -45,7 +45,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { Component[][] components = new Component[][]{ new Component[]{gradientBar, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Direction")),directionPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Direction")),directionPane}, }; JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -99,7 +99,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { * @return 名称 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java index 69124e03d9..a9edf4cd54 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 @@ -31,7 +31,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ 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_Alpha")), transparent} + 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/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index ca3d7c18ff..3b85485ad2 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 @@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createHyperlinkPane() { superLink = new VanChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), superLink); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), superLink); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java index 2cec63a6d8..ae047cc13b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java @@ -33,12 +33,12 @@ public class VanChartDataSheetContentPane extends AbstractNormalMultiLineConditi @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); } @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); } @Override 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 f6f5bc55e9..9f27487dd4 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 @@ -68,7 +68,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } protected VanChartPlotTooltipPane getTooltipPane(Plot plot) { 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 f058bda53f..c08a67a656 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 @@ -96,7 +96,7 @@ public class DrillMapLayerPane extends BasicScrollPane { detailComps = new Component[depth + 1][3]; rowSize[0] = p; detailComps[0] = new Component[]{ - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Descriptor")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Map_Type")) }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java index a31aebfe1c..7868c4aafc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java @@ -83,7 +83,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith double[] rowSize = {p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{null}, - new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), textAttrPane)}, + new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)}, new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane)}, new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)}, new Component[]{catalogSuperLink} 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 7cdf8ce4df..1d7a359317 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 @@ -37,7 +37,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_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col); 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 d8b157a499..a08afc5eb6 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 @@ -53,7 +53,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createGanntStylePane(){ seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_New_Line"),seriesNewLine); - JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"), panel); + JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"), panel); return ganntStylePane; } 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 933378f3fd..7c7648464d 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 @@ -67,7 +67,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")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"),gaugeLayout); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { 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 c6f330fa47..455cd5d755 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 @@ -140,7 +140,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), panel); } 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 906f171e83..5e7a651fc4 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 @@ -244,7 +244,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { //不透明度 private JPanel createPointAlphaPane() { pointAlphaPane = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), pointAlphaPane); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), pointAlphaPane); } private JPanel createPointEffectPane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java index 5ef8e8a8f5..2419604142 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java @@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo @Override protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartMapHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane); } @Override protected void populateHyperlink(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java index b7508410d3..b13599304d 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java @@ -123,7 +123,7 @@ public class VanChartMapTooltipPane extends AbstractVanChartScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java index 18b74422b2..df14ff5552 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java @@ -49,7 +49,7 @@ public class VanChartCurvePane extends BasicBeanPane{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Width")), lineWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bedding")),bending}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), lineAlphaPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), lineAlphaPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index ab86164198..3f8bdafb01 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -59,7 +59,7 @@ public class StructureNodeStylePane extends BasicBeanPane { new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), nodeOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity} }; JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize); 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 becf0da321..231ceb7c2d 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 @@ -84,7 +84,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, new Component[]{jPanel, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), linkOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), linkOpacity} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRGridLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRGridLayoutAdapter.java deleted file mode 100644 index 3bb4efe53a..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRGridLayoutAdapter.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.fr.design.designer.beans.adapters.layout; - - -import java.awt.Point; - -import com.fr.design.beans.GroupModel; -import com.fr.design.designer.beans.HoverPainter; -import com.fr.design.designer.beans.painters.FRGridLayoutPainter; -import com.fr.design.designer.creator.XCreator; -import com.fr.design.designer.creator.XLayoutContainer; -import com.fr.design.designer.properties.FRGridLayoutPropertiesGroupModel; -import com.fr.design.form.layout.FRGridLayout; -import com.fr.design.utils.gui.LayoutUtils; - -public class FRGridLayoutAdapter extends AbstractLayoutAdapter { - - public FRGridLayoutAdapter(XLayoutContainer container) { - super(container); - } - - @Override - public boolean accept(XCreator creator, int x, int y) { - return true; - } - - @Override - protected void addComp(XCreator creator, int x, int y) { - container.add(creator, getLayoutGrid(creator, x, y)); - LayoutUtils.layoutRootContainer(container); - } - - @Override - public HoverPainter getPainter() { - return new FRGridLayoutPainter(container); - } - - @Override - public GroupModel getLayoutProperties() { - return new FRGridLayoutPropertiesGroupModel(container); - } - - private Point getLayoutGrid(XCreator creator, int x, int y) { - FRGridLayout layout = (FRGridLayout)container.getLayout(); - int w = container.getWidth() / layout.getColumns(); - int h = container.getHeight() / layout.getRows(); - return new Point(x / w, y / h); - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRHorizontalSplitLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRHorizontalSplitLayoutAdapter.java deleted file mode 100644 index 36b67d7f75..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRHorizontalSplitLayoutAdapter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.fr.design.designer.beans.adapters.layout; - -import com.fr.design.designer.creator.XCreator; -import com.fr.design.designer.creator.XLayoutContainer; -import com.fr.design.designer.creator.XWHorizontalSplitLayout; -import com.fr.design.form.layout.FRSplitLayout; -import com.fr.form.ui.container.WHorizontalSplitLayout; - -public class FRHorizontalSplitLayoutAdapter extends FRVerticalSplitLayoutAdapter { - - public FRHorizontalSplitLayoutAdapter(XLayoutContainer container) { - super(container); - } - - @Override - protected String getPlacement(XCreator creator, int x, int y) { - int width = container.getWidth(); - WHorizontalSplitLayout wLayout = ((XWHorizontalSplitLayout) container).toData(); - int asideSize = (int) (width * wLayout.getRatio()); - if (x > asideSize) { - return FRSplitLayout.CENTER; - } else { - return FRSplitLayout.ASIDE; - } - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRVerticalSplitLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRVerticalSplitLayoutAdapter.java deleted file mode 100644 index aaeb8b01c1..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRVerticalSplitLayoutAdapter.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.fr.design.designer.beans.adapters.layout; - -import java.awt.Component; - -import com.fr.design.beans.GroupModel; -import com.fr.design.designer.creator.XAbstractSplitLayout; -import com.fr.design.designer.creator.XCreator; -import com.fr.design.designer.creator.XLayoutContainer; -import com.fr.design.designer.creator.XWVerticalSplitLayout; -import com.fr.design.designer.properties.HorizontalSplitProperties; -import com.fr.design.form.layout.FRSplitLayout; -import com.fr.form.ui.container.WVerticalSplitLayout; -import com.fr.design.utils.gui.LayoutUtils; - -public class FRVerticalSplitLayoutAdapter extends AbstractLayoutAdapter { - - public FRVerticalSplitLayoutAdapter(XLayoutContainer container) { - super(container); - } - - @Override - public boolean accept(XCreator creator, int x, int y) { - String place = getPlacement(creator, x, y); - FRSplitLayout layout = (FRSplitLayout) container.getLayout(); - Component comp = layout.getLayoutComponent(place); - return comp == null; - } - - @Override - protected void addComp(XCreator creator, int x, int y) { - String placement = getPlacement(creator, x, y); - container.add(creator, placement); - LayoutUtils.layoutRootContainer(container); - } - - @Override - public GroupModel getLayoutProperties() { - XAbstractSplitLayout xbl = (XAbstractSplitLayout) container; - return new HorizontalSplitProperties(xbl.toData()); - } - - protected String getPlacement(XCreator creator, int x, int y) { - int height = container.getHeight(); - WVerticalSplitLayout wLayout = ((XWVerticalSplitLayout) container).toData(); - int asideSize = (int) (height * wLayout.getRatio()); - if (y > asideSize) { - return FRSplitLayout.CENTER; - } else { - return FRSplitLayout.ASIDE; - } - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/FormCardPane.java b/designer-form/src/main/java/com/fr/design/designer/creator/FormCardPane.java deleted file mode 100644 index ce621beec0..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/FormCardPane.java +++ /dev/null @@ -1,244 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.CardLayout; -import java.awt.Color; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Insets; -import java.awt.LayoutManager; -import java.awt.event.ContainerListener; - -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; -import javax.swing.Icon; -import javax.swing.JComponent; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; - -public class FormCardPane extends JComponent implements SwingConstants { - - private boolean showTab; - private int tabPlace; - private JPanel tabPane; - private JPanel cardPane; - private CardLayout layout; - private java.util.List tabComponent = new java.util.ArrayList(); - private int showIndex; - - public FormCardPane(boolean showTab, int tabPlace) { - this.showTab = showTab; - this.tabPlace = tabPlace; - initTabComponent(); - initCardComponent(); - setLayout(new FormCardLayout()); - this.add(tabPane); - this.add(cardPane); - } - - public FormCardPane(ContainerListener containerListener) { - this(true, TOP); - cardPane.addContainerListener(containerListener); - } - - private void initTabComponent() { - tabPane = new JPanel(); - tabPane.setOpaque(true); - tabPane.setBorder(BorderFactory.createLineBorder(Color.pink)); - tabPane.setBackground(Color.WHITE); - } - - private void initCardComponent() { - cardPane = new JPanel(); - cardPane.setBorder(BorderFactory.createLineBorder(Color.orange)); - layout = new CardLayout(); - cardPane.setLayout(layout); - } - - public void setSelectedIndex(int showIndex) { - this.setSelectedComponent(this.getComponentAt(showIndex)); - } - - public int getTabCount() { - return cardPane.getComponentCount(); - } - - @Override - public void add(Component comp, Object constraints) { - this.add(comp, constraints, -1); - } - - @Override - public void removeAll() { - cardPane.removeAll(); - tabComponent.clear(); - } - - private void reSetTabComponent() { - if (tabPlace == TOP || tabPlace == BOTTOM) { - int totalWidth = 0; - for (Component comp : tabComponent) { - totalWidth += comp.getWidth(); - } - showTabComponent(totalWidth > tabPane.getWidth()); - - } else if (tabPlace == LEFT || tabPlace == RIGHT) { - int totalHeight = 0; - for (Component comp : tabComponent) { - totalHeight += comp.getHeight(); - } - showTabComponent(totalHeight > tabPane.getHeight()); - } - } - - private void showTabComponent(boolean showButton) { - tabPane.removeAll(); - if (this.showIndex < 0 || this.showIndex >= tabComponent.size()) { - this.showIndex = 0; - } - if (tabPlace == TOP || tabPlace == BOTTOM) { - tabPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - - } else if (tabPlace == LEFT || tabPlace == RIGHT) { - tabPane.setLayout(new BoxLayout(tabPane, BoxLayout.Y_AXIS)); - } else { - return; - } - - for (Component comp : tabComponent) { - tabPane.add(comp); - } - tabPane.repaint(); - } - - @Override - public void add(Component comp, Object constraints, int index) { - if (!(comp instanceof XCreator)) { - return; - } - JComponent tabComp = new JPanel(); - if (constraints instanceof String) { - tabComp = new UILabel((String) constraints); - - } else if (constraints instanceof Icon) { - tabComp = new UILabel((Icon) constraints); - } else { - return; - } - tabComp.setOpaque(true); - tabComp.setBorder(BorderFactory.createLineBorder(Color.red)); - cardPane.add(comp, ((((XCreator) comp).toData())).getWidgetName(), index); - if (index == -1) { - tabComponent.add(tabComp); - } else { - tabComponent.add(index, tabComp); - } - - reSetTabComponent(); - } - - public void setTabPlacement(int tabPlace) { - this.tabPlace = tabPlace; - } - - public Component getComponentAt(int i) { - return cardPane.getComponent(i); - } - - public void setSelectedComponent(Component child) { - if (child instanceof XCreator) { - int order = cardPane.getComponentZOrder(child); - if (order == -1 || order == showIndex) { - return; - } - tabComponent.get(showIndex).setBackground(null); - this.showIndex = order; - tabComponent.get(showIndex).setBackground(Color.orange); - layout.show(cardPane, ((((XCreator) child).toData())).getWidgetName()); - } - } - - class FormCardLayout implements LayoutManager { - - @Override - public void addLayoutComponent(String name, Component comp) { - // TODO Auto-generated method stub - - } - - @Override - public void layoutContainer(Container parent) { - Insets inset = parent.getInsets(); - int parentWidth = parent.getWidth() - inset.left - inset.right; - int parentHeight = parent.getHeight() - inset.top - inset.bottom; - if (showTab) { - if (tabPlace == TOP || tabPlace == BOTTOM) { - int height = getTabPaneHeight(); - tabPane.setSize(parentWidth, height); - cardPane.setSize(parentWidth, parentHeight - height); - if (tabPlace == TOP) { - tabPane.setLocation(inset.left, inset.top); - cardPane.setLocation(inset.left, inset.top + height); - } else { - cardPane.setLocation(inset.left, inset.top); - tabPane.setLocation(inset.left, inset.top + parentHeight - height); - } - } else if (tabPlace == LEFT || tabPlace == RIGHT) { - int width = getTabPaneWidth(); - tabPane.setSize(width, parentHeight); - cardPane.setSize(parentWidth - width, parentHeight); - if (tabPlace == LEFT) { - tabPane.setLocation(inset.left, inset.top); - cardPane.setLocation(inset.left + width, inset.top); - } else { - cardPane.setLocation(inset.left, inset.top); - tabPane.setLocation(inset.left + parentWidth - width, inset.top); - } - } - - } else { - tabPane.setVisible(false); - cardPane.setSize(parent.getWidth(), parent.getHeight()); - cardPane.setLocation(0, 0); - } - } - - @Override - public Dimension minimumLayoutSize(Container parent) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Dimension preferredLayoutSize(Container parent) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void removeLayoutComponent(Component comp) { - // TODO Auto-generated method stub - - } - - } - - public int getTabPaneHeight() { - return 22; - } - - public int getTabPaneWidth() { - return 40; - } - - public void addCreatorListener(ContainerListener containerListener) { - - } - - public void setShowTab(boolean showTab) { - this.showTab = showTab; - } - -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XAbstractSplitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XAbstractSplitLayout.java deleted file mode 100644 index f460c9415d..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XAbstractSplitLayout.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.awt.event.ContainerEvent; - -import com.fr.design.form.layout.FRSplitLayout; -import com.fr.form.ui.Widget; -import com.fr.form.ui.container.WSplitLayout; - -public abstract class XAbstractSplitLayout extends XLayoutContainer { - - public XAbstractSplitLayout(WSplitLayout widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public WSplitLayout toData() { - return (WSplitLayout) data; - } - - @Override - public void convert() { - isRefreshing = true; - WSplitLayout wb = this.toData(); - this.removeAll(); - String[] arrs = { WSplitLayout.CENTER, WSplitLayout.ASIDE }; - for (int i = 0; i < arrs.length; i++) { - Widget wgt = wb.getLayoutWidget(arrs[i]); - if (wgt != null) { - XWidgetCreator comp = (XWidgetCreator) XCreatorUtils.createXCreator(wgt, calculatePreferredSize(wgt)); - this.add(comp, arrs[i]); - } - } - isRefreshing = false; - } - - @Override - public void componentAdded(ContainerEvent e) { - if (isRefreshing) { - return; - } - XWidgetCreator creator = (XWidgetCreator) e.getChild(); - FRSplitLayout b = (FRSplitLayout) getLayout(); - Object constraints = b.getConstraints(creator); - WSplitLayout wb = this.toData(); - Widget w = creator.toData(); - wb.addWidget(w, constraints); - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java index ad33aefd53..e30957139d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XButton.java @@ -90,9 +90,9 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("text", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( @@ -162,7 +162,7 @@ public class XButton extends XWidgetCreator { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("text", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Name")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -172,7 +172,7 @@ public class XButton extends XWidgetCreator { } }), new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -309,4 +309,4 @@ public class XButton extends XWidgetCreator { } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java index b81e03bde6..408560277f 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 @@ -3,20 +3,18 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.BorderFactory; -import javax.swing.JComponent; - import com.fr.design.form.util.XCreatorConstants; -import com.fr.stable.core.PropertyChangeAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.CheckBox; import com.fr.form.ui.WidgetValue; - import com.fr.stable.ArrayUtils; +import com.fr.stable.core.PropertyChangeAdapter; + +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import java.awt.Dimension; +import java.beans.IntrospectionException; /** * @author richer @@ -41,7 +39,7 @@ public class XCheckBox extends XWidgetCreator { } }), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -54,7 +52,7 @@ public class XCheckBox extends XWidgetCreator { } }), new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -91,4 +89,4 @@ public class XCheckBox extends XWidgetCreator { ((UICheckBox) editor).setSelected((Boolean) value.getValue()); } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index 8e9240068c..1d9416911a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -3,13 +3,7 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.BorderFactory; -import javax.swing.JComponent; - +import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.editors.DictionaryEditor; @@ -17,10 +11,14 @@ import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; import com.fr.form.ui.CheckBoxGroup; -import com.fr.design.form.util.XCreatorConstants; - import com.fr.stable.ArrayUtils; +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer @@ -36,7 +34,7 @@ public class XCheckBoxGroup extends XFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( @@ -50,7 +48,7 @@ public class XCheckBoxGroup extends XFieldEditor { new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class), new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Choose_Type_All")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) @@ -89,4 +87,4 @@ public class XCheckBoxGroup extends XFieldEditor { protected String getIconName() { return "checkbox_group_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java index f89894128f..3368dd1378 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java @@ -40,7 +40,7 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), + new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }, super.supportedDescriptor()); @@ -110,4 +110,4 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java index 3d289a009c..748c377836 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java @@ -3,25 +3,63 @@ */ package com.fr.design.designer.creator; -import com.fr.base.FRContext; import com.fr.design.ExtraDesignClassManager; -import com.fr.design.designer.creator.cardlayout.*; +import com.fr.design.designer.creator.cardlayout.XCardAddButton; +import com.fr.design.designer.creator.cardlayout.XCardSwitchButton; +import com.fr.design.designer.creator.cardlayout.XWCardLayout; +import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; +import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; +import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout; +import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; import com.fr.design.fun.FormWidgetOptionProvider; import com.fr.design.fun.ParameterWidgetOptionProvider; import com.fr.design.module.DesignModuleFactory; import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.parameter.FormSubmitButton; import com.fr.form.ui.Button; -import com.fr.form.ui.*; +import com.fr.form.ui.CardAddButton; +import com.fr.form.ui.CardSwitchButton; +import com.fr.form.ui.CheckBox; +import com.fr.form.ui.CheckBoxGroup; +import com.fr.form.ui.ComboBox; +import com.fr.form.ui.ComboCheckBox; +import com.fr.form.ui.DateEditor; +import com.fr.form.ui.EditorHolder; +import com.fr.form.ui.ElementCaseEditor; +import com.fr.form.ui.ErrorMarker; +import com.fr.form.ui.FileEditor; +import com.fr.form.ui.FreeButton; +import com.fr.form.ui.IframeEditor; import com.fr.form.ui.Label; +import com.fr.form.ui.MultiFileEditor; +import com.fr.form.ui.NameWidget; +import com.fr.form.ui.NumberEditor; +import com.fr.form.ui.Password; +import com.fr.form.ui.Radio; +import com.fr.form.ui.RadioGroup; import com.fr.form.ui.TextArea; -import com.fr.form.ui.container.*; +import com.fr.form.ui.TextEditor; +import com.fr.form.ui.TreeComboBoxEditor; +import com.fr.form.ui.TreeEditor; +import com.fr.form.ui.Widget; +import com.fr.form.ui.container.WAbsoluteBodyLayout; +import com.fr.form.ui.container.WAbsoluteLayout; +import com.fr.form.ui.container.WBorderLayout; +import com.fr.form.ui.container.WCardLayout; +import com.fr.form.ui.container.WFitLayout; +import com.fr.form.ui.container.WHorizontalBoxLayout; +import com.fr.form.ui.container.WParameterLayout; +import com.fr.form.ui.container.WScaleLayout; +import com.fr.form.ui.container.WTitleLayout; +import com.fr.form.ui.container.WVerticalBoxLayout; import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; +import com.fr.invoke.Reflect; +import com.fr.log.FineLoggerFactory; import com.fr.plugin.context.PluginContext; import com.fr.plugin.injectable.PluginModule; import com.fr.plugin.manage.PluginFilter; @@ -31,7 +69,6 @@ import com.fr.stable.StringUtils; import javax.swing.*; import java.awt.*; -import java.lang.reflect.Constructor; /** * XCreator的相关处理 @@ -40,55 +77,51 @@ import java.lang.reflect.Constructor; * @since 6.5.3 */ public class XCreatorUtils { - + public static java.util.Map, Class> objectMap = new java.util.HashMap, Class>(); - + private static java.util.Map, Class> extraObjectMap = new java.util.HashMap, Class>(); - + public static java.util.Map, Class> xLayoutMap = new java.util.HashMap, Class>(); - + static { init(); GeneralContext.listenPluginRunningChanged(new PluginEventListener() { - + @Override public void on(PluginEvent event) { - + reInitExtra(); } }, new PluginFilter() { - + @Override public boolean accept(PluginContext context) { - + return context.contain(PluginModule.ExtraDesign, ParameterWidgetOptionProvider.XML_TAG) - || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG); + || context.contain(PluginModule.ExtraDesign, FormWidgetOptionProvider.XML_TAG); } }); } - + private static void init() { - + putDefault(); putExtraEditor(); putDefaultLayouts(); reInitExtra(); } - + private static void putDefaultLayouts() { - + xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class); xLayoutMap.put(WParameterLayout.class, XWParameterLayout.class); xLayoutMap.put(WAbsoluteBodyLayout.class, XWAbsoluteBodyLayout.class); - xLayoutMap.put(WAbsoluteLayout.class, XWAbsoluteLayout.class); xLayoutMap.put(WHorizontalBoxLayout.class, XWHorizontalBoxLayout.class); xLayoutMap.put(WBorderLayout.class, XWBorderLayout.class); xLayoutMap.put(WCardLayout.class, XWCardLayout.class); xLayoutMap.put(WVerticalBoxLayout.class, XWVerticalBoxLayout.class); - xLayoutMap.put(WHorizontalSplitLayout.class, XWHorizontalSplitLayout.class); - xLayoutMap.put(WVerticalSplitLayout.class, XWVerticalSplitLayout.class); - xLayoutMap.put(WGridLayout.class, XWGridLayout.class); - + xLayoutMap.put(WFitLayout.class, XWFitLayout.class); xLayoutMap.put(WScaleLayout.class, XWScaleLayout.class); xLayoutMap.put(WTitleLayout.class, XWTitleLayout.class); @@ -97,9 +130,9 @@ public class XCreatorUtils { xLayoutMap.put(WTabFitLayout.class, XWTabFitLayout.class); xLayoutMap.put(WCardMainBorderLayout.class, XWCardMainBorderLayout.class); } - + private static void putDefault() { - + objectMap.put(TextEditor.class, XTextEditor.class); objectMap.put(TextArea.class, XTextArea.class); objectMap.put(NumberEditor.class, XNumberEditor.class); @@ -110,14 +143,10 @@ public class XCreatorUtils { objectMap.put(ComboCheckBox.class, XComboCheckBox.class); objectMap.put(DateEditor.class, XDateEditor.class); objectMap.put(FileEditor.class, XFileUploader.class); - objectMap.put(Table.class, XTableEditor.class); objectMap.put(IframeEditor.class, XIframeEditor.class); - objectMap.put(FreeButton.class, XButton.class); objectMap.put(FormSubmitButton.class, XButton.class); objectMap.put(Button.class, XButton.class); objectMap.put(Label.class, XLabel.class); - objectMap.put(ListEditor.class, XListEditor.class); - objectMap.put(TableTree.class, XTableTree.class); objectMap.put(MultiFileEditor.class, XMultiFileUploader.class); objectMap.put(Password.class, XPassword.class); objectMap.put(Radio.class, XRadio.class); @@ -125,30 +154,29 @@ public class XCreatorUtils { objectMap.put(TreeEditor.class, XTreeEditor.class); objectMap.put(TreeComboBoxEditor.class, XTreeComboBoxEditor.class); objectMap.put(EditorHolder.class, XEditorHolder.class); - objectMap.put(DataTable.class, XDataTable.class); objectMap.put(ElementCaseEditor.class, XElementCase.class); objectMap.put(NameWidget.class, XNameWidget.class); objectMap.put(CardSwitchButton.class, XCardSwitchButton.class); objectMap.put(CardAddButton.class, XCardAddButton.class); objectMap.put(ErrorMarker.class, ErrorCreator.class); } - + private static void reInitExtra() { - + extraObjectMap.clear(); extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getParameterWidgetOptionsMap()); extraObjectMap.putAll(ExtraDesignClassManager.getInstance().getFormWidgetOptionsMap()); } - + private static void putExtraEditor() { if (DesignModuleFactory.getChartEditorClass() != null) { objectMap.put(DesignModuleFactory.getChartEditorClass(), XChartEditor.class); } } - + @SuppressWarnings("unchecked") private static Class searchXCreatorClass(Class clazz) { - + Class xClazz = (Class) objectMap.get(clazz); if (xClazz == null) { xClazz = (Class) extraObjectMap.get(clazz); @@ -160,7 +188,8 @@ public class XCreatorUtils { } /** - *创建creator + * 创建creator + * * @param widget 控件 * @return 返回控件的creator */ @@ -170,8 +199,9 @@ public class XCreatorUtils { /** * 带初始大小的Widget转化为XCreator当然XCreator也需要把大小赋值上 + * * @param widget 控件 - * @param d 大小 + * @param d 大小 * @return 返回控件的xcreator */ public static XCreator createXCreator(Widget widget, Dimension d) { @@ -184,23 +214,18 @@ public class XCreatorUtils { widgetClass = widget.getClass(); clazz = XCreatorUtils.searchXCreatorClass(widgetClass); if (clazz == null) { - FRContext.getLogger().error(widget + "'s" + " xcreator doesn't exsit!"); + FineLoggerFactory.getLogger().error(widget + "'s" + " xcreator doesn't exsit!"); clazz = NullCreator.class; } } XCreator creator = null; - Constructor[] constructors = clazz.getConstructors(); - for (Constructor c : constructors) { - try { - creator = (XCreator) c.newInstance(widget, d); - break; - } catch (Exception ignore) { - // richie:这里的错误可以忽略 -// FRContext.getLogger().error(ignore.getMessage()); - } + try { + creator = Reflect.on(clazz).create(widget, d).get(); + } catch (Exception ignore) { + } if (creator == null) { - FRContext.getLogger().error("Error to create xcreator!"); + FineLoggerFactory.getLogger().error("Error to create xcreator!"); creator = new NullCreator(widget, d); } creator.setXDescrption(widget);//设置描述信息 @@ -208,7 +233,8 @@ public class XCreatorUtils { } /** - *刷新所有名字控件 + * 刷新所有名字控件 + * * @param container 布局容器 */ public static void refreshAllNameWidgets(XLayoutContainer container) { @@ -228,52 +254,52 @@ public class XCreatorUtils { } /** - * 获取焦点组件所在的顶层容器,不包括目标本身 - * - * @param creator 组件 - * @return 返回父容器 - */ - public static XLayoutContainer getParentXLayoutContainer(XCreator creator) { - Container c = creator.getParent(); - while (c != null) { - XCreator crea = (XCreator) c; - if(crea.acceptType(XWCardTitleLayout.class)){ - return (XLayoutContainer) c.getParent(); + * 获取焦点组件所在的顶层容器,不包括目标本身 + * + * @param creator 组件 + * @return 返回父容器 + */ + public static XLayoutContainer getParentXLayoutContainer(XCreator creator) { + Container c = creator.getParent(); + while (c != null) { + XCreator crea = (XCreator) c; + if (crea.acceptType(XWCardTitleLayout.class)) { + return (XLayoutContainer) c.getParent(); } - if (crea.isDedicateContainer()) { - return (XLayoutContainer) c.getParent(); - } - if (c instanceof XLayoutContainer) { - return (XLayoutContainer) c; - } - c = c.getParent(); - } - - return null; - } - - /** - * 获取焦点组件所在的顶层容器,可能是目标本身 - * - * @param creator 组件 - * @return 返回顶层容器 - */ - public static XLayoutContainer getHotspotContainer(XCreator creator) { - if (creator.isDedicateContainer()) { - return (XLayoutContainer) creator.getParent(); - } - if (creator instanceof XLayoutContainer) { - return (XLayoutContainer) creator; - } - return getParentXLayoutContainer(creator); - } - - /** - * 返回组件的图标 - * - * @param creator 组件 - * @return 组件icon - */ + if (crea.isDedicateContainer()) { + return (XLayoutContainer) c.getParent(); + } + if (c instanceof XLayoutContainer) { + return (XLayoutContainer) c; + } + c = c.getParent(); + } + + return null; + } + + /** + * 获取焦点组件所在的顶层容器,可能是目标本身 + * + * @param creator 组件 + * @return 返回顶层容器 + */ + public static XLayoutContainer getHotspotContainer(XCreator creator) { + if (creator.isDedicateContainer()) { + return (XLayoutContainer) creator.getParent(); + } + if (creator instanceof XLayoutContainer) { + return (XLayoutContainer) creator; + } + return getParentXLayoutContainer(creator); + } + + /** + * 返回组件的图标 + * + * @param creator 组件 + * @return 组件icon + */ public static Icon getCreatorIcon(XCreator creator) { String iconPath = creator.getIconPath(); if (StringUtils.isEmpty(iconPath)) { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java deleted file mode 100644 index 9e6b022ba5..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDataTable.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.awt.Graphics; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; - -import com.fr.stable.core.PropertyChangeAdapter; -import com.fr.design.mainframe.widget.editors.DataTableConfigPane; -import com.fr.design.mainframe.widget.editors.WidgetValueEditor; -import com.fr.design.designer.beans.events.DesignerEditor; -import com.fr.form.data.DataTableConfig; -import com.fr.form.ui.DataTable; -import com.fr.form.ui.WidgetValue; - -import com.fr.stable.ArrayUtils; -import com.fr.design.utils.gui.LayoutUtils; - -public class XDataTable extends XWidgetCreator{ - - private DesignerEditor designerEditor; - - public XDataTable(DataTable widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - protected String getIconName() { - return "text_field_16.png"; - } - - @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), - new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) - .setPropertyChangeListener(new PropertyChangeAdapter() { - - @Override - public void propertyChange() { - if (((DataTable) toData()).getWidgetValue() != null - && ((DataTable) toData()).getWidgetValue().getValue() instanceof DataTableConfig) { - designerEditor.getEditorTarget().populate( - (DataTableConfig) ((DataTable) toData()).getWidgetValue().getValue()); - } - } - }) }); - } - - @Override - public void paint(Graphics g) { - super.paint(g); - designerEditor.paintEditor(g, this.getSize()); - } - - @Override - protected void initXCreatorProperties() { - super.initXCreatorProperties(); - designerEditor.getEditorTarget().setSize(this.getSize()); - LayoutUtils.layoutContainer(designerEditor.getEditorTarget()); - if (((DataTable) toData()).getWidgetValue() != null - && ((DataTable) toData()).getWidgetValue().getValue() instanceof DataTableConfig) { - designerEditor.getEditorTarget().populate( - (DataTableConfig) ((DataTable) toData()).getWidgetValue().getValue()); - } - } - - @Override - public Dimension initEditorSize() { - return new Dimension(250, 100); - } - - @Override - public DesignerEditor getDesignerEditor() { - return designerEditor; - } - - @Override - protected JComponent initEditor() { - if (designerEditor == null) { - final DataTableConfigPane configPane = new DataTableConfigPane(); - designerEditor = new DesignerEditor(configPane); - configPane.addpropertyChangeListener(designerEditor); - designerEditor.addStopEditingListener(new PropertyChangeAdapter() { - @Override - public void propertyChange() { - ((DataTable) toData()).setWidgetValue(new WidgetValue(configPane.update())); - } - }); - } - return null; - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java index 35010962ec..fe1a33d00d 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java @@ -50,7 +50,7 @@ public class XDateEditor extends XDirectWriteEditor { CRPropertyDescriptor[] tempt = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setPropertyChangeListener(new PropertyChangeAdapter() { @@ -175,4 +175,4 @@ public class XDateEditor extends XDirectWriteEditor { public void firePropertyChange() { initFieldText(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java index 75769d6532..fe0878dbe1 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XFileUploader.java @@ -33,7 +33,7 @@ public class XFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("allowTypes", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -55,4 +55,4 @@ public class XFileUploader extends XFieldEditor { protected String getIconName() { return "file_up.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java index a59c6a3047..8ca2b64494 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java @@ -58,7 +58,7 @@ public class XLabel extends XWidgetCreator { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @@ -125,4 +125,4 @@ public class XLabel extends XWidgetCreator { return "label_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java deleted file mode 100644 index 5492292249..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XListEditor.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. - */ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.BorderFactory; -import javax.swing.DefaultListModel; -import javax.swing.JComponent; -import javax.swing.JList; - -import com.fr.design.mainframe.widget.editors.DictionaryEditor; -import com.fr.design.mainframe.widget.editors.WidgetValueEditor; -import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; -import com.fr.form.ui.ListEditor; -import com.fr.design.form.util.XCreatorConstants; - -import com.fr.stable.ArrayUtils; - -/** - * @author richer - * @since 6.5.3 - */ -public class XListEditor extends XFieldEditor { - - public XListEditor(ListEditor widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), - new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass( - WidgetValueEditor.class), - new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class) - .setRendererClass(DictionaryRenderer.class), - new CRPropertyDescriptor("needHead", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("List-Need_Head")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced") }); - } - - @Override - protected void initXCreatorProperties() { - super.initXCreatorProperties(); - JList jList = (JList)editor; - ListEditor l = (ListEditor)data; - jList.setSelectedIndex(0); - jList.setSelectionBackground(l.getSelectionBackground()); - jList.setSelectionForeground(l.getSelectionForeground()); - } - - @Override - protected JComponent initEditor() { - if (editor == null) { - DefaultListModel model = new DefaultListModel(); - model.addElement("Item 1"); - model.addElement("item 2"); - model.addElement("item 3"); - model.addElement("item 4"); - editor = new JList(model); - editor.setBorder(BorderFactory.createEmptyBorder(0, 8, 0, 0)); - } - return editor; - } - - @Override - public Dimension initEditorSize() { - return new Dimension(120, 80); - } - - /** - * 该组件是否可以拖入参数面板 - * 这里控制 列表预定义控件在工具栏不显示 - * @return 是则返回true - */ - public boolean canEnterIntoParaPane(){ - return false; - } - - @Override - protected String getIconName() { - return "list_16.png"; - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java index f4cf8715c8..b487c169d7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java @@ -40,10 +40,10 @@ public class XMultiFileUploader extends XFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("accept", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("maxSize", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } @@ -99,4 +99,4 @@ public class XMultiFileUploader extends XFieldEditor { public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() { return new WidgetPropertyUIProvider[]{ new MultiFileUploaderPropertyUI(this)}; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 6bbcf15032..09622002bf 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 @@ -44,7 +44,7 @@ public class XNumberEditor extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup =(CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")) .setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")} ,super.supportedDescriptor()); @@ -53,7 +53,7 @@ public class XNumberEditor extends XWrapperedFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, ((NumberEditor)this.data).isAllowDecimals() ? new CRPropertyDescriptor[] {allowDecimal, decimalLength} : new CRPropertyDescriptor[] {allowDecimal}); @@ -104,4 +104,4 @@ public class XNumberEditor extends XWrapperedFieldEditor { return "number_field_16.png"; } -} \ No newline at end of file +} 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 4c78c527b2..5b7d2129e2 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 @@ -34,7 +34,7 @@ public class XRadio extends XWidgetCreator { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); } @Override @@ -60,4 +60,4 @@ public class XRadio extends XWidgetCreator { protected String getIconName() { return "radio_button_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java index 8720f2811e..f0a81a165c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java @@ -41,7 +41,7 @@ public class XRadioGroup extends XFieldEditor { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor [] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( @@ -83,4 +83,4 @@ public class XRadioGroup extends XFieldEditor { protected String getIconName() { return "button_group_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java deleted file mode 100644 index 3b5f765b70..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTableEditor.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. - */ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.JTable; -import javax.swing.table.DefaultTableModel; - -import com.fr.form.ui.Table; - -/** - * @author richer - * @since 6.5.3 - */ -public class XTableEditor extends XWidgetCreator { - - public XTableEditor(Table widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - return new CRPropertyDescriptor[0]; - // TODO ALEX_SEP -// return (CRPropertyDescriptor[]) ArrayUtils.addAll( -// super.supportedDescriptor(), -// new CRPropertyDescriptor[]{ -// new CRPropertyDescriptor("indexWidgets", this.data.getClass()) -// .setEditorClass(GridEditor.class) -// .setRendererClass(GridWidgetRenderer.class), -// new CRPropertyDescriptor("dataURL", this.data.getClass()), -// new CRPropertyDescriptor("databinding", this.data.getClass()) -// .setI18NName(com.fr.design.i18n.Toolkit.i18nText("DataBinding")) -// .setEditorClass(DataBindingEditor.class) -// .setRendererClass(DataBindingCellRenderer.class) -// .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") -// }); - } - - @Override - protected JComponent initEditor() { - if (editor == null) { - DefaultTableModel tm = new DefaultTableModel(4, 2); - editor = new JTable(tm); - } - return editor; - } - - @Override - public Dimension initEditorSize() { - return MIDDLE_PREFERRED_SIZE; - } - - @Override - protected String getIconName() { - return "table_16.png"; - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java deleted file mode 100644 index da906dc977..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTableTree.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.DefaultListModel; -import javax.swing.JComponent; -import javax.swing.JList; - -import com.fr.design.mainframe.widget.editors.DictionaryEditor; -import com.fr.design.mainframe.widget.renderer.DictionaryRenderer; -import com.fr.form.ui.TableTree; - -import com.fr.stable.ArrayUtils; - -public class XTableTree extends XWidgetCreator { - - public XTableTree(TableTree widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - return (CRPropertyDescriptor[]) ArrayUtils.addAll( - super.supportedDescriptor(), - new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("dictionary", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")) - .setEditorClass(DictionaryEditor.class) - .setRendererClass(DictionaryRenderer.class), - new CRPropertyDescriptor("dataUrl", this.data.getClass()), - }); - } - @Override - protected JComponent initEditor() { - if (editor == null) { - DefaultListModel model = new DefaultListModel(); - model.addElement("Item 1"); - model.addElement("item 2"); - model.addElement("item 3"); - model.addElement("item 4"); - editor = new JList(model); - } - return editor; - } - - @Override - public Dimension initEditorSize() { - return new Dimension(120, 80); - } - - @Override - protected String getIconName() { - return "list_16.png"; - } - -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java index 4e532822df..880a3021ff 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 @@ -3,24 +3,22 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.BorderFactory; -import javax.swing.JComponent; -import javax.swing.JTree; -import javax.swing.tree.DefaultMutableTreeNode; - +import com.fr.design.form.util.XCreatorConstants; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; import com.fr.design.mainframe.widget.editors.TreeModelEditor; import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.design.mainframe.widget.renderer.TreeModelRenderer; import com.fr.form.ui.FieldEditor; import com.fr.form.ui.TreeEditor; -import com.fr.design.form.util.XCreatorConstants; - import com.fr.stable.ArrayUtils; +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JTree; +import javax.swing.tree.DefaultMutableTreeNode; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -41,7 +39,7 @@ public class XTreeEditor extends XWidgetCreator { CRPropertyDescriptor[] crp = !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( @@ -55,7 +53,7 @@ public class XTreeEditor extends XWidgetCreator { } : new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Value")).setEditorClass(WidgetValueEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( @@ -67,7 +65,7 @@ public class XTreeEditor extends XWidgetCreator { crp = this.addWaterMark(crp); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("multipleSelection", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Tree-Mutiple_Selection_Or_Not")).putKeyValue( @@ -126,4 +124,4 @@ public class XTreeEditor extends XWidgetCreator { return "tree_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWGridLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWGridLayout.java deleted file mode 100644 index c2ad516491..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWGridLayout.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright(c) 2001-2010, FineReport Inc, All Rights Reserved. - */ -package com.fr.design.designer.creator; - -import java.awt.Dimension; -import java.awt.Point; -import java.awt.event.ContainerEvent; -import java.util.Iterator; - -import com.fr.design.designer.beans.LayoutAdapter; -import com.fr.design.designer.beans.adapters.layout.FRGridLayoutAdapter; -import com.fr.design.form.layout.FRGridLayout; -import com.fr.form.ui.Widget; -import com.fr.form.ui.container.WGridLayout; - -/** - * @author richer - * @since 6.5.3 - */ -public class XWGridLayout extends XLayoutContainer { - - public XWGridLayout(WGridLayout widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - protected String getIconName() { - return "layout_grid.png"; - } - - @Override - public String createDefaultName() { - return "grid"; - } - - @Override - public WGridLayout toData() { - return (WGridLayout) data; - } - - @Override - protected void initLayoutManager() { - this.setLayout(new FRGridLayout(toData().getRows(), toData().getColumns(), toData().getHgap(), toData().getVgap())); - } - - @Override - public void convert() { - isRefreshing = true; - WGridLayout layout = this.toData(); - this.removeAll(); - Iterator it = layout.iterator(); - while(it.hasNext()) { - Point p = (Point)it.next(); - Widget wgt = layout.getWidget(p); - if (wgt != null) { - XWidgetCreator comp = (XWidgetCreator)XCreatorUtils.createXCreator(wgt, calculatePreferredSize(wgt)); - this.add(comp, p); - } - } - this.repaint(); - isRefreshing = false; - } - - @Override - public void componentAdded(ContainerEvent e) { - if (isRefreshing) { - return; - } - XWidgetCreator creator = (XWidgetCreator) e.getChild(); - FRGridLayout g = (FRGridLayout) getLayout(); - Point p = g.getPoint(creator); - WGridLayout wg = this.toData(); - Widget w = creator.toData(); - wg.addWidget(w, p); - } - - @Override - public LayoutAdapter getLayoutAdapter() { - return new FRGridLayoutAdapter(this); - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWHorizontalSplitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWHorizontalSplitLayout.java deleted file mode 100644 index c8f8963f6b..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWHorizontalSplitLayout.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.Dimension; - -import com.fr.design.designer.beans.LayoutAdapter; -import com.fr.design.designer.beans.adapters.layout.FRHorizontalSplitLayoutAdapter; -import com.fr.design.form.layout.FRHorizontalSplitLayout; -import com.fr.form.ui.container.WHorizontalSplitLayout; - -public class XWHorizontalSplitLayout extends XAbstractSplitLayout { - - public XWHorizontalSplitLayout(WHorizontalSplitLayout widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public WHorizontalSplitLayout toData() { - return (WHorizontalSplitLayout)data; - } - - @Override - protected void initLayoutManager() { - this.setLayout(new FRHorizontalSplitLayout(toData().getRatio(), toData().getHgap(), toData().getVgap())); - } - - @Override - protected String getIconName() { - return "split_pane_16.png"; - } - - @Override - public String createDefaultName() { - return "hsplit"; - } - - @Override - public LayoutAdapter getLayoutAdapter() { - return new FRHorizontalSplitLayoutAdapter(this); - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWVerticalSplitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWVerticalSplitLayout.java deleted file mode 100644 index 3816112e1a..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWVerticalSplitLayout.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fr.design.designer.creator; - -import java.awt.Dimension; - -import com.fr.design.designer.beans.LayoutAdapter; -import com.fr.design.designer.beans.adapters.layout.FRVerticalSplitLayoutAdapter; -import com.fr.design.form.layout.FRVerticalSplitLayout; -import com.fr.form.ui.container.WVerticalSplitLayout; - -public class XWVerticalSplitLayout extends XAbstractSplitLayout { - - public XWVerticalSplitLayout(WVerticalSplitLayout widget, Dimension initSize) { - super(widget, initSize); - } - - @Override - public WVerticalSplitLayout toData() { - return (WVerticalSplitLayout) data; - } - - @Override - protected void initLayoutManager() { - this.setLayout(new FRVerticalSplitLayout(toData().getRatio(), toData().getHgap(), toData().getVgap())); - } - - @Override - protected String getIconName() { - return "separator_16.png"; - } - - @Override - public String createDefaultName() { - return "vsplit"; - } - - @Override - public LayoutAdapter getLayoutAdapter() { - return new FRVerticalSplitLayoutAdapter(this); - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java index 42bb0f565b..3de1c6b6b4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java @@ -176,7 +176,7 @@ public class XWTabFitLayout extends XWFitLayout { protected CRPropertyDescriptor[] getisnotCustomStyle() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Title_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -191,7 +191,7 @@ public class XWTabFitLayout extends XWFitLayout { protected CRPropertyDescriptor creatNonListenerStyle(int i) throws IntrospectionException{ CRPropertyDescriptor[] crPropertyDescriptors = { new CRPropertyDescriptor("customStyle", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Title_Style")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( @@ -635,4 +635,4 @@ public class XWTabFitLayout extends XWFitLayout { checkVisible(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java deleted file mode 100644 index c96596302c..0000000000 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRGridLayoutPropertiesGroupModel.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.fr.design.designer.properties; - - -import java.awt.Container; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - -import com.fr.design.beans.GroupModel; -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; -import com.fr.design.designer.creator.XWGridLayout; -import com.fr.form.ui.container.WGridLayout; - -/** - * 格子布局的属性组 - * @author richer - * @since 6.5.3 - */ -public class FRGridLayoutPropertiesGroupModel implements GroupModel { - - private DefaultTableCellRenderer renderer; - private PropertyCellEditor editor; - private WGridLayout layout; - - public FRGridLayoutPropertiesGroupModel(Container container) { - this.layout = ((XWGridLayout)container).toData(); - renderer = new DefaultTableCellRenderer(); - editor = new PropertyCellEditor(new IntegerPropertyEditor()); - } - - @Override - public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("GridLayout"); - } - - @Override - public int getRowCount() { - return 4; - } - - @Override - public TableCellRenderer getRenderer(int row) { - return renderer; - } - - @Override - public TableCellEditor getEditor(int row) { - return editor; - } - - @Override - public Object getValue(int row, int column) { - if (column == 0) { - switch (row) { - case 0: - return com.fr.design.i18n.Toolkit.i18nText("Hgap"); - case 1: - return com.fr.design.i18n.Toolkit.i18nText("Vgap"); - case 2: - return com.fr.design.i18n.Toolkit.i18nText("Edit-Row_Count"); - case 3: - return com.fr.design.i18n.Toolkit.i18nText("Edit-Column_Count"); - default: - return null; - } - } else { - switch (row) { - case 0: - return layout.getHgap(); - case 1: - return layout.getVgap(); - case 2: - return layout.getRows(); - case 3: - return layout.getColumns(); - default: - return null; - } - } - } - - @Override - public boolean setValue(Object value, int row, int column) { - if (column == 0) { - return false; - } else { - int v = 0; - if (value != null) { - v = ((Number) value).intValue(); - } - switch (row) { - case 0: - layout.setHgap(v); - return true; - case 1: - layout.setVgap(v); - return true; - case 2: - layout.setRows(v); - return true; - case 3: - layout.setColumns(v); - return true; - default: - return false; - } - } - } - - @Override - public boolean isEditable(int row) { - return true; - } -} \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java index db7e2d67cb..03dae804f4 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileOthersPane.java @@ -28,9 +28,9 @@ public class FormMobileOthersPane extends BasicBeanPane { JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow()); JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); contentPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L1, 0, 0)); - appearRefreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Appear_Refresh")); + appearRefreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Appear_Refresh")); contentPane.add(appearRefreshCheckPane, BorderLayout.WEST); - promptWhenLeaveWithoutSubmitCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Prompt_When_Leave_Without_Submit")); + promptWhenLeaveWithoutSubmitCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Prompt_When_Leave_Without_Submit")); contentPane.add(promptWhenLeaveWithoutSubmitCheckPane, BorderLayout.CENTER); borderPane.add(contentPane); this.add(borderPane); diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 93fb4e2395..88acae8d50 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { @@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index f184315650..56377a93e4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -335,14 +335,14 @@ public class FormEditToolBar extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p}; - Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Alias_Name") + ":"), nameField}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Icon") + ":"), iconPane}}; + Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Alias_Name") + ":"), nameField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Icon") + ":"), iconPane}}; JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); north.add(nameIconPane, BorderLayout.SOUTH); - north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Button_Setting"))); + north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Button_Setting"))); this.add(north, BorderLayout.NORTH); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); centerPane = FRGUIPaneFactory.createCardLayout_S_Pane(); @@ -376,7 +376,7 @@ public class FormEditToolBar extends BasicPane { export.add(excelO); export.add(Box.createVerticalStrut(2)); - export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Button_Setting"), null)); + export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Button_Setting"), null)); return export; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java index 41b23c04e2..84402fabf5 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java @@ -24,7 +24,7 @@ public class FormWebWidgetConstants { // 当前页/总页数 public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Page_Navi_Text"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Page_Navi_Text"), IOUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class); // 首页 public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), IOUtils.readIcon("/com/fr/web/images/first.png"), @@ -40,16 +40,16 @@ public class FormWebWidgetConstants { Next.class); // 导出成Excel 分页导出 - public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), + public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); // 导出成Excel 原样导出 - public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), + public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"), IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory - .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Toolbar_Custom_Button"), CustomToolBarButton.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Toolbar_Custom_Button"), CustomToolBarButton.class); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java index e0521f5b17..3d6249f2be 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java @@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { setText(StringUtils.join("、", res)); } } else { - setText(com.fr.design.i18n.Toolkit.i18nText("None")); + setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); } return this; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java index 12b516bfad..bdfae2dc03 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/HyperlinkGroupWrapper.java @@ -26,14 +26,14 @@ public class HyperlinkGroupWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v == null) { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Undefined"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Undefined"); } NameJavaScriptGroup group = (NameJavaScriptGroup)v; - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Hyperlink_Group_Count", group.size()); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hyperlink_Group_Count", group.size()); } @Override public void validate(String txt) throws ValidationException { } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java b/designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java index 0de1e2bdaf..8d43e08e29 100644 --- a/designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java +++ b/designer-form/src/main/java/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java @@ -1,23 +1,75 @@ package com.fr.design.widget; -import com.fr.base.FRContext; import com.fr.design.designer.creator.XCreator; import com.fr.design.gui.core.WidgetConstants; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.widget.ui.designer.WidgetDefinePane; import com.fr.design.parameter.RootDesignDefinePane; -import com.fr.design.widget.ui.designer.*; -import com.fr.design.widget.ui.designer.layout.*; +import com.fr.design.widget.ui.designer.CheckBoxDefinePane; +import com.fr.design.widget.ui.designer.CheckBoxGroupDefinePane; +import com.fr.design.widget.ui.designer.ComboBoxDefinePane; +import com.fr.design.widget.ui.designer.ComboCheckBoxDefinePane; +import com.fr.design.widget.ui.designer.DateEditorDefinePane; +import com.fr.design.widget.ui.designer.FreeButtonDefinePane; +import com.fr.design.widget.ui.designer.IframeEditorDefinePane; +import com.fr.design.widget.ui.designer.LabelDefinePane; +import com.fr.design.widget.ui.designer.MultiFileEditorPane; +import com.fr.design.widget.ui.designer.NoneWidgetDefinePane; +import com.fr.design.widget.ui.designer.NumberEditorDefinePane; +import com.fr.design.widget.ui.designer.PasswordDefinePane; +import com.fr.design.widget.ui.designer.RadioDefinePane; +import com.fr.design.widget.ui.designer.RadioGroupDefinePane; +import com.fr.design.widget.ui.designer.TextAreaDefinePane; +import com.fr.design.widget.ui.designer.TextFieldEditorDefinePane; +import com.fr.design.widget.ui.designer.TreeComboBoxEditorDefinePane; +import com.fr.design.widget.ui.designer.TreeEditorDefinePane; +import com.fr.design.widget.ui.designer.UserEditorDefinePane; +import com.fr.design.widget.ui.designer.WidgetDefinePane; +import com.fr.design.widget.ui.designer.layout.BorderStyleWidgetDefinePane; +import com.fr.design.widget.ui.designer.layout.ElementEditorDefinePane; +import com.fr.design.widget.ui.designer.layout.FRAbsoluteBodyLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.FRAbsoluteLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.FRFitLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.WCardLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.WCardMainLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.WCardTagLayoutDefinePane; +import com.fr.design.widget.ui.designer.layout.WTabFitLayoutDefinePane; import com.fr.form.parameter.FormSubmitButton; -import com.fr.form.ui.*; -import com.fr.form.ui.container.*; +import com.fr.form.ui.AbstractBorderStyleWidget; +import com.fr.form.ui.Button; +import com.fr.form.ui.CheckBox; +import com.fr.form.ui.CheckBoxGroup; +import com.fr.form.ui.ComboBox; +import com.fr.form.ui.ComboCheckBox; +import com.fr.form.ui.DateEditor; +import com.fr.form.ui.ElementCaseEditor; +import com.fr.form.ui.FreeButton; +import com.fr.form.ui.IframeEditor; +import com.fr.form.ui.Label; +import com.fr.form.ui.MultiFileEditor; +import com.fr.form.ui.NameWidget; +import com.fr.form.ui.NoneWidget; +import com.fr.form.ui.NumberEditor; +import com.fr.form.ui.Password; +import com.fr.form.ui.Radio; +import com.fr.form.ui.RadioGroup; +import com.fr.form.ui.TextArea; +import com.fr.form.ui.TextEditor; +import com.fr.form.ui.TreeComboBoxEditor; +import com.fr.form.ui.TreeEditor; +import com.fr.form.ui.Widget; +import com.fr.form.ui.container.WAbsoluteBodyLayout; +import com.fr.form.ui.container.WAbsoluteLayout; +import com.fr.form.ui.container.WCardLayout; +import com.fr.form.ui.container.WFitLayout; +import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; +import com.fr.invoke.Reflect; +import com.fr.log.FineLoggerFactory; import com.fr.stable.bridge.BridgeMark; import com.fr.stable.bridge.StableFactory; -import java.lang.reflect.Constructor; import java.util.HashMap; import java.util.Map; @@ -45,7 +97,6 @@ public class FormWidgetDefinePaneFactoryBase { defineMap.put(IframeEditor.class, new Appearance(IframeEditorDefinePane.class, WidgetConstants.IFRAME + "")); defineMap.put(TextEditor.class, new Appearance(TextFieldEditorDefinePane.class, WidgetConstants.TEXT + "")); defineMap.put(NameWidget.class, new Appearance(UserEditorDefinePane.class, "UserDefine")); - defineMap.put(ComboCheckBox.class, new Appearance(ComboCheckBoxDefinePane.class, WidgetConstants.COMBOCHECKBOX + "")); defineMap.put(ComboBox.class, new Appearance(ComboBoxDefinePane.class, WidgetConstants.COMBOBOX + "")); defineMap.put(RadioGroup.class, new Appearance(RadioGroupDefinePane.class, WidgetConstants.RADIOGROUP + "")); defineMap.put(CheckBoxGroup.class, new Appearance(CheckBoxGroupDefinePane.class, WidgetConstants.CHECKBOXGROUP + "")); @@ -78,24 +129,23 @@ public class FormWidgetDefinePaneFactoryBase { } public static RN createWidgetDefinePane(XCreator creator, FormDesigner designer, Widget widget, Operator operator) { - if(isExtraXWidget(widget)){ + if (isExtraXWidget(widget)) { WidgetDefinePane widgetDefinePane = new WidgetDefinePane(creator, designer); return new RN(widgetDefinePane, widgetDefinePane.title4PopupWindow()); } Appearance dn = defineMap.get(widget.getClass()); DataModify definePane = null; try { - Constructor con = dn.getDefineClass().getConstructor(XCreator.class); - definePane = (DataModify)con.newInstance(creator); + definePane = Reflect.on(dn.getDefineClass()).create(creator).get(); operator.did(definePane.dataUI(), dn.getDisplayName()); } catch (Exception e) { - FRContext.getLogger().error(e.getMessage(), e); + FineLoggerFactory.getLogger().error(e.getMessage(), e); } return new RN(definePane, dn.getDisplayName()); } - public static boolean isExtraXWidget(Widget widget){ - return defineMap.get(widget.getClass()) == null; + public static boolean isExtraXWidget(Widget widget) { + return defineMap.get(widget.getClass()) == null; } public static class RN { diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java index 6ffdd1be13..19a61a6312 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxGroupDefinePane.java @@ -39,7 +39,7 @@ public class CheckBoxGroupDefinePane extends ButtonGroupDefinePane double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{singleFileCheckBox, null }, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("File-Allow_Upload_Files")), acceptType}, - new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("File-File_Size_Limit")), fileSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")), acceptType}, + new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Size_Limit")), fileSizePane}, new Component[]{new UILabel( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizeField} }; double[] rowSize = {p, p, p, p}; @@ -87,4 +87,4 @@ public class MultiFileEditorPane extends FieldEditorDefinePane return ob; } -} \ No newline at end of file +} 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 8b071416b7..32f1fc86f5 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 @@ -169,10 +169,10 @@ public class ParameterTreeComboBox extends FRTreeComboBox { } } if (!ArrayUtils.isEmpty(parameters)) { - groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Server"), parameters)); + groupList.add(new ParameterGroup(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Server"), parameters)); } return groupList.toArray(new ParameterGroup[0]); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index 252b573d66..aedf4d65df 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 2c64976690..3882bbb44c 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -173,6 +173,9 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { if (value instanceof Integer) { state = (Integer) value; } + //todo 验证下 + layout.setLayoutType(WBodyLayoutType.parse(state)); + layout.setCompState(adaptComboBox.getSelectedIndex()); try { if (state == WBodyLayoutType.ABSOLUTE.getTypeValue()) { WAbsoluteBodyLayout wAbsoluteBodyLayout = new WAbsoluteBodyLayout("body"); @@ -201,9 +204,6 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { FineLoggerFactory.getLogger().error(e.getMessage()); } - //todo 验证下 - layout.setLayoutType(WBodyLayoutType.parse(state)); - layout.setCompState(adaptComboBox.getSelectedIndex()); int intervelValue = (int)componentIntervel.getValue(); if (xWFitLayout.canAddInterval(intervelValue)) { diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java index 0a80b67530..e819eb6fc6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java @@ -26,7 +26,7 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB public ReportFontBoldAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-bold")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold")); this.setSmallIcon(ICONS, true); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java index ee3c6d37cd..7a3563be46 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java @@ -27,7 +27,7 @@ public class ReportFontSizeAction extends AbstractStyleAction { public ReportFontSizeAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")); } /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java index faf9a4f89e..6d14fb6618 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnConditionAction.java @@ -20,14 +20,14 @@ public class DSColumnConditionAction extends AbstractCellElementAction { public DSColumnConditionAction() { super(); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } public DSColumnConditionAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Filter")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } @@ -48,4 +48,4 @@ public class DSColumnConditionAction extends AbstractCellElementAction { protected void updateBasicPane(BasicPane bp, TemplateCellElement cellElement) { ((DSColumnConditionsPane) bp).update(cellElement); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java index 8ec227770d..4fc591e7df 100644 --- a/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java +++ b/designer-realize/src/main/java/com/fr/design/cell/editor/BiasTextPainterCellEditor.java @@ -3,35 +3,31 @@ */ package com.fr.design.cell.editor; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.BorderFactory; -import javax.swing.Box; -import javax.swing.ButtonGroup; - +import com.fr.design.dialog.BasicPane; +import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; - -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.SwingUtilities; - import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.DialogActionAdapter; -import com.fr.general.ComparatorUtils; - import com.fr.design.mainframe.ElementCasePane; +import com.fr.general.ComparatorUtils; import com.fr.grid.Grid; import com.fr.report.cell.TemplateCellElement; import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.elementcase.TemplateElementCase; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + /** * BiasTextPainter */ @@ -121,7 +117,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { centerPane.setBorder(BorderFactory.createEmptyBorder(20, 0, 0, 0)); centerPane.add(textPane, BorderLayout.CENTER); - UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Tip", "'|'", "Season|Product")); + UILabel formulaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Tip", "'|'", "Season|Product")); textPane.add(formulaLabel, BorderLayout.NORTH); formulaLabel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 0)); @@ -136,8 +132,8 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { JPanel choicePane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); - choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Upper_Left_To_Lower_Right"))); - choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line_Lower_Left_To_Upper_Right"))); + choice1 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Upper_Left_To_Lower_Right"))); + choice2 = new UIRadioButton((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line_Lower_Left_To_Upper_Right"))); choice1.addActionListener(leftUp); choice2.addActionListener(leftDown); @@ -154,7 +150,7 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Slope_Line"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Slope_Line"); } public void populate(BiasTextPainter biasTextPainter) { @@ -198,4 +194,4 @@ public class BiasTextPainterCellEditor extends AbstractCellEditor { } }; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 0af3df5415..51778fb0ce 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -80,7 +80,7 @@ public class DSColumnAdvancedPane extends BasicPane { JPanel multiNumPane = null; if (setting > DSColumnPane.SETTING_DSRELATED) { - multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); + multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data")); useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(new UILabel(InsetText)); @@ -338,10 +338,10 @@ public class DSColumnAdvancedPane extends BasicPane { + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ serialTextField, new UILabel( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") ) }, FlowLayout.LEFT); - serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); + serialTextField.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Format") + ":=JOINARRAY(GREPARRAY(RANGE($__count__), item!=4), \",\")"); selectCountCardPane.add(undefinedPane, "UNDEFINE"); selectCountCardPane.add(topFormulaPane, "TOP"); selectCountCardPane.add(bottomFormulaPane, "BOTTOM"); @@ -537,4 +537,4 @@ public class DSColumnAdvancedPane extends BasicPane { multiNumSpinner.setEnabled(false); } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java index 8937e68eb9..f05d97557a 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java @@ -1,24 +1,21 @@ package com.fr.design.dscolumn; -import java.awt.BorderLayout; -import java.awt.FlowLayout; - -import com.fr.design.gui.ilable.UILabel; - -import javax.swing.JPanel; - -import com.fr.design.data.DesignTableDataManager; import com.fr.data.TableDataSource; import com.fr.design.condition.DSColumnLiteConditionPane; import com.fr.design.condition.DSColumnSimpleLiteConditionPane; +import com.fr.design.data.DesignTableDataManager; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.data.Condition; import com.fr.report.cell.CellElement; import com.fr.report.cell.cellattr.core.group.DSColumn; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.FlowLayout; public class DSColumnConditionsPane extends BasicPane { //peter: Lite Condition. @@ -65,7 +62,7 @@ public class DSColumnConditionsPane extends BasicPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Filter"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"); } public void populate(TableDataSource tds, CellElement cellElement) { @@ -103,4 +100,4 @@ public class DSColumnConditionsPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java index 4ef9e7e8e1..3b55a7d76f 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java @@ -101,7 +101,7 @@ public class DSColumnPane extends BasicPane { tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Basic"), basicPane); conditionPane = new DSColumnConditionsPane(setting); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Filter"), conditionPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane); advancedPane = new DSColumnAdvancedPane(setting); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane); @@ -171,4 +171,4 @@ public class DSColumnPane extends BasicPane { public void putCellElement(TemplateCellElement tplCE) { basicPane.putCellElement(tplCE); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java index da9e5e3963..f7014f0156 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java @@ -117,9 +117,9 @@ public class ParentPane extends BasicPane { } }); - noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("None")); + noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); noneParentText.setRectDirection(Constants.RIGHT); - parentCardPane.add("None", noneParentText); + parentCardPane.add("Fine-Design_Report_None", noneParentText); defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Default")); defaultParentText.setRectDirection(Constants.RIGHT); parentCardPane.add("Default", defaultParentText); @@ -174,7 +174,7 @@ public class ParentPane extends BasicPane { private UIPopupMenu createPopMenu() { UIPopupMenu pop = new UIPopupMenu(); pop.setOnlyText(true); - UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("None")); + UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); if (cellAttrPaneListener != null) { noneItem.addActionListener(cellAttrPaneListener); } @@ -182,7 +182,7 @@ public class ParentPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { - cardLayout.show(parentCardPane, "None"); + cardLayout.show(parentCardPane, "Fine-Design_Report_None"); } }); @@ -241,7 +241,7 @@ public class ParentPane extends BasicPane { this.cardLayout.show(parentCardPane, "Custom"); this.customParentColumnRowPane.populate(columnRow); } else { - this.cardLayout.show(parentCardPane, "None"); + this.cardLayout.show(parentCardPane, "Fine-Design_Report_None"); this.customParentColumnRowPane.populate(ColumnRow.valueOf(0, 0)); } } diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java index efb1f2a92b..4ed329cbe4 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java @@ -238,7 +238,7 @@ public class HFAttributesEditDialog extends BasicPane { } private void addReportFontPaneToTab() { - this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FRFont"), this.frFontPane); + this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font"), this.frFontPane); } private void addFormatPaneToTab() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java index 0e91c4e931..c8f73fd645 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java @@ -433,7 +433,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane { } else if (selectionType == CellSelection.CHOOSE_COLUMN) { type.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Column")); } else { - type.setText(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float")); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java index f30a03332a..a16bceaa40 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java @@ -54,7 +54,7 @@ class CptApp extends AbstractWorkBookApp { WorkBook tpl = new WorkBook(); // richer:打开报表通知 - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "..."); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", file.getName()) + "..."); TempNameStyle namestyle = TempNameStyle.getInstance(); namestyle.clear(); String checkStr = StringUtils.EMPTY; @@ -62,7 +62,7 @@ class CptApp extends AbstractWorkBookApp { checkStr = ResourceIOUtils.inputStream2String(file.asInputStream()); tpl.readStream(file.asInputStream()); } catch (Exception exp) { - String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + String errorMessage = ComparatorUtils.equals(RemoteDeziConstants.INVALID_USER, checkStr) ? Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") : com.fr.design.i18n.Toolkit.i18nText("NS-exception_readError"); FineLoggerFactory.getLogger().error(errorMessage + file, exp); } @@ -92,13 +92,13 @@ class CptApp extends AbstractWorkBookApp { jd.setResizable(false); jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); String message = namelist.toString().replaceAll("\\[", "").replaceAll("\\]", ""); - UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Global_Style_Missed", message)); + UILabel jl = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Global_Style_Missed", message)); jl.setHorizontalAlignment(SwingConstants.CENTER); jd.add(jl, BorderLayout.CENTER); JPanel jp = new JPanel(); // ”是“按钮，点击之后将生成一个全局样式，并写入xml - UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Yes")); + UIButton confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Yes")); confirmButton.addActionListener(new ActionListener() { @Override @@ -116,7 +116,7 @@ class CptApp extends AbstractWorkBookApp { } }); - UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_No")); + UIButton noButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No")); noButton.addActionListener(new ActionListener() { @Override @@ -128,7 +128,7 @@ class CptApp extends AbstractWorkBookApp { jp.add(confirmButton); jp.add(noButton); - jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Custom_Style_Missed")); + jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Custom_Style_Missed")); jd.add(jp, BorderLayout.SOUTH); GUICoreUtils.centerWindow(jd); jd.setVisible(true); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java index 6b4d274d36..2f45b413fb 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/CptxApp.java @@ -26,7 +26,7 @@ class CptxApp extends AbstractWorkBookApp { @Override public WorkBook asIOFile(FILE file) { - FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Opening_And_Waiting", file.getName()) + "..."); + FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", file.getName()) + "..."); WorkBookX tpl; InputStream inputStream; try { 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 16c85da0cc..194f99dbf3 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 @@ -159,7 +159,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); JPanel twoPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); twoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation")); + JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation")); JPanel innerorientationPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); orientationPane.add(innerorientationPane); twoPane.add(orientationPane); @@ -878,7 +878,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); // page order - JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Page_Order")); + JPanel outpageOrderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Order")); JPanel pageOrderPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2); outpageOrderPane.add(pageOrderPane); defaultPane.add(outpageOrderPane); @@ -1033,4 +1033,4 @@ public class PageSetupPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java b/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java index 8c65a1db05..0c62a9ab05 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ValueVerifierEditPane.java @@ -18,8 +18,8 @@ import java.awt.*; public class ValueVerifierEditPane extends JPanel { private UITableEditorPane tableEditorPane; private final String[] columnNames = new String[] { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Formula_Verify_Warn_Text") }; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula_Verify_Warn_Text") }; public ValueVerifierEditPane() { // ben:UITableEditorPane； diff --git a/designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java b/designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java index b3c3e0fea7..857631c328 100644 --- a/designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/mobile/MobileOthersPane.java @@ -27,7 +27,7 @@ public class MobileOthersPane extends BasicBeanPane { JPanel borderPane = FRGUIPaneFactory.createTitledBorderPane(this.title4PopupWindow()); JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); contentPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L1, 0, 0)); - appearRefreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Appear_Refresh")); + appearRefreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Appear_Refresh")); contentPane.add(appearRefreshCheckPane, BorderLayout.WEST); borderPane.add(contentPane); this.add(borderPane); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index b95123ea43..09390731c9 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -89,17 +89,17 @@ public class ReportWebWidgetConstants { // 导出成Excel 分页导出 - public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page"), + public static final WidgetOption EXCELP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelP.class); // 导出成Excel 原样导出 - public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Simple"), + public static final WidgetOption EXCELO = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Simple"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出成Excel 分页分Sheet导出 - public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Excel_Page_To_Sheet"), + public static final WidgetOption EXCELS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel_Page_To_Sheet"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelS.class); // 导出成Word - public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); + public static final WidgetOption WORD = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word"), BaseUtils.readIcon("/com/fr/web/images/word.png"), Word.class); // 页面设置 public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class); // 导出 @@ -107,7 +107,7 @@ public class ReportWebWidgetConstants { .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class); // 当前页/总页数 - public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Page_Navi_Text"), + public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Page_Navi_Text"), BaseUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class); // 首页 public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), BaseUtils.readIcon("/com/fr/web/images/first.png"), @@ -172,4 +172,4 @@ public class ReportWebWidgetConstants { //Excel导入_增量 public static final WidgetOption IMPORTEXCEL_APPEND= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Append"), BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelAppend.class); -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 23bc43a2f4..6f9801c54f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -72,7 +72,7 @@ public class WebCssPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, - new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File"))); + new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); @@ -122,4 +122,4 @@ public class WebCssPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index 2a377abf69..b7aeec21fc 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -1,40 +1,41 @@ package com.fr.design.webattr; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.event.*; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.BorderFactory; -import javax.swing.ButtonGroup; - -import com.fr.design.gui.ibutton.UIRadioButton; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - import com.fr.base.FRContext; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.frpane.EditingStringListPane; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UIRadioButton; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.gui.frpane.EditingStringListPane; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.dialog.BasicPane; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; import com.fr.file.filter.ChooseFileFilter; - import com.fr.stable.CoreConstants; import com.fr.stable.StringUtils; import com.fr.web.attr.ReportWebAttr; +import javax.swing.BorderFactory; +import javax.swing.ButtonGroup; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.List; + public class WebJsPane extends BasicPane { private UITextField localText; private UITextField urlText; @@ -160,7 +161,7 @@ public class WebJsPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, - new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File"))); + new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"))); if (fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) { final FILE file = fileChooser.getSelectedFILE(); @@ -197,7 +198,7 @@ public class WebJsPane extends BasicPane { FRContext.getLogger().error(e.getMessage(), e); } if (in == null) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed")); } else { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully")); try { @@ -283,4 +284,4 @@ public class WebJsPane extends BasicPane { } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java index 45e1d7ece7..844397ad18 100644 --- a/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java +++ b/designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java @@ -526,7 +526,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane { Object cv = ((ColumnValue) value).obj; if (cv instanceof ColumnRowGroup && ((ColumnRowGroup) cv).getSize() >= CELL_GROUP_LIMIT) { this.setText("[" + - Toolkit.i18nText("Fine-Design_Write_Select_Cell_Count", ((ColumnRowGroup) cv).getSize()) + Toolkit.i18nText("Fine-Design_Report_Write_Select_Cell_Count", ((ColumnRowGroup) cv).getSize()) + "]"); tip = cv.toString() + " " + tip; } else if (cv != null) { @@ -548,4 +548,4 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane { } } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java index bb58ce0965..0875b1568c 100644 --- a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java +++ b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java @@ -46,12 +46,12 @@ public class SubmitVisitorListPane extends ObjectJControlPane { */ public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Build_In_Sql"), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Type_Build_In_Sql"), "/com/fr/web/images/reportlet.png", BuiltInSQLSubmiter.class, BuildInSQLPane.class), new NameObjectCreator( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Custom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Type_Custom"), "/com/fr/web/images/reportlet.png", WClassSubmiter.class, CustomPane.class) @@ -186,9 +186,9 @@ public class SubmitVisitorListPane extends ObjectJControlPane { } csjConfigComboBox = new UIComboBox(configTypes.toArray()); - JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Choose_Submit_Type") + ":"), csjConfigComboBox}, + JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), csjConfigComboBox}, FlowLayout.LEFT, 10); - typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Type"))); + typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type"))); this.add(typePane, BorderLayout.NORTH); this.add(customCardPane, BorderLayout.CENTER); @@ -253,4 +253,4 @@ public class SubmitVisitorListPane extends ObjectJControlPane { return "custom"; } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java index c875fdcb42..35c836da69 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java @@ -305,7 +305,7 @@ public abstract class CellQuickEditor extends QuickEditor { ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText()); // barry:检查输入是否正确 if (!ColumnRow.validate(columnRowEdit)) { - Object[] options = {com.fr.design.i18n.Toolkit.i18nText("OK")}; + Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")}; JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), com.fr.design.i18n.Toolkit.i18nText("Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]); // 重新选中当前的selection,把columnRowTextField diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index a4c4949bd6..28bfe0086f 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java @@ -575,7 +575,7 @@ public class CellDSColumnEditor extends CellQuickEditor { //补充空白数据 JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); - useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fill_blank_Data")); + useMultiNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data")); JPanel checkBoxPane = new JPanel(new BorderLayout()); checkBoxPane.add(useMultiNumCheckBox, BorderLayout.WEST); multiNumPane.add(checkBoxPane); @@ -1215,4 +1215,4 @@ public class CellDSColumnEditor extends CellQuickEditor { public Object getComboBoxSelected() { return ActionFactory.createAction(DSColumnCellAction.class); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java index d02fcb0164..40739f7b2c 100644 --- a/designer-realize/src/main/java/com/fr/start/Designer.java +++ b/designer-realize/src/main/java/com/fr/start/Designer.java @@ -391,7 +391,7 @@ public class Designer extends BaseDesigner { if (DesignerMode.isAuthorityEditing()) { if (plus instanceof JWorkBook && plus.toolbars4Target() == null) { //聚合块编辑 - return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Poly_Block_Edit")); + return super.polyToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Privilege_Poly_Block_Edit")); } else { return plus.toolBar4Authority(); } diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index bfcb4fefeb..211e67db3e 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -2,12 +2,14 @@ package com.fr.start.module; import com.fr.design.DesignerEnvManager; import com.fr.design.env.DesignerWorkspaceGenerator; +import com.fr.design.env.DesignerWorkspaceInfo; import com.fr.design.mainframe.TemplatePane; -import com.fr.general.ComparatorUtils; import com.fr.module.Activator; + import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; + /** * Created by juhaoyu on 2018/1/8. * 设计器启动时的环境相关模块activator @@ -24,8 +26,10 @@ public class DesignerWorkspaceProvider extends Activator { } else { try { String current = DesignerEnvManager.getEnvManager().getCurEnvName(); - Workspace workspace = DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getWorkspaceInfo(current)); - if (workspace == null) { + DesignerWorkspaceInfo workspaceInfo = DesignerEnvManager.getEnvManager().getWorkspaceInfo(current); + Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo); + boolean checkValid = workspace == null ? false : workspaceInfo.checkValid(); + if (!checkValid) { TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); } else { WorkContext.switchTo(workspace);