Pull request #2600: REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒

Merge in DESIGN/design from ~YYMING/design:release/10.0 to release/10.0

* commit '9eb3b753972900ca7e58c1a0b355ee771f6fff37':
  REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒
  REPORT-41333 【冒烟】全局参数添加两个参数p1p2，将p2重命名为p1，不会有参数名重复的提醒

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

@@ -7,7 +7,7 @@ import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameableCreator;
 import com.fr.design.gui.controlpane.NameableSelfCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.design.gui.ilist.ModNameActionListener;
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -18,79 +18,74 @@ import java.util.Arrays;
 import java.util.List;
 
 public class ParameterArrayPane extends JListControlPane {
-	/**
+    /**
-	 * Constructor.
+     * Constructor.
-	 */
+     */
-	public ParameterArrayPane() {
+    public ParameterArrayPane() {
-		super();
+        super();
-		this.addModNameActionListener(new ModNameActionListener() {
+        this.addModNameActionListener((index, oldName, newName) -> populateSelectedValue());
-			public void nameModed(int index, String oldName, String newName) {
+        this.addEditingListener(new PropertyChangeAdapter() {
-				populateSelectedValue();
+            public void propertyChange() {
-			}
+                Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters();
+                String[] allListNames = nameableList.getAllNames();
+                allListNames[editingIndex] = StringUtils.EMPTY;
+                String tempName = getEditingName();
+                if (StringUtils.isEmpty(tempName)) {
+                    nameableList.stopEditing();
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
+                    setIllegalIndex(editingIndex);
+                    return;
+                }
+                if (!ComparatorUtils.equals(tempName, selectedName)
+                        && isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
+                    nameableList.stopEditing();
+                    FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
+                            Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
+                    setIllegalIndex(editingIndex);
+                }
+            }
+        });
+    }
 
-		});
-		this.addEditingListener(new PropertyChangeAdapter() {
-			public void propertyChange() {
-				Parameter[] parameters = ParameterConfig.getInstance().getGlobalParameters();
-				String[] allListNames = nameableList.getAllNames();
-				allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
-				String tempName = getEditingName();
-				if (StringUtils.isEmpty(tempName)) {
-					nameableList.stopEditing();
-					FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
-					setIllegalIndex(editingIndex);
-					return;
-				}
-				if (!ComparatorUtils.equals(tempName, selectedName)
-						&& isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
-					nameableList.stopEditing();
-					FineJOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
-					setIllegalIndex(editingIndex);
-				}
-			}
-		});
-	}
 
+    @Override
+    protected String title4PopupWindow() {
+        return Toolkit.i18nText("Fine-Design_Basic_Engine_Schedule_Template_Parameter");
+    }
 
-	@Override
+    /**
-	protected String title4PopupWindow() {
+     * 创建模板参数设置组件
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Schedule_Template_Parameter");
+     *
-	}
+     * @return 模板参数设置组件
-
+     */
-	/**
+    public NameableCreator[] createNameableCreators() {
-	 * 创建模板参数设置组件
+        return new NameableCreator[]{
-	 *
+                new NameableSelfCreator(Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), Parameter.class, ParameterPane.class) {
-	 * @return 模板参数设置组件
+                    public Parameter createNameable(UnrepeatedNameHelper helper) {
-	 */
+                        // 返回参数设置面板.
-	public NameableCreator[] createNameableCreators() {
+                        return new Parameter(helper.createUnrepeatedName("p"));
-		return new NameableCreator[]{
+                    }
-				new NameableSelfCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Parameter_Name"), Parameter.class, ParameterPane.class) {
-					public Parameter createNameable(UnrepeatedNameHelper helper) {
-						// 返回参数设置面板.
-						return new Parameter(helper.createUnrepeatedName("p"));
-					}
 
-					@Override
+                    @Override
-					public String createTooltip() {
+                    public String createTooltip() {
-						return null;
+                        return null;
-					}
+                    }
-				}
+                }
-		};
+        };
-	}
+    }
 
 
-	/**
+    /**
-	 * 更新参数
+     * 更新参数
      *
      * @return 更新后的参数
-	 */
+     */
-	public Parameter[] updateParameters() {
+    public Parameter[] updateParameters() {
-		// Nameable[]居然不能强转成Parameter[],一定要这么写...
+        // Nameable[]居然不能强转成Parameter[],一定要这么写...
-		Nameable[] res = this.update();
+        Nameable[] res = this.update();
-		Parameter[] res_array = new Parameter[res.length];
+        Parameter[] res_array = new Parameter[res.length];
-		java.util.Arrays.asList(res).toArray(res_array);
+        Arrays.asList(res).toArray(res_array);
 
-		return res_array;
+        return res_array;
-	}
+    }
 }