冲突

designer/src/com/fr/design/report/mobile/MobileRadioGroupPane.java

@@ -1,11 +1,11 @@
 package com.fr.design.report.mobile;
 
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * Created by Administrator on 2016/5/16/0016.
  */
-public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState>{
+public class MobileRadioGroupPane extends BasicBeanPane<MobileFitAttrState> {
 
     private List<UIRadioButton> radioButtons = new ArrayList<UIRadioButton>();
 

designer/src/com/fr/design/report/mobile/ReportMobileAttrPane.java

@@ -1,10 +1,10 @@
 package com.fr.design.report.mobile;
 
+import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.Inter;
 import com.fr.report.mobile.ElementCaseMobileAttr;
-import com.fr.base.mobile.MobileFitAttrState;
 
 import javax.swing.*;
 import java.awt.*;
@@ -12,7 +12,7 @@ import java.awt.*;
 /**
  * Created by Administrator on 2016/5/12/0012.
  */
-public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr>{
+public class ReportMobileAttrPane extends BasicBeanPane<ElementCaseMobileAttr> {
 
     //横屏设置面板
     private MobileRadioGroupPane horizionPane;