冲突

designer_form/src/com/fr/design/designer/creator/XElementCase.java

@@ -38,14 +38,17 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 
 	public XElementCase(ElementCaseEditor widget, Dimension initSize) {
 		super(widget, initSize);
+
+
 	}
-	
+
 	protected void initXCreatorProperties() {
 		super.initXCreatorProperties();
+
 		// 报表块初始化时要加载对应的borderStyle
 		initBorderStyle();
 	}
-	
+
 	/**
      * 是否支持设置标题
      * @return 是返回true
@@ -93,13 +96,13 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		ElementCaseEditor editor = this.toData();
 		ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : editor.getReportFitAttr();
 		PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), reportFitAttr);
+
 		if (editor.getReportFitAttr() == null) {
 			editor.setReportFitInPc(processor.getFitStateInPC(fitAttr));
 		}
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor);
 	}
 
-
 	@Override
 	protected String getIconName() {
 		return "text_field_16.png";
@@ -132,7 +135,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		}
 		return editor;
 	}
-	
+
 	/**
 	 * 从data中获取到图片背景, 并设置到Label上
 	 */
@@ -140,10 +143,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		UILabel imageLable = new UILabel();
 		BufferedImage image = toData().getECImage();
 		setLabelBackground(image, imageLable);
-        
+
         return imageLable;
 	}
-	
+
 	/**
 	 * 设置指定Label的背景
 	 */
@@ -193,7 +196,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     public boolean canEnterIntoParaPane(){
         return false;
     }
-    
+
     /**
      * 返回报表块对应的widget
      * @return 返回ElementCaseEditor
@@ -201,11 +204,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
     public ElementCaseEditor toData() {
     	return ((ElementCaseEditor) data);
     }
-    
+
 	public FormElementCaseProvider getElementCase() {
 		return toData().getElementCase();
 	}
-	
+
 	public String getElementCaseContainerName() {
 		return toData().getWidgetName();
 	}
@@ -213,20 +216,20 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	public void setElementCase(FormElementCaseProvider el) {
 		toData().setElementCase(el);
 	}
-	
+
 	public void setBackground(BufferedImage image){
 		toData().setECImage(image);
 		setEditorIcon(image);
 	}
-	
+
 	private void setEditorIcon(BufferedImage image){
 		setLabelBackground(image, imageLable);
 	}
-	
+
 	public Dimension getSize(){
 		return new Dimension(this.getWidth(), this.getHeight());
 	}
-	
+
 	/**
 	 * 响应点击事件
 	 * @param editingMouseListener 事件处理器
@@ -236,8 +239,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 		super.respondClick(editingMouseListener, e);
 		switchTab(e,editingMouseListener);
 	}
-	
-	
+
+
     private void switchTab(MouseEvent e,EditingMouseListener editingMouseListener){
     	FormDesigner designer = editingMouseListener.getDesigner();
         if (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR){