From d5bfb700b78be1fef00195f5573898b5cc569035 Mon Sep 17 00:00:00 2001
From: "yaoh.wu" <yaoh.wu@fanruan.com>
Date: Thu, 23 Mar 2017 09:33:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/creator/DedicateLayoutContainer.java    |  2 +-
 .../com/fr/design/mainframe/FormSelectionUtils.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java
index a31999f68a..d929399d4a 100644
--- a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java
+++ b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java
@@ -62,7 +62,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
     public void resetCreatorName(String name) {
         super.resetCreatorName(name);
         XCreator child = getXCreator(XWScaleLayout.INDEX);
-        //TODO 这里是怎么实现改名的
+        //实现WTitleLayout的SetWidgetName
         child.toData().setWidgetName(name);
     }
 
diff --git a/designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java b/designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java
index e96080e4dc..8816e1c8b4 100644
--- a/designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java
+++ b/designer_form/src/com/fr/design/mainframe/FormSelectionUtils.java
@@ -121,10 +121,10 @@ public class FormSelectionUtils {
 
     private static Widget copyWidget(FormDesigner formDesigner, XCreator xCreator) throws
             CloneNotSupportedException {
-        ArrayList<String> clonedNameList = new ArrayList<String>();
+        ArrayList<String> nameSpace = new ArrayList<String>();
         Widget copied = (Widget) xCreator.toData().clone();
         //重命名拷贝的组件
-        String name = getCopiedName(formDesigner, copied, clonedNameList);
+        String name = getCopiedName(formDesigner, copied, nameSpace);
         if (copied instanceof WTitleLayout) {
             XWTitleLayout xwTitleLayout = new XWTitleLayout((WTitleLayout) copied, xCreator.getSize());
             xwTitleLayout.resetCreatorName(name);
@@ -144,15 +144,15 @@ public class FormSelectionUtils {
      *
      * @param formDesigner
      * @param copied
-     * @param clonedNameList
+     * @param nameSpace
      * @return name
      */
-    private static String getCopiedName(FormDesigner formDesigner, Widget copied, ArrayList<String> clonedNameList) {
+    private static String getCopiedName(FormDesigner formDesigner, Widget copied, ArrayList<String> nameSpace) {
         String name = copied.getWidgetName();
         do {
             name += postfix;
-        } while (formDesigner.getTarget().isNameExist(name) || clonedNameList.contains(name));
-        clonedNameList.add(name);
+        } while (formDesigner.getTarget().isNameExist(name) || nameSpace.contains(name));
+        nameSpace.add(name);
         return name;
     }