REPORT-58584

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -9,7 +9,6 @@ import com.fr.data.impl.storeproc.StoreProcedure;
 import com.fr.design.data.BasicTableDataUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.dialog.FineJOptionPane;
-import com.fr.design.gui.NameInspector;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.ilist.ListModelElement;
@@ -25,18 +24,18 @@ import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
-
 import com.fr.third.org.apache.commons.collections4.MapUtils;
 import com.fr.workspace.WorkContext;
-import javax.swing.*;
+
+import javax.swing.DefaultListModel;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * TableDataList Pane.
@@ -52,15 +51,12 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             @Override
             public void propertyChange() {
                 isNamePermitted = true;
-                String tempName = getEditingName();
+                if (!checkName()) {
-                if (ComparatorUtils.equals(tempName, selectedName)) {
+                    isNamePermitted = false;
-                    //说明双击之后又取消了,啥也不用做
                     return;
                 }
-                Set<String> allDSNames = DesignTableDataManager.getGlobalDataSet().keySet();
-                String[] allListNames = nameableList.getAllNames();
-                allListNames[editingIndex] = StringUtils.EMPTY;
 
+                String tempName = getEditingName();
                 Object editingType = getEditingType();
 
                 if (!BasicTableDataUtils.checkName(tempName)) {
@@ -70,35 +66,36 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                     return;
                 }
 
-                if (StringUtils.isEmpty(tempName)) {
+                if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) {
-                    isNamePermitted = false;
-                    nameableList.stopEditing();
-                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this),
-                            Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"),
-                            Toolkit.i18nText("Fine-Design_Report_Alert"),
-                            JOptionPane.WARNING_MESSAGE);
-                    setIllegalIndex(editingIndex);
-                    return;
-                }
-                boolean isRepeated = isNameRepeated(new Collection[]{allDSNames, Arrays.asList(allListNames)}, tempName);
-                if (isRepeated) {
-                    isNamePermitted = false;
-                    nameableList.stopEditing();
-                    FineJOptionPane.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();
                     FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
                     setIllegalIndex(editingIndex);
+                    return;
                 }
+
                 if (nameableList.getSelectedValue() instanceof ListModelElement) {
-                    rename(selectedName, isRepeated ? NameInspector.ILLEGAL_NAME_HOLDER : tempName);
+                    rename(selectedName, tempName);
                 }
             }
         });
     }
 
+    @Override
+    public String getEmptyNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips");
+    }
+
+    @Override
+    public String getDuplicatedNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", getEditingName());
+    }
+
+    @Override
+    public Collection getExtraItemsToCheckNameRepeat() {
+        return DesignTableDataManager.getGlobalDataSet().keySet();
+    }
+
     @Override
     public void rename(String oldName, String newName) {
         //如果a改成了b,b又被改成了c,就认为是a改成了c

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -7,7 +7,6 @@ import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
@@ -15,21 +14,18 @@ import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
-import com.fr.general.ComparatorUtils;
+import com.fr.file.ConnectionOperator;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
-
 import com.fr.third.org.apache.commons.collections4.MapUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.file.ConnectionOperator;
+
 import java.awt.Window;
-import javax.swing.*;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,32 +44,24 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         this.addEditingListener(new PropertyChangeAdapter() {
             public void propertyChange() {
                 isNamePermitted = true;
-                String[] allListNames = nameableList.getAllNames();
+                if (!checkName()) {
-                allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
-                String tempName = getEditingName();
-                if (StringUtils.isEmpty(tempName)) {
-                    nameableList.stopEditing();
-                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
-                    setIllegalIndex(editingIndex);
                     isNamePermitted = false;
                     return;
                 }
-                if (!ComparatorUtils.equals(tempName, selectedName)
+                rename(selectedName, getEditingName());
-                        && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
-                    isNamePermitted = false;
-                    nameableList.stopEditing();
-                    String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
-                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
-                    setIllegalIndex(editingIndex);
             }
-                if (isNamePermitted && !ComparatorUtils.equals(tempName, selectedName)) {
+        });
-                    rename(selectedName, tempName);
     }
 
-            }
+    @Override
-        });
+    public String getEmptyNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name");
     }
 
+    @Override
+    public String getDuplicatedNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", getEditingName());
+    }
 
     protected void rename(String oldName, String newName) {
         //如果a改成了b,b又被改成了c,就认为是a改成了c

designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java

@@ -1,7 +1,5 @@
 package com.fr.design.gui.controlpane;
 
-import com.fr.base.Parameter;
-import com.fr.base.ParameterConfig;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -28,14 +26,14 @@ import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import java.util.Arrays;
-import java.util.Collection;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
-import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 
 import static javax.swing.JOptionPane.WARNING_MESSAGE;
 
@@ -433,28 +431,47 @@ public abstract class JListControlPane extends JControlPane implements ListContr
 
     }
 
-    public void showTipWithIllegalName(String tip) {
+    public boolean checkName() {
-        Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters();
-        String[] allListNames = nameableList.getAllNames();
-        allListNames[editingIndex] = StringUtils.EMPTY;
         String tempName = getEditingName();
+        if (ComparatorUtils.equals(tempName, selectedName)) {
+            return false;
+        }
+
         if (StringUtils.isEmpty(tempName)) {
             nameableList.stopEditing();
-            FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(JListControlPane.this),
+            showWarningDialog(getEmptyNameTip());
-                    Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
             setIllegalIndex(editingIndex);
-            return;
+            return false;
         }
 
-        if (!ComparatorUtils.equals(tempName, selectedName)
+        String[] allListNames = nameableList.getAllNames();
-                && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
+        allListNames[editingIndex] = StringUtils.EMPTY;
+        if (isNameRepeated(new Collection[]{getExtraItemsToCheckNameRepeat(), Arrays.asList(allListNames)}, tempName)) {
             nameableList.stopEditing();
+            showWarningDialog(getDuplicatedNameTip());
+            setIllegalIndex(editingIndex);
+            return false;
+        }
+        return true;
+    }
+
+    public String getEmptyNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Not_Null_Des");
+    }
+
+    public String getDuplicatedNameTip() {
+        return StringUtils.EMPTY;
+    }
+
+    public Collection getExtraItemsToCheckNameRepeat() {
+        return new ArrayList();
+    }
+
+    private void showWarningDialog(String tip) {
         FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(JListControlPane.this),
                 tip,
                 Toolkit.i18nText("Fine-Design_Basic_Alert"),
                 WARNING_MESSAGE);
-            setIllegalIndex(editingIndex);
-        }
     }
 
 }

designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java

@@ -1,6 +1,7 @@
 package com.fr.design.parameter;
 
 import com.fr.base.Parameter;
+import com.fr.base.ParameterConfig;
 import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.NameableSelfCreator;
@@ -10,6 +11,7 @@ import com.fr.stable.Nameable;
 import com.fr.stable.core.PropertyChangeAdapter;
 
 import java.util.Arrays;
+import java.util.Collection;
 
 public class ParameterArrayPane extends JListControlPane {
     
@@ -23,11 +25,25 @@ public class ParameterArrayPane extends JListControlPane {
         this.addModNameActionListener((index, oldName, newName) -> populateSelectedValue());
         this.addEditingListener(new PropertyChangeAdapter() {
             public void propertyChange() {
-                showTipWithIllegalName(Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
+                checkName();
             }
         });
     }
 
+    @Override
+    public String getEmptyNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name");
+    }
+
+    @Override
+    public String getDuplicatedNameTip() {
+        return Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name");
+    }
+
+    @Override
+    public Collection getExtraItemsToCheckNameRepeat() {
+        return Arrays.asList(ParameterConfig.getInstance().getGlobalParameters());
+    }
 
     @Override
     protected String title4PopupWindow() {

designer-realize/src/main/java/com/fr/design/widget/WidgetConfigPane.java

@@ -25,11 +25,16 @@ public class WidgetConfigPane extends JListControlPane {
 		super();
 		this.addEditingListener(new PropertyChangeAdapter() {
 			public void propertyChange() {
-				showTipWithIllegalName(Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure"));
+				checkName();
 			}
 		});
 	}
 
+	@Override
+	public String getDuplicatedNameTip() {
+		return Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure");
+	}
+
 	/**
      * 创建用户自定义widget组件
      *