From 181473e663020e1bb4ac35a507a0665cfac749d4 Mon Sep 17 00:00:00 2001
From: zpc <zpc@finereport.com>
Date: Mon, 25 Jul 2016 17:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

代码规范
---
 .../fr/design/report/freeze/RepeatAndFreezeSettingPane.java | 2 +-
 .../fr/design/designer/creator/CRPropertyDescriptor.java    | 4 ++--
 .../com/fr/design/fun/ParameterWindowEditorProcessor.java   | 5 ++---
 .../fun/impl/AbstractParameterWindowEditorProcessor.java    | 6 +++---
 .../com/fr/design/designer/creator/XWParameterLayout.java   | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)
 rename {designer_form => designer_base}/src/com/fr/design/designer/creator/CRPropertyDescriptor.java (92%)

diff --git a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
index 7cf1763027..fd24573fe3 100644
--- a/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
+++ b/designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java
@@ -218,7 +218,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
 		JPanel freezePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
 		//自适应插件
-		JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Attention"));
+		JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Attention"));
 
 		BoxCenterAligmentPane actionLabel = getURLActionLabel(Inter.getLocText("FR-Designer_Form-Fit-Tip"));
 		infoPane.add(actionLabel, BorderLayout.SOUTH);
diff --git a/designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptor.java b/designer_base/src/com/fr/design/designer/creator/CRPropertyDescriptor.java
similarity index 92%
rename from designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptor.java
rename to designer_base/src/com/fr/design/designer/creator/CRPropertyDescriptor.java
index c56e150c0b..3155653243 100644
--- a/designer_form/src/com/fr/design/designer/creator/CRPropertyDescriptor.java
+++ b/designer_base/src/com/fr/design/designer/creator/CRPropertyDescriptor.java
@@ -3,7 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import com.fr.design.gui.xtable.AbstractPropertyGroupModel;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
@@ -15,6 +14,7 @@ import java.beans.PropertyDescriptor;
  * @since 6.5.3
  */
 public final class CRPropertyDescriptor extends PropertyDescriptor {
+    public static final String RENDERER = "renderer";
 	
 	private PropertyChangeAdapter l;
 	
@@ -51,7 +51,7 @@ public final class CRPropertyDescriptor extends PropertyDescriptor {
     }
 
     public CRPropertyDescriptor setRendererClass(Class<?> clazz) {
-        this.putKeyValue(AbstractPropertyGroupModel.RENDERER, clazz);
+        this.putKeyValue(RENDERER, clazz);
         return this;
     }
 
diff --git a/designer_base/src/com/fr/design/fun/ParameterWindowEditorProcessor.java b/designer_base/src/com/fr/design/fun/ParameterWindowEditorProcessor.java
index 869556065b..d1eb60a889 100644
--- a/designer_base/src/com/fr/design/fun/ParameterWindowEditorProcessor.java
+++ b/designer_base/src/com/fr/design/fun/ParameterWindowEditorProcessor.java
@@ -1,8 +1,7 @@
 package com.fr.design.fun;
 
+import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.stable.fun.mark.Immutable;
-import java.beans.PropertyDescriptor;
-
 
 /**
  * Created by zpc on 16/7/21.
@@ -16,6 +15,6 @@ public interface ParameterWindowEditorProcessor extends Immutable {
     /**
      * 生成属性表
      */
-    PropertyDescriptor[] createPropertyDescriptor(Class<?> temp);
+    CRPropertyDescriptor[] createPropertyDescriptor(Class<?> temp);
 }
 
diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractParameterWindowEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractParameterWindowEditorProcessor.java
index fcdd432b2a..0d449090f7 100644
--- a/designer_base/src/com/fr/design/fun/impl/AbstractParameterWindowEditorProcessor.java
+++ b/designer_base/src/com/fr/design/fun/impl/AbstractParameterWindowEditorProcessor.java
@@ -1,8 +1,8 @@
 package com.fr.design.fun.impl;
 
+import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.fun.ParameterWindowEditorProcessor;
 import com.fr.stable.fun.mark.API;
-import java.beans.PropertyDescriptor;
 
 
 /**
@@ -25,7 +25,7 @@ public abstract class AbstractParameterWindowEditorProcessor implements Paramete
      * 生成属性表
      */
     @Override
-    public PropertyDescriptor[] createPropertyDescriptor(Class<?> temp) {
-        return new PropertyDescriptor[0];
+    public CRPropertyDescriptor[] createPropertyDescriptor(Class<?> temp) {
+        return new CRPropertyDescriptor[0];
     }
 }
\ No newline at end of file
diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java
index 6f13b32b76..9e5520716e 100644
--- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java
@@ -73,9 +73,9 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         if (processor == null) {
             return  propertyTableEditor;
         }
-        PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass());
+        CRPropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass());
 
-        return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
+        return ArrayUtils.addAll(propertyTableEditor, extraEditor);
     }
     
 	@Override