代码规范

代码规范

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);

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;
     }
 

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);
 }
 

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];
     }
 }

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