回退一些可能冲突的格式化修改

designer_base/src/com/fr/design/layout/FRGUIPaneFactory.java

@@ -1,12 +1,24 @@
 package com.fr.design.layout;
 
-import com.fr.design.border.UITitledBorder;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.LayoutManager;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
 import com.fr.design.gui.ilable.UILabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
 
-import javax.swing.*;
-import java.awt.*;
+import com.fr.design.border.UITitledBorder;
 
 public class FRGUIPaneFactory {
+	private FRGUIPaneFactory() {
+	}
+
 	public static final float WIDTH_PARA_F = 80.0f;
 	public static final int WIDTH_OFFSET_N = 60;
 	public static final int WIDTH_OFFSET_M = 20;
@@ -15,12 +27,8 @@ public class FRGUIPaneFactory {
 	public static final int HEIGHT_PARA = 25;
 	public static final int HEIGHT_OFFSET = 50;
 
-    private FRGUIPaneFactory() {
-    }
-
     /**
      * 创建一个靠右靠左的水平间隙为2的流式布局
-     *
      * @return FlowLayout对象
      */
 	public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
@@ -29,7 +37,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左的布局
-     *
 	 * @return FlowLayout对象
 	 */
 	public static LayoutManager createLeftZeroLayout() {
@@ -38,7 +45,6 @@ public class FRGUIPaneFactory {
 
     /**
      * 创建一个靠左的水平和垂直间隙均为5的流式布局
-     *
      * @return FlowLayout对象
      */
 	public static LayoutManager createLabelFlowLayout() { // createLabelFlowLayout
@@ -47,7 +53,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左流式布局，间距10,10
-     *
 	 * @return FlowLayout对象
 	 */
 	public static LayoutManager createL_FlowLayout() {
@@ -56,7 +61,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个居中流式布局
-     *
 	 * @return FlowLayout对象
 	 */
 	public static LayoutManager createCenterFlowLayout() {
@@ -65,7 +69,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠右流式布局
-     *
 	 * @return FlowLayout对象
 	 */
 	public static LayoutManager createRightFlowLayout() {
@@ -74,7 +77,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个边框布局
-     *
 	 * @return BorderLayout对象
 	 */
 	public static LayoutManager createBorderLayout() {
@@ -83,17 +85,16 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个边框布局，间距4,4
-     *
 	 * @return BorderLayout对象
 	 */
 	public static LayoutManager createM_BorderLayout() {
-        return new BorderLayout(4, 4);
+		return new   BorderLayout(4,4);
 	}
 
+	// TODO 删掉
 
 	/**
 	 * 创建一个1列的网格布局
-     *
 	 * @return FRGridLayout对象
 	 */
 	public static LayoutManager create1ColumnGridLayout() {
@@ -102,7 +103,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个2列的网格布局
-     *
 	 * @return FRGridLayout对象
 	 */
 	public static LayoutManager create2ColumnGridLayout() {
@@ -111,7 +111,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个n列的网格布局
-     *
 	 * @param nColumn 列数
 	 * @return FRGridLayout对象
 	 */
@@ -121,7 +120,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个带标题边框面板
-     *
 	 * @param string 边框标题
 	 * @return JPanel对象
 	 */
@@ -135,7 +133,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个带标题边框面板并且居中显示
-     *
 	 * @param borderTitle 边框标题
 	 * @return JPanel对象
 	 */
@@ -149,7 +146,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左空边框布局，间隔大
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createBigHGapFlowInnerContainer_M_Pane() {
@@ -161,7 +157,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左空边框面板，间隔中等
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createMediumHGapFlowInnerContainer_M_Pane() {
@@ -173,7 +168,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左空边框面板，间隔中等
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createMediumHGapHighTopFlowInnerContainer_M_Pane() {
@@ -185,7 +179,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个正常靠左空边框面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createNormalFlowInnerContainer_M_Pane() {
@@ -197,7 +190,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左0间距边框面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createLeftFlowZeroGapBorderPane() {
@@ -209,7 +201,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左流式布局，正常流式内嵌
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createNormalFlowInnerContainer_S_Pane() {
@@ -220,7 +211,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠左流式布局，流式内嵌
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createBoxFlowInnerContainer_S_Pane() {
@@ -231,7 +221,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个靠右面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createRightFlowInnerContainer_S_Pane() {
@@ -242,7 +231,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个居中面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createCenterFlowInnerContainer_S_Pane() {
@@ -253,7 +241,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建一个居中0间距面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createCenterFlowZeroGapBorderPane() {
@@ -265,7 +252,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建纵向排列面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createY_AXISBoxInnerContainer_L_Pane() {
@@ -277,7 +263,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建纵向边框面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createYBoxEmptyBorderPane() {
@@ -289,7 +274,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建横向面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createX_AXISBoxInnerContainer_L_Pane() {
@@ -301,7 +285,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建纵向面板M
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createY_AXISBoxInnerContainer_M_Pane() {
@@ -313,7 +296,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建横向内置boxlayout的面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createX_AXISBoxInnerContainer_M_Pane() {
@@ -325,7 +307,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建纵向内置boxlayout的面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createY_AXISBoxInnerContainer_S_Pane() {
@@ -336,7 +317,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建横向内置boxlayout的面板
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createX_AXISBoxInnerContainer_S_Pane() {
@@ -347,7 +327,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建n列网格面板
-     *
 	 * @param nColumn 列数
 	 * @return JPanel对象
 	 */
@@ -359,7 +338,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建n列网格面板
-     *
 	 * @param nColumn 列数
 	 * @param h 水平间距
 	 * @param v 垂直间距
@@ -373,7 +351,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建顶格n列网格面板
-     *
 	 * @param nColumn 列数
 	 * @return JPanel对象
 	 */
@@ -385,7 +362,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建边框面板L
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createBorderLayout_L_Pane() {
@@ -397,7 +373,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建边框面板M
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createBorderLayout_M_Pane() {
@@ -409,7 +384,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建边框面板S
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createBorderLayout_S_Pane() {
@@ -420,7 +394,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建卡片式布局
-     *
 	 * @return JPanel对象
 	 */
 	public static JPanel createCardLayout_S_Pane() {
@@ -431,7 +404,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 创建图标IconRadio面板
-     *
 	 * @param icon 图标
 	 * @param jradiobtn 按钮
 	 * @return JPanel对象
@@ -451,7 +423,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 计算宽度
-     *
 	 * @param width 宽度输入值
 	 * @return w 宽度输出值
 	 */
@@ -472,7 +443,6 @@ public class FRGUIPaneFactory {
 
 	/**
 	 * 计算高度
-     *
 	 * @param height 高度输入值
 	 * @return 高度输出值
 	 */