Javadoc cleanup, elim global variables, reduce visibility.

2 files changed, 23 insertions, 14 deletions

diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java
index 3857c35c9..5efd9843a 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/FragmentHandle.java
@@ -35,6 +35,9 @@ import org.eclipse.jst.pagedesigner.css2.layout.FlowBox;
  * @version 1.5
  */
 public class FragmentHandle extends AbstractHandle implements Handle {
+	/**
+	 * @param owner
+	 */
 	public FragmentHandle(GraphicalEditPart owner) {
 		super(owner, new FragmentLocator());
 		this.setOpaque(false);
@@ -61,9 +64,7 @@ public class FragmentHandle extends AbstractHandle implements Handle {
 		return tracker;
 	}
 
-	public void refresh() {
-		// TODO: not ref Insets insets = getOwnerFigure().getInsets();
-		// TODO: not ref Rectangle bounds;
+	private void refresh() {
 
 		// set the bounds of this figure, so it could cover all children.
 		bounds = getOwnerFigure().getBounds();
@@ -83,7 +84,7 @@ public class FragmentHandle extends AbstractHandle implements Handle {
 			this.add(childFigure);
 
 			FlowBox box = (FlowBox) fragments.get(i);
-			Rectangle rect = new Rectangle(box._x, box._y, box.getWidth(), box
+			Rectangle rect = new Rectangle(box.getX(), box.getY(), box.getWidth(), box
 					.getHeight());
 			cssfigure.translateToAbsolute(rect);
 
@@ -151,8 +152,8 @@ public class FragmentHandle extends AbstractHandle implements Handle {
 		this.add(target);
 
 		// for corner small box.
-		Rectangle targetBounds = new Rectangle(referencebox._x,
-				referencebox._y, referencebox.getWidth(), referencebox
+		Rectangle targetBounds = new Rectangle(referencebox.getX(),
+				referencebox.getY(), referencebox.getWidth(), referencebox
 						.getHeight());
 		targetBounds = new PrecisionRectangle(targetBounds);
 		reference.translateToAbsolute(targetBounds);
@@ -167,7 +168,7 @@ public class FragmentHandle extends AbstractHandle implements Handle {
 		target.setBounds(targetBounds);
 	}
 
-	public static class FragmentLocator implements Locator {
+	static class FragmentLocator implements Locator {
 		/*
 		 * (non-Javadoc)
 		 * 
@@ -178,7 +179,10 @@ public class FragmentHandle extends AbstractHandle implements Handle {
 		}
 	}
 
-	public static class BorderFigure extends Figure {
+	static class BorderFigure extends Figure {
+		/**
+		 * the bounds padding
+		 */
 		public static final int INNER_PAD = 2;
 
 		/*
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java
index 657067fd7..b6e09fe85 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/LocationHelper.java
@@ -31,13 +31,14 @@ import org.w3c.dom.Node;
 /**
  * @author mengbo
  */
-public class LocationHelper {
+public final class LocationHelper {
 	/**
+	 * @param host 
 	 * @param p
 	 * @param result
 	 * @param tagName
 	 * @param skip
-	 * @return
+	 * @return  true if insertion point is found
 	 */
 	public static boolean findInsertLocation(GraphicalEditPart host, Point p,
 			GraphicalEditPart[] result, String tagName, Node skip) {
@@ -114,10 +115,10 @@ public class LocationHelper {
 	/**
 	 * @param figure
 	 * @param box
-	 * @return
+	 * @return the bounding rectangle
 	 */
 	public static Rectangle getAbsoluteBounds(IFigure figure, FlowBox box) {
-		Rectangle r = new Rectangle(box._x, box._y, box.getWidth(), box
+		Rectangle r = new Rectangle(box.getX(), box.getY(), box.getWidth(), box
 				.getHeight());
 		figure.translateToAbsolute(r);
 		return r;
@@ -125,7 +126,7 @@ public class LocationHelper {
 
 	/**
 	 * @param child
-	 * @return
+	 * @return the bounding rectangle
 	 */
 	public static Rectangle getAbsoluteBounds(GraphicalEditPart child) {
 		Rectangle bounds = child.getFigure().getBounds().getCopy();
@@ -180,7 +181,7 @@ public class LocationHelper {
 		return false;
 	}
 
-	protected static ModelQuery getModelQuery(Node node) {
+	private static ModelQuery getModelQuery(Node node) {
         Document doc = node.getOwnerDocument();
         
 		if (node.getNodeType() == Node.DOCUMENT_NODE) {
@@ -189,4 +190,8 @@ public class LocationHelper {
         return ModelQueryUtil.getModelQuery(doc);
 	}
 
+	private LocationHelper()
+	{
+	    // util class, no external instantiation
+	}
 }