消除PMD错误

designer/src/com/fr/poly/hanlder/BottomCornerMouseHanlder.java

@@ -170,7 +170,7 @@ public class BottomCornerMouseHanlder extends MouseInputAdapter {
 		 * @return 重叠
 		 */
 		@Override
-		public boolean getWidgetsIntersects() {
+		public boolean isWidgetsIntersects() {
 			return false;
 		}
 

designer_base/src/com/fr/design/beans/location/MoveUtils.java

@@ -83,7 +83,7 @@ public class MoveUtils {
 		 * 获取designer内部组件是否重叠的标志位
 		 * @return 重叠
 		 */
-		boolean getWidgetsIntersects();
+		boolean isWidgetsIntersects(); //TODO 消除PMD检查错误，把getWidgetsIntersects改成isWidgetsIntersects
 
 		/**
 		 * 获取designer相对屏幕的位置

designer_base/src/com/fr/design/gui/itable/AbstractPropertyTable.java

@@ -33,6 +33,7 @@ public abstract class AbstractPropertyTable extends JTable {
 	public static final Color PROPERTY_SELECTION_BACKGROUND = new Color(153, 204, 255);
 	// 属性表的行高
 	public static final int PROPERTY_TABLE_ROW_HEIGHT = 22;
+    private static final int PROPERTY_ICON_WIDTH = 10;
 
     public AbstractPropertyTable() {
         this.setTableProperties();
@@ -182,7 +183,7 @@ public abstract class AbstractPropertyTable extends JTable {
                     int row = AbstractPropertyTable.super.rowAtPoint(e.getPoint());
                     if (row != -1) {
                         Point pIndex = getGroupIndex(row);
-                        if (pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < 10) {
+                        if (pIndex.y == 0 && e.getClickCount() == 1 && e.getX() < PROPERTY_ICON_WIDTH) {
                             toggleCollapse(pIndex.x);
                         }
                     }

designer_form/src/com/fr/design/designer/beans/ConnectorCreator.java

@@ -13,7 +13,7 @@ public class ConnectorCreator {
 	public static final int UNIT = 10;
 	public static final int SIDE = 2;
 	public static final int CORNER_LOSS = 20;
-	public static final int vector[][] = { { UNIT, 0 }, { -UNIT, 0 }, { 0, UNIT }, { 0, -UNIT } };
+	public static final int VECTOR[][] = { { UNIT, 0 }, { -UNIT, 0 }, { 0, UNIT }, { 0, -UNIT } };
 	
 	private long timeOut = 200;
 	private boolean beyond;
@@ -178,8 +178,8 @@ public class ConnectorCreator {
 		}
 
 		void pushInto() {
-			for (int i = 0; i < vector.length; i++) {
-				Point temp = new Point(p.x + vector[i][0], p.y + vector[i][1]);
+			for (int i = 0; i < VECTOR.length; i++) {
+				Point temp = new Point(p.x + VECTOR[i][0], p.y + VECTOR[i][1]);
 				if (parent != null && parent.x == temp.x && parent.y == temp.y) {
 					continue;
 				}
@@ -191,8 +191,8 @@ public class ConnectorCreator {
 		}
 		
 		boolean reCheck() {
-			for (int i = 0; i < vector.length; i++) {
-				Point temp = new Point(p.x + SIDE * vector[i][0], p.y + SIDE * vector[i][1]);
+			for (int i = 0; i < VECTOR.length; i++) {
+				Point temp = new Point(p.x + SIDE * VECTOR[i][0], p.y + SIDE * VECTOR[i][1]);
 				AssessedPoint ap = new AssessedPoint(temp, this, loss(temp));
 				if (check(temp)) {
 					open.add(ap);

designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java

@@ -11,6 +11,7 @@ import com.fr.design.designer.creator.*;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormSelection;
 import com.fr.design.utils.ComponentUtils;
+import com.fr.form.main.Form;
 import com.fr.form.ui.container.WAbsoluteLayout;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.form.ui.widget.BoundsWidget;
@@ -66,10 +67,8 @@ public abstract class AccessDirection implements Direction {
 	protected void sorptionPoint(Point point, Rectangle current_bounds,FormDesigner designer) {
 		boolean findInX = current_bounds.getWidth() <= MoveUtils.SORPTION_UNIT ? true : false;
 		boolean findInY = current_bounds.getHeight() <= MoveUtils.SORPTION_UNIT ? true : false;
-
 		WAbsoluteLayout layout =getLayout(designer);
 		FormSelection selection = designer.getSelectionModel().getSelection();
-
 		boolean isWidgetsIntersect = false;
 		for (int i = 0, count = layout.getWidgetCount(); i < count; i++) {
 			BoundsWidget temp = (BoundsWidget) layout.getWidget(i);
@@ -111,7 +110,10 @@ public abstract class AccessDirection implements Direction {
 			}
 		}
 		processRectangleIntersects(designer, point.x, point.y, isWidgetsIntersect);
+		setDesignerStateModelProperties(designer, findInX, findInY, current_bounds, point);
+	}
 
+	private void setDesignerStateModelProperties (FormDesigner designer, boolean findInX, boolean findInY, Rectangle current_bounds, Point point) {
 		designer.getStateModel().setXAbsorptionline(findInX && current_bounds.getWidth() > MoveUtils.SORPTION_UNIT ? Absorptionline.createXAbsorptionline(point.x) : null);
 		designer.getStateModel().setYAbsorptionline(findInY && current_bounds.getHeight() > MoveUtils.SORPTION_UNIT ? Absorptionline.createYAbsorptionline(point.y) : null);
 		designer.getStateModel().setEquidistantLine(null);

designer_form/src/com/fr/design/designer/beans/location/Inner.java

@@ -46,89 +46,99 @@ public class Inner extends AccessDirection {
 		return new Point(x, y);
 	}
 
-	@Override
-	protected void sorptionPoint(Point point, Rectangle current_bounds, final FormDesigner designer) {
-		RectangleDesigner rd = new RectangleDesigner() {
-			public void setXAbsorptionline(Absorptionline line) {
-				designer.getStateModel().setXAbsorptionline(line);
-			}
-			public void setYAbsorptionline(Absorptionline line) {
-				designer.getStateModel().setYAbsorptionline(line);
-			}
-			
-			/**
-			 * 获取当前选中块的水平线数组
-			 * 
-			 * @return 块的水平线数组
-			 * 
-			 */
-			public int[] getHorizontalLine(){
-				return ArrayUtils.EMPTY_INT_ARRAY;
-			}
-			
-			/**
-			 * 获取当前选中块的垂直线数组
-			 * 
-			 * @return 块的垂直线数组
-			 * 
-			 */
-			public int[] getVerticalLine(){
-				return ArrayUtils.EMPTY_INT_ARRAY;
-			}
-			public RectangleIterator createRectangleIterator() {
-				return getRectangleIterator(designer);
-			}
+    //TODO 原先这个类是通过一个new一个匿名类继承RectangleDesigner接口实现的，但是报了方法超过50行的PMD错误
+    //TODO 暂时就先这样命名，请原作者看到后重新命名
+	private class RectangleDesigner1 implements RectangleDesigner {
+		private FormDesigner designer = null;
 
-			/**
-			 * 设置designer内部组件是否重叠的标志位
-			 *
-			 * @param isIntersects 是否重叠
-			 */
-			@Override
-			public void setWidgetsIntersects(boolean isIntersects) {
-				designer.setWidgetsIntersect(isIntersects);
-			}
+		public RectangleDesigner1(FormDesigner designer) {
+			this.designer = designer;
+		}
 
-			/**
-			 * 获取designer内部组件是否重叠的标志位
-			 *
-			 * @return 重叠
-			 */
-			@Override
-			public boolean getWidgetsIntersects() {
-				return designer.isWidgetsIntersect();
-			}
+		public void setXAbsorptionline(Absorptionline line) {
+			designer.getStateModel().setXAbsorptionline(line);
+		}
+		public void setYAbsorptionline(Absorptionline line) {
+			designer.getStateModel().setYAbsorptionline(line);
+		}
 
-			/**
-			 * 获取designer相对屏幕的位置
-			 *
-			 * @return 位置
-			 */
-			@Override
-			public Point getDesignerLocationOnScreen() {
-				return designer.getLocationOnScreen();
-			}
+		/**
+		 * 获取当前选中块的水平线数组
+		 *
+		 * @return 块的水平线数组
+		 *
+		 */
+		public int[] getHorizontalLine(){
+			return ArrayUtils.EMPTY_INT_ARRAY;
+		}
 
-			/**
-			 * 设置等距线
-			 *
-			 * @param line 吸附线
-			 */
-			@Override
-			public void setEquidistantLine(Absorptionline line) {
-				designer.getStateModel().setEquidistantLine(line);
-			}
+		/**
+		 * 获取当前选中块的垂直线数组
+		 *
+		 * @return 块的垂直线数组
+		 *
+		 */
+		public int[] getVerticalLine(){
+			return ArrayUtils.EMPTY_INT_ARRAY;
+		}
+		public RectangleIterator createRectangleIterator() {
+			return getRectangleIterator(designer);
+		}
 
-			@Override
-			public int getDesignerScrollHorizontalValue() {
-				return designer.getArea().getHorizontalValue();
-			}
+		/**
+		 * 设置designer内部组件是否重叠的标志位
+		 *
+		 * @param isIntersects 是否重叠
+		 */
+		@Override
+		public void setWidgetsIntersects(boolean isIntersects) {
+			designer.setWidgetsIntersect(isIntersects);
+		}
 
-			@Override
-			public int getDesignerScrollVerticalValue() {
-				return designer.getArea().getVerticalValue();
-			}
-		};
+		/**
+		 * 获取designer内部组件是否重叠的标志位
+		 *
+		 * @return 重叠
+		 */
+		@Override
+		public boolean isWidgetsIntersects() {
+			return designer.isWidgetsIntersect();
+		}
+
+		/**
+		 * 获取designer相对屏幕的位置
+		 *
+		 * @return 位置
+		 */
+		@Override
+		public Point getDesignerLocationOnScreen() {
+			return designer.getLocationOnScreen();
+		}
+
+		/**
+		 * 设置等距线
+		 *
+		 * @param line 吸附线
+		 */
+		@Override
+		public void setEquidistantLine(Absorptionline line) {
+			designer.getStateModel().setEquidistantLine(line);
+		}
+
+		@Override
+		public int getDesignerScrollHorizontalValue() {
+			return designer.getArea().getHorizontalValue();
+		}
+
+		@Override
+		public int getDesignerScrollVerticalValue() {
+			return designer.getArea().getVerticalValue();
+		}
+	}
+
+	@Override
+	protected void sorptionPoint(Point point, Rectangle current_bounds, final FormDesigner designer) {
+		RectangleDesigner1 rd = new RectangleDesigner1(designer);
 		//判断当前操作的是不是参数面板，要特殊处理
 		boolean isParameterLayout = ((XCreator)(designer.getSelectionModel().getSelection().getSelectedCreator().getParent())).acceptType(XWParameterLayout.class);
 		point.setLocation(MoveUtils.sorption(point.x, point.y, current_bounds.width, current_bounds.height, rd, isParameterLayout));

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -231,7 +231,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 			);
 			g2d.setColor(Color.BLACK);
 			//画编辑文字
-			g2d.drawString(Inter.getLocText("Edit"), x + w / 2 - 2, y + h / 2 + 5);
+			g2d.drawString(Inter.getLocText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5);
 		}
 	}
 

designer_form/src/com/fr/design/mainframe/ConnectorHelper.java

@@ -19,6 +19,8 @@ public class ConnectorHelper {
 	
 	public static final int NEAR = 5;
 	private static double ratio = 0.5;
+    // TODO 为了消除魔术数错误，我不清楚这个15代表什么，先这样命名了，原作者看到了请改一下
+	private final static int magicNumber1 = 15;
 	private ArrayList<Point> drawingPoint;
 	private FormDesigner designer;
 	private boolean drawing;
@@ -67,7 +69,6 @@ public class ConnectorHelper {
 		ConnectorCreator cc = new ConnectorCreator(designer.getTarget().getContainer(), new Point(startPoint), new Point(endPoint));
 		ArrayList<Point> p = cc.createPointList();
 		long e = System.currentTimeMillis();
-		System.out.println("useTime:" + (e - s));
 		return p;
 	}
 
@@ -87,7 +88,7 @@ public class ConnectorHelper {
 	public void createDefalutLine() {
 		if (drawingPoint != null
 				&& drawingPoint.size() > 1
-				&& ConnectorCreator.getMinimumDistance(drawingPoint.get(0), drawingPoint.get(drawingPoint.size() - 1)) > 15) {
+				&& ConnectorCreator.getMinimumDistance(drawingPoint.get(0), drawingPoint.get(drawingPoint.size() - 1)) > magicNumber1) {
 			((XWAbsoluteLayout) designer.getRootComponent()).addConnector(new Connector().addAll(drawingPoint));
 		}
 		drawingPoint = null;

designer_form/src/com/fr/design/mainframe/MobileWidgetTable.java

@@ -96,7 +96,7 @@ public class MobileWidgetTable extends JTable {
         @Override
         public void mousePressed(MouseEvent e) {
             getInstance().setCellSelected();
-            if (selectedRow == 0 && !e.isPopupTrigger() && e.getClickCount() == 1 && e.getX() < 10){ // 如果是点击在第一行
+            if (selectedRow == 0 && !e.isPopupTrigger() && e.getClickCount() == 1 && e.getX() < WIDGET_TABLE_ROW_HEIGHT / 2){ // 如果是点击在第一行
                     toggleCollapse();
             }
         }
@@ -268,9 +268,10 @@ public class MobileWidgetTable extends JTable {
             //WCardLayout里面并不是控件，而仍然是容器TabFitLayout，故要向下获取控件
             //WCardTitlelLayout是XWCardLayout的标题容器，里面同样不是控件，不能获取MobileList
             //WTitleLayout是标题容器，比如图表的标题，里面是图表控件和Label标题控件，但是不需要获取MobileList
-            if (selectedModel.acceptType(WCardLayout.class) || selectedModel.acceptType(WCardTitleLayout.class)
-            || selectedModel.acceptType(WTitleLayout.class) || selectedModel.acceptType(WCardMainBorderLayout.class)) {
-                return new String[0][0];
+            if (selectedModel.acceptType(WCardLayout.class) || selectedModel.acceptType(WCardTitleLayout.class)) {
+                if (selectedModel.acceptType(WTitleLayout.class) || selectedModel.acceptType(WCardMainBorderLayout.class)) {
+                    return new String[0][0];
+                }
             }
             ArrayList<String> strings = ((WLayout)selectedModel).getMobileWidgetList();
             String[][] widgetName = new String[strings.size() + 1][1];