From b0632510201afbee0be3566faac961d9c468bce2 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 25 Jul 2018 20:40:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CORE-116=20=E5=9B=BD=E9=99=85=E5=8C=96+Data?= =?UTF-8?q?Model=E7=9B=B8=E5=85=B3=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/server/ConnectionListAction.java | 17 +-- .../actions/server/GlobalTableDataAction.java | 21 +-- .../com/fr/design/constants/UIConstants.java | 2 +- .../design/data/BasicTableDataTreePane.java | 3 +- .../data/datapane/TableDataPaneListPane.java | 20 +-- .../datapane/connect/ConnectionListPane.java | 17 ++- .../tabledatapane/ProcedureListPane.java | 6 +- .../com/fr/design/env/RemoteWorkspace.java | 4 +- .../java/com/fr/design/gui/NameInspector.java | 8 ++ .../gui/controlpane/JListControlPane.java | 134 +++--------------- .../gui/controlpane/ObjectJControlPane.java | 51 +------ .../gui/controlpane/UIListControlPane.java | 70 --------- .../fr/design/gui/icombobox/LazyComboBox.java | 2 +- .../com/fr/design/gui/ilist/JNameEdList.java | 40 +++--- .../fr/design/gui/ilist/ListModelElement.java | 2 +- .../com/fr/design/gui/ilist/UINameEdList.java | 10 -- .../gui/itree/filetree/EnvFileTree.java | 4 +- .../refreshabletree/RefreshableJTree.java | 3 +- .../design/parameter/ParameterArrayPane.java | 8 +- .../fr/design/remote/ui/UserManagerPane.java | 16 +-- .../src/main/java/com/fr/env/EnvListPane.java | 8 +- .../main/java/com/fr/start/BaseDesigner.java | 4 +- 22 files changed, 104 insertions(+), 346 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/gui/NameInspector.java diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java index 56f2018e1..5eeea95d1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java @@ -8,18 +8,17 @@ import com.fr.design.data.datapane.connect.ConnectionShowPane; import com.fr.design.data.datapane.connect.DatabaseConnectionPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.gui.NameInspector; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.file.ConnectionConfig; import com.fr.general.IOUtils; - -import com.fr.locale.InterProviderFactory; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; -import javax.swing.KeyStroke; +import javax.swing.*; import java.awt.event.ActionEvent; import java.util.Map; @@ -130,17 +129,9 @@ public class ConnectionListAction extends UpdateAction { */ public static int isConnectionMapContainsRename(ConnectionConfig datasourceManager) { Map tableDataMap = datasourceManager.getConnections(); - String rename = InterProviderFactory.getProvider().getLocText("FR-Engine_Please_Rename") + "!"; - if (tableDataMap.containsKey(rename)) { - return datasourceManager.getConnectionIndex(rename); + if (tableDataMap.containsKey(NameInspector.ILLEGAL_NAME_HOLDER)) { + return datasourceManager.getConnectionIndex(NameInspector.ILLEGAL_NAME_HOLDER); } - //todo 这边同上面和远程修改数据集属性有关先屏蔽 -// for (int i = tableDataRenameIndex; i >= 1; i--) { -// rename = InterProviderFactory.getProvider().getLocText("FR-Engine_Please_Rename") + i + "!"; -// if (nameTableDataMap.map.containsKey(rename)) { -// return nameTableDataMap.map.indexOf(rename); -// } -// } return -1; } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index 86738a470..288970cf8 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -14,6 +14,7 @@ import com.fr.design.data.tabledata.ResponseDataSourceChange; import com.fr.design.data.tabledata.tabledatapane.TableDataManagerPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.gui.NameInspector; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; @@ -128,14 +129,6 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS globalTableDataDialog.setVisible(true); } - /** - * 是否正常更新完datasourceManager - * - * @param datasourceManager - * @param tableDataManagerPane - * @param databaseListDialog - * @return - */ private boolean doWithDatasourceManager(TableDataConfig datasourceManager, TableDataManagerPane tableDataManagerPane, BasicDialog databaseListDialog) { boolean isFailed = false; // @@ -156,17 +149,9 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS */ public int isTableDataMapContainsRename(TableDataConfig datasourceManager) { Map tableDataMap = datasourceManager.getTableDatas(); - String rename = InterProviderFactory.getProvider().getLocText("FR-Engine_Please_Rename") + "!"; - if (tableDataMap.containsKey(rename)) { - return datasourceManager.getTableDataIndex(rename); + if (tableDataMap.containsKey(NameInspector.ILLEGAL_NAME_HOLDER)) { + return datasourceManager.getTableDataIndex(NameInspector.ILLEGAL_NAME_HOLDER); } - //todo 这边同上面和远程修改数据集属性有关先屏蔽 -// for (int i = tableDataRenameIndex; i >= 1; i--) { -// rename = InterProviderFactory.getProvider().getLocText("FR-Engine_Please_Rename") + i + "!"; -// if (nameTableDataMap.map.containsKey(rename)) { -// return nameTableDataMap.map.indexOf(rename); -// } -// } return -1; } 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 088fc47a9..dfc6ccf13 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("Loading") + "..."; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."; } }; /** 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 aeab603af..b9565f1b4 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 @@ -4,6 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.TableData; import com.fr.data.TableDataSource; +import com.fr.data.core.StoreProcedureAssist; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; @@ -142,7 +143,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp private boolean isIncludeUnderline(String name) { - return ComparatorUtils.equals(name.indexOf(StoreProcedure.SPLIT), -1) ? false : true; + return ComparatorUtils.equals(name.indexOf(StoreProcedureAssist.GROUP_MARKER), -1) ? false : true; } public abstract TableDataTree getDataTree(); 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 6b9f388a7..447bee445 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 @@ -2,11 +2,13 @@ package com.fr.design.data.datapane; import com.fr.base.TableData; import com.fr.data.TableDataSource; +import com.fr.data.core.StoreProcedureAssist; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.data.DesignTableDataManager; import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.ilist.ListModelElement; +import com.fr.design.i18n.Toolkit; import com.fr.file.ProcedureConfig; import com.fr.file.TableDataConfig; import com.fr.general.ComparatorUtils; @@ -34,7 +36,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData public TableDataPaneListPane() { super(); dsNameChangedMap.clear(); - this.addEditingListner(new PropertyChangeAdapter() { + this.addEditingListener(new PropertyChangeAdapter() { @Override public void propertyChange() { isNamePermitted = true; @@ -47,22 +49,22 @@ public class TableDataPaneListPane extends JListControlPane implements TableData if (StringUtils.isEmpty(tempName)) { isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); - setWarnigText(editingIndex); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips")); + setIllegalIndex(editingIndex); return; } if (!ComparatorUtils.equals(tempName, selectedName) - && isNameRepeted(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) { + && isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips")); - setWarnigText(editingIndex); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_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), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); - setWarnigText(editingIndex); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips")); + setIllegalIndex(editingIndex); } if (nameableList.getSelectedValue() instanceof ListModelElement) { Nameable selected = ((ListModelElement) nameableList.getSelectedValue()).wrapper; @@ -101,7 +103,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData } private boolean isIncludeUnderline(String name) { - return ComparatorUtils.equals(name.indexOf(StoreProcedure.SPLIT), -1) ? false : true; + return ComparatorUtils.equals(name.indexOf(StoreProcedureAssist.GROUP_MARKER), -1) ? false : true; } /** 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 3999b694b..d0ec90951 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 @@ -8,6 +8,7 @@ import com.fr.design.fun.ConnectionProvider; import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.i18n.Toolkit; import com.fr.file.ConnectionConfig; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; @@ -28,13 +29,13 @@ import java.util.Set; * Connection List Pane. */ public class ConnectionListPane extends JListControlPane implements ConnectionShowPane { - public static final String TITLE_NAME = com.fr.design.i18n.Toolkit.i18nText("Server-Define_Data_Connection"); + public static final String TITLE_NAME = Toolkit.i18nText("Server-Define_Data_Connection"); private boolean isNamePermitted = true; private HashMap renameMap = new HashMap(); public ConnectionListPane() { renameMap.clear(); - this.addEditingListner(new PropertyChangeAdapter() { + this.addEditingListener(new PropertyChangeAdapter() { public void propertyChange() { isNamePermitted = true; String[] allListNames = nameableList.getAllNames(); @@ -43,17 +44,17 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name")); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); isNamePermitted = false; return; } if (!ComparatorUtils.equals(tempName, selectedName) - && isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) { + && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) { isNamePermitted = false; nameableList.stopEditing(); - String message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); + String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); } if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) { rename(selectedName, tempName); @@ -65,9 +66,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh protected void rename(String oldName, String newName) { - if (renameMap.containsKey(selectedName)) { - renameMap.remove(selectedName); - } + renameMap.remove(selectedName); renameMap.put(selectedName, newName); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java index d87b2dfbb..804f9a22a 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureListPane.java @@ -22,7 +22,7 @@ import java.util.List; public class ProcedureListPane extends JListControlPane { public ProcedureListPane() { super(); - this.addEditingListner(new PropertyChangeAdapter() { + this.addEditingListener(new PropertyChangeAdapter() { @Override public void propertyChange() { TableDataSource source = DesignTableDataManager.getEditingTableDataSource(); @@ -34,7 +34,7 @@ public class ProcedureListPane extends JListControlPane { if(StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); //JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), com.fr.design.i18n.Toolkit.i18nText("NOT_NULL_Des") + "," + com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!"); - setWarnigText(nameableList.getSelectedIndex()); + setIllegalIndex(nameableList.getSelectedIndex()); return; } for(int i = 0; i < allDSNames.length; i++) { @@ -42,7 +42,7 @@ public class ProcedureListPane extends JListControlPane { if (ComparatorUtils.equals(dsname, tempName)) { // JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ProcedureListPane.this), com.fr.design.i18n.Toolkit.i18nText(new String[]{"already_exists", "TableData"}) // + tempName + "," + com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!"); - setWarnigText(nameableList.getSelectedIndex()); + setIllegalIndex(nameableList.getSelectedIndex()); break; } } diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java index d113752c3..35bc5d82f 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java @@ -1,6 +1,6 @@ package com.fr.design.env; -import com.fr.locale.InterProviderFactory; +import com.fr.design.i18n.Toolkit; import com.fr.stable.AssistUtils; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; @@ -36,7 +36,7 @@ public class RemoteWorkspace implements Workspace { @Override public String getDescription() { - return InterProviderFactory.getProvider().getLocText("Fine-Designer_Basic_Remote_Env"); + return Toolkit.i18nText("Fine-Design_Basic_Remote_Env"); } @Override 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 new file mode 100644 index 000000000..fa9b90278 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/NameInspector.java @@ -0,0 +1,8 @@ +package com.fr.design.gui; + +import com.fr.design.i18n.Toolkit; + +public class NameInspector { + + public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips"); +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index 3bd04b057..73fccc9e5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -9,42 +9,32 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.design.gui.HyperlinkFilterHelper; +import com.fr.design.gui.NameInspector; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ModNameActionListener; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.LineSeparator; import com.fr.design.menu.MenuDef; import com.fr.design.menu.ShortCut; -import com.fr.design.menu.ToolBarDef; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; - +import com.fr.general.IOUtils; +import com.fr.invoke.Reflect; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.core.PropertyChangeAdapter; -import javax.swing.DefaultListCellRenderer; -import javax.swing.DefaultListModel; -import javax.swing.Icon; -import javax.swing.JList; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import java.awt.BorderLayout; -import java.awt.CardLayout; -import java.awt.Component; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Comparator; @@ -207,7 +197,7 @@ public abstract class JListControlPane extends JControlPane { * * @param l 监听 */ - public void addEditingListner(PropertyChangeAdapter l) { + public void addEditingListener(PropertyChangeAdapter l) { this.nameableList.addEditingListner(l); } @@ -240,8 +230,8 @@ public abstract class JListControlPane extends JControlPane { return this.nameableList.getAllTypes()[editingIndex]; } - public void setWarnigText(int index) { - this.nameableList.setWarnigText(index); + public void setIllegalIndex(int index) { + this.nameableList.setIllegalIndex(index); } /** @@ -253,7 +243,7 @@ public abstract class JListControlPane extends JControlPane { return el == null ? null : el.wrapper.getName(); } - protected boolean isNameRepeted(java.util.List[] list, String name) { + protected boolean isNameRepeated(java.util.List[] list, String name) { for (int i = 0; i < list.length; i++) { if (list[i].contains(name)) { isNameRepeated = true; @@ -673,9 +663,6 @@ public abstract class JListControlPane extends JControlPane { } } - /* - * Nameable的ListCellRenerer - */ private class NameableListCellRenderer extends DefaultListCellRenderer { @Override @@ -685,12 +672,12 @@ public abstract class JListControlPane extends JControlPane { cellHasFocus); if (value instanceof ListModelElement) { - Nameable wrappee = ((ListModelElement) value).wrapper; - this.setText(((ListModelElement) value).wrapper.getName()); - + ListModelElement element = ((ListModelElement) value); + Nameable nameable = element.wrapper; + this.setText(nameable.getName()); boolean iconSet = false; for (NameableCreator creator : JListControlPane.this.creators()) { - if (creator.menuIcon() != null && creator.acceptObject2Populate(wrappee) != null) { + if (creator.menuIcon() != null && creator.acceptObject2Populate(nameable) != null) { this.setIcon(creator.menuIcon()); this.setToolTipText(creator.createTooltip()); iconSet = true; @@ -698,10 +685,9 @@ public abstract class JListControlPane extends JControlPane { } } if (!iconSet) { - this.setIcon(BaseUtils.readIcon("/com/fr/base/images/oem/cpt.png")); + this.setIcon(IOUtils.readIcon("/com/fr/base/images/oem/cpt.png")); } } - return this; } } @@ -736,52 +722,6 @@ public abstract class JListControlPane extends JControlPane { } } - public class SortEnableShortCut extends ShortCut4JControlPane { - public SortEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1); - } - - } - - public class MoveUpEnableShortCut extends ShortCut4JControlPane { - public MoveUpEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1 - && JListControlPane.this.nameableList.getSelectedIndex() > 0); - } - - } - - public class MoveDownEnableShortCut extends ShortCut4JControlPane { - public MoveDownEnableShortCut(ShortCut shortCut) { - this.shortCut = shortCut; - } - - /** - * 检查是否可用 - */ - @Override - public void checkEnable() { - this.shortCut.setEnabled(getModel().getSize() > 1 - && JListControlPane.this.nameableList.getSelectedIndex() < JListControlPane.this.nameableList.getModel().getSize() - 1); - } - - } private class JControlUpdatePane extends JPanel { private CardLayout card; @@ -871,45 +811,11 @@ public abstract class JListControlPane extends JControlPane { } protected BasicBeanPane createPaneByCreators(NameableCreator creator) { - try { - return creator.getUpdatePane().newInstance(); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - - protected BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { - Constructor constructor = null; - try { - constructor = creator.getUpdatePane().getDeclaredConstructor(new Class[]{String.class}); - constructor.setAccessible(true); - return (BasicBeanPane) constructor.newInstance(string); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - - } - - // 选项添加个数有限制等情况下 要求能控制快捷按钮的状态 - protected void setToolbarDefEnable(int shortCutIndex, int itemIndex, boolean enabled) { - ToolBarDef toolbarDef = getToolbarDef(); - if (toolbarDef.getShortCutCount() > shortCutIndex) { - ShortCut sc = toolbarDef.getShortCut(shortCutIndex); - if (sc instanceof AddItemMenuDef) { - AddItemMenuDef am = (AddItemMenuDef) sc; - if (am.getShortCutCount() > itemIndex) { - am.getShortCut(itemIndex).setEnabled(enabled); - } - } - } + return Reflect.on(creator.getUpdatePane()).create().get(); + } + + private BasicBeanPane createPaneByCreators(NameableCreator creator, String string) { + return Reflect.on(creator.getUpdatePane()).create(string).get(); } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java index d55dca8c6..05d7019d1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/ObjectJControlPane.java @@ -1,9 +1,7 @@ package com.fr.design.gui.controlpane; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; - import com.fr.design.beans.BasicBeanPane; +import com.fr.invoke.Reflect; /** * 生成带参数的BasicBeanPane @@ -25,52 +23,7 @@ public abstract class ObjectJControlPane extends JListControlPane { @Override protected BasicBeanPane createPaneByCreators(NameableCreator creator) { - try { - if (object == null) { - return super.createPaneByCreators(creator); - } else if (object.getClass().isArray()) { - return creator.getUpdatePane().getConstructor(object.getClass()).newInstance(object); - } else { - Constructor constructor = getConstructor(creator.getUpdatePane(), object.getClass()); - return constructor == null ? super.createPaneByCreators(creator) : constructor.newInstance(object); - } - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (SecurityException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } - } - - /** - * 传进BasicBeanPane的构造函数的参数，可能是 - * - * @param clazz - * @param cls - * @return - */ - private Constructor getConstructor(Class clazz, Class cls) { - Constructor constructor = null; - try { - constructor = clazz.getConstructor(cls); - } catch (SecurityException e) { - } catch (NoSuchMethodException e) { - } - if (constructor != null) { - return constructor; - } else { - if (cls.getName() == Object.class.getName()) { - return null; - } - return getConstructor(clazz, cls.getSuperclass()); - } + return Reflect.on(creator.getUpdatePane()).create(object).get(); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 77c79a04f..6f23a0b5c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -232,56 +232,6 @@ public abstract class UIListControlPane extends UIControlPane { isPopulating = false; } - /** - * 添加名字改变时的listener - * - * @param l 名字改变时的监听 - */ - public void addModNameActionListener(ModNameActionListener l) { - this.nameableList.addModNameActionListener(l); - } - - /** - * 添加Editinglistener - * - * @param l 监听 - */ - public void addEditingListner(PropertyChangeAdapter l) { - this.nameableList.addEditingListner(l); - } - - /* - * 刷新当前的选中的UpdatePane - */ - protected void populateSelectedValue() { - ((JControlUpdatePane) UIListControlPane.this.controlUpdatePane).populate(); - } - - /** - * 根据name,选中UINameEdList中的item - */ - public void setSelectedName(String name) { - DefaultListModel listModel = (DefaultListModel) this.nameableList.getModel(); - for (int i = 0, len = listModel.getSize(); i < len; i++) { - Nameable item = ((ListModelElement) listModel.getElementAt(i)).wrapper; - if (ComparatorUtils.equals(name, item.getName())) { - this.nameableList.setSelectedIndex(i); - break; - } - } - } - - public String getEditingName() { - return this.nameableList.getEditingName(); - } - - public Object getEditingType() { - return this.nameableList.getAllTypes()[editingIndex]; - } - - public void setWarnigText(int index) { - this.nameableList.setWarnigText(index); - } /** * 获取选中的名字 @@ -292,26 +242,6 @@ public abstract class UIListControlPane extends UIControlPane { return el == null ? null : el.wrapper.getName(); } - protected boolean isNameRepeted(java.util.List[] list, String name) { - for (int i = 0; i < list.length; i++) { - if (list[i].contains(name)) { - isNameRepeated = true; - return true; - } - } - isNameRepeated = false; - return false; - } - - /** - * 名字是否重复 - * - * @return 重复则返回true - */ - public boolean isNameRepeated() { - return isNameRepeated; - } - /** * 添加 Nameable * 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 2e74a2bf1..8ef44bf57 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("Loading") + "..."}; + private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."}; /** * 是否加载完成 diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java index 9ce0575d9..90aeff3dd 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/JNameEdList.java @@ -1,5 +1,7 @@ package com.fr.design.gui.ilist; +import com.fr.design.gui.NameInspector; +import com.fr.general.GeneralUtils; import com.fr.general.NameObject; import com.fr.base.Utils; import com.fr.design.gui.itextfield.UITextField; @@ -32,6 +34,10 @@ public class JNameEdList extends UIList implements CellEditorListener { transient protected int editingIndex; private PropertyChangeAdapter editingListner; private java.util.List ll = new ArrayList(); + /* + * 编辑第index个item + */ + private String oldName; public JNameEdList(ListModel dataModel) { super(dataModel); @@ -160,34 +166,27 @@ public class JNameEdList extends UIList implements CellEditorListener { public Object getType(int index) { Nameable nameable = ((ListModelElement) getModel().getElementAt(index)).wrapper; - if (nameable != null && nameable instanceof NameObject) { + if (nameable instanceof NameObject) { return ((NameObject) nameable).getObject(); } return null; } - - public void setWarnigText() { - setWarnigText(this.getSelectedIndex()); - } - - public void setWarnigText(int index) { - setNameAt(com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!", index); + public void setIllegalIndex(int index) { + setNameAt(NameInspector.ILLEGAL_NAME_HOLDER, index); this.repaint(); } - /* - * 设置index节点的名字 - */ - // b:edit改变name的时候怎么办？ public void setNameAt(String name, int index) { - Nameable nameable = ((ListModelElement) getModel().getElementAt(index)).wrapper; + ListModelElement element = (ListModelElement) getModel().getElementAt(index); + modifyNameable(element.wrapper, name, index); + } + + private void modifyNameable(Nameable nameable, String name, int index) { if (nameable != null) { String oldName = nameable.getName(); - if (isNameShouldNumber()) { - // kunsnat: 限制只能是数字(int型) - Number number = Utils.string2Number(name); + Number number = GeneralUtils.string2Number(name); if (number == null) { nameable.setName(oldName); } else { @@ -197,18 +196,12 @@ public class JNameEdList extends UIList implements CellEditorListener { } else { nameable.setName(name); } - for (int i = 0, len = ll.size(); i < len; i++) { ll.get(i).nameModed(index, oldName, name); } } } - /* - * 编辑第index个item - */ - private String oldName; - /** * 编辑第index项 * @@ -268,9 +261,8 @@ public class JNameEdList extends UIList implements CellEditorListener { private Component prepareEditor(ListCellEditor cellEditor, int index) { String name = getNameAt(index); boolean isSelected = this.isSelectedIndex(index); - Component comp = cellEditor.getListCellEditorComponent(this, name, isSelected, index); - return comp; + return cellEditor.getListCellEditorComponent(this, name, isSelected, index); } /* diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java b/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java index 13ced9dc3..73a5a3f09 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java @@ -1 +1 @@ -package com.fr.design.gui.ilist; import com.fr.general.ComparatorUtils; import com.fr.stable.Nameable; /** * Created by IntelliJ IDEA. * Author : Richer * Version: 7.0.3 * Date: 13-1-2 * Time: 下午2:39 */ public class ListModelElement { public Nameable wrapper; public ListModelElement(Nameable nameable) { this.wrapper = nameable; } public boolean equals(Object o) { return o instanceof ListModelElement && ComparatorUtils.equals(((ListModelElement) o).wrapper, wrapper); } } \ No newline at end of file +package com.fr.design.gui.ilist; import com.fr.general.ComparatorUtils; import com.fr.stable.Nameable; public class ListModelElement { public Nameable wrapper; public ListModelElement(Nameable nameable) { this.wrapper = nameable; } public boolean equals(Object o) { return o instanceof ListModelElement && ComparatorUtils.equals(((ListModelElement) o).wrapper, wrapper); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java index 8150d6870..c9e3f1d68 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/UINameEdList.java @@ -166,16 +166,6 @@ public class UINameEdList extends UIList implements CellEditorListener { return null; } - - public void setWarnigText() { - setWarnigText(this.getSelectedIndex()); - } - - public void setWarnigText(int index) { - setNameAt(com.fr.design.i18n.Toolkit.i18nText("Please_Rename") + "!", index); - this.repaint(); - } - /* * 设置index节点的名字 */ 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 af6822c95..a589491c3 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 @@ -5,10 +5,10 @@ import com.fr.design.constants.UIConstants; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.RefreshableJTree; +import com.fr.design.i18n.Toolkit; import com.fr.file.filetree.FileNode; import com.fr.file.filetree.FileNodeFilter; import com.fr.general.ComparatorUtils; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; @@ -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 + InterProviderFactory.getProvider().getLocText("Locked"); + name = name + Toolkit.i18nText("Fine-Design_Template_Status_Locked", "(", ")"); this.setIcon(FileTreeIcon.getIcon(node)); } else { this.setIcon(FileTreeIcon.getIcon(node, false)); 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 760bbe77c..ad8da4dd6 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 @@ -3,6 +3,7 @@ package com.fr.design.gui.itree.refreshabletree; import com.fr.design.constants.UIConstants; import com.fr.design.gui.itooltip.UIToolTip; 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; @@ -36,7 +37,7 @@ public abstract class RefreshableJTree extends CheckBoxTree { @Override public String toString() { - return InterProviderFactory.getProvider().getLocText("Loading") + "..."; + return Toolkit.i18nText("Fine-Design_Loading") + "..."; } }; 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 b243b10bc..76c5265fb 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 @@ -28,7 +28,7 @@ public class ParameterArrayPane extends JListControlPane { } }); - this.addEditingListner( new PropertyChangeAdapter() { + this.addEditingListener(new PropertyChangeAdapter() { public void propertyChange() { Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters(); String[] allListNames = nameableList.getAllNames(); @@ -37,15 +37,15 @@ public class ParameterArrayPane extends JListControlPane { if (StringUtils.isEmpty(tempName)) { nameableList.stopEditing(); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name")); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); return; } if (!ComparatorUtils.equals(tempName, selectedName) - && isNameRepeted(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) { + && 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")); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); } } }); 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 89fe84b63..b201abc55 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 @@ -6,6 +6,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.Toolkit; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.remote.ui.list.AddedMemberList; @@ -138,7 +139,7 @@ public class UserManagerPane extends BasicPane { sync2AddedMembersFormAdded(); // 不需要重复更新右侧列表显示 但是更新一下计数显示 countLabel.setText( - InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) ) ); @@ -206,7 +207,7 @@ public class UserManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Add_Member"); + return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member"); } private JPanel createLeftPanel() { @@ -216,7 +217,7 @@ public class UserManagerPane extends BasicPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), UITitledBorder.createBorderWithTitle( - InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Decision_Member") + Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member") ) ) ); @@ -228,7 +229,7 @@ public class UserManagerPane extends BasicPane { keyField.requestFocus(); keyField.addKeyListener(keyFieldKeyListener); keyField.getDocument().addDocumentListener(documentListener); - keyButton.setText(InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Search")); + keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search")); keyButton.addActionListener(keyButtonActionListener); searchPanel.add(keyField); searchPanel.add(keyButton); @@ -274,15 +275,14 @@ public class UserManagerPane extends BasicPane { content.setBorder( BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 0, 0), - UITitledBorder.createBorderWithTitle( - InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Selected_Member") + UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member") ) ) ); // 计数 countLabel.setText( - InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size())) ); countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0)); @@ -328,7 +328,7 @@ public class UserManagerPane extends BasicPane { addedList.revalidate(); addedList.repaint(); countLabel.setText( - InterProviderFactory.getProvider().getLocText("Fine-Designer_Remote_Design_Selected_Member_Count", + Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count", String.valueOf(addedMembers.size()) )); } 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 6b536b82b..f5a1e9e83 100644 --- a/designer-base/src/main/java/com/fr/env/EnvListPane.java +++ b/designer-base/src/main/java/com/fr/env/EnvListPane.java @@ -25,7 +25,7 @@ import java.util.List; public class EnvListPane extends JListControlPane { public EnvListPane() { super(); - addEditingListner(new PropertyChangeAdapter() { + addEditingListener(new PropertyChangeAdapter() { @Override public void propertyChange() { String tempName = getEditingName(); @@ -34,13 +34,13 @@ public class EnvListPane extends JListControlPane { 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")); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); return; } - if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeted(new List[]{Arrays.asList(allListNames)}, tempName)) { + 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)); - setWarnigText(editingIndex); + setIllegalIndex(editingIndex); } } }); 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 87d87e7ba..ff4a018ef 100644 --- a/designer-base/src/main/java/com/fr/start/BaseDesigner.java +++ b/designer-base/src/main/java/com/fr/start/BaseDesigner.java @@ -9,6 +9,7 @@ import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.file.MutilTempalteTabPane; import com.fr.design.file.TemplateTreePane; import com.fr.design.fun.DesignerStartOpenFileProcessor; +import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; @@ -18,7 +19,6 @@ import com.fr.file.FILE; import com.fr.file.FILEFactory; import com.fr.file.FileFILE; import com.fr.general.ComparatorUtils; -import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; import com.fr.module.ModuleEvent; import com.fr.stable.OperatingSystem; @@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { private void init(String[] args) { //初始化 - EventDispatcher.fire(ModuleEvent.MajorModuleStarting, InterProviderFactory.getProvider().getLocText("FR-Designer_Initializing")); + EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("FR-Design_Initializing")); // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到 DesignUtils.initLookAndFeel(); // 初始化Log Handler From ba7ea6eda8b1b520689cc36a0d169a878cbf3186 Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 26 Jul 2018 09:19:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/gui/ilist/ListModelElement.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java b/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java index 73a5a3f09..9a97cafcb 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java +++ b/designer-base/src/main/java/com/fr/design/gui/ilist/ListModelElement.java @@ -1 +1,19 @@ -package com.fr.design.gui.ilist; import com.fr.general.ComparatorUtils; import com.fr.stable.Nameable; public class ListModelElement { public Nameable wrapper; public ListModelElement(Nameable nameable) { this.wrapper = nameable; } public boolean equals(Object o) { return o instanceof ListModelElement && ComparatorUtils.equals(((ListModelElement) o).wrapper, wrapper); } } \ No newline at end of file +package com.fr.design.gui.ilist; + +import com.fr.general.ComparatorUtils; +import com.fr.stable.Nameable; + + +public class ListModelElement { + + public Nameable wrapper; + + public ListModelElement(Nameable nameable) { + this.wrapper = nameable; + } + + public boolean equals(Object o) { + return o instanceof ListModelElement + && ComparatorUtils.equals(((ListModelElement) o).wrapper, wrapper); + } +} \ No newline at end of file From 3597ec45a32083effcfcc7270099a508fff6e489 Mon Sep 17 00:00:00 2001 From: richie Date: Thu, 26 Jul 2018 09:20:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?CORE-116=20=E7=BB=A7=E7=BB=AD=E5=AE=8C?= =?UTF-8?q?=E5=96=84API=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/data/BasicTableDataTreePane.java | 2 +- .../java/com/fr/design/data/datapane/TableDataPaneListPane.java | 2 +- designer-base/src/main/java/com/fr/start/BaseDesigner.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 b9565f1b4..cf671e526 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 @@ -4,7 +4,7 @@ import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.TableData; import com.fr.data.TableDataSource; -import com.fr.data.core.StoreProcedureAssist; +import com.fr.data.api.StoreProcedureAssist; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; 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 447bee445..75f318208 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 @@ -2,7 +2,7 @@ package com.fr.design.data.datapane; import com.fr.base.TableData; import com.fr.data.TableDataSource; -import com.fr.data.core.StoreProcedureAssist; +import com.fr.data.api.StoreProcedureAssist; import com.fr.data.impl.storeproc.StoreProcedure; import com.fr.design.data.DesignTableDataManager; import com.fr.design.gui.controlpane.JListControlPane; 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 ff4a018ef..50613edc9 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("FR-Design_Initializing")); + EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing")); // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到 DesignUtils.initLookAndFeel(); // 初始化Log Handler