X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Region.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Region.java
index 45c3cc8..dd745d9 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Region.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Region.java
@@ -19,132 +19,140 @@ import net.sourceforge.phpdt.core.IRegion;
 /**
  * @see IRegion
  */
- 
+
 public class Region implements IRegion {
 
 	/**
-	 * A collection of the top level elements
-	 * that have been added to the region
+	 * A collection of the top level elements that have been added to the region
 	 */
 	protected ArrayList fRootElements;
-/**
- * Creates an empty region.
- *
- * @see IRegion
- */
-public Region() {
-	fRootElements = new ArrayList(1);
-}
-/**
- * @see IRegion#add(IJavaElement)
- */
-public void add(IJavaElement element) {
-	if (!contains(element)) {
-		//"new" element added to region
-		removeAllChildren(element);
-		fRootElements.add(element);
-		fRootElements.trimToSize();
+
+	/**
+	 * Creates an empty region.
+	 * 
+	 * @see IRegion
+	 */
+	public Region() {
+		fRootElements = new ArrayList(1);
 	}
-}
-/**
- * @see IRegion
- */
-public boolean contains(IJavaElement element) {
-	
-	int size = fRootElements.size();
-	ArrayList parents = getAncestors(element);
-	
-	for (int i = 0; i < size; i++) {
-		IJavaElement aTop = (IJavaElement) fRootElements.get(i);
-		if (aTop.equals(element)) {
-			return true;
+
+	/**
+	 * @see IRegion#add(IJavaElement)
+	 */
+	public void add(IJavaElement element) {
+		if (!contains(element)) {
+			// "new" element added to region
+			removeAllChildren(element);
+			fRootElements.add(element);
+			fRootElements.trimToSize();
 		}
-		for (int j = 0, pSize = parents.size(); j < pSize; j++) {
-			if (aTop.equals(parents.get(j))) {
-				//an ancestor is already included
+	}
+
+	/**
+	 * @see IRegion
+	 */
+	public boolean contains(IJavaElement element) {
+
+		int size = fRootElements.size();
+		ArrayList parents = getAncestors(element);
+
+		for (int i = 0; i < size; i++) {
+			IJavaElement aTop = (IJavaElement) fRootElements.get(i);
+			if (aTop.equals(element)) {
 				return true;
 			}
+			for (int j = 0, pSize = parents.size(); j < pSize; j++) {
+				if (aTop.equals(parents.get(j))) {
+					// an ancestor is already included
+					return true;
+				}
+			}
 		}
+		return false;
 	}
-	return false;
-}
-/**
- * Returns a collection of all the parents of this element
- * in bottom-up order.
- *
- */
-private ArrayList getAncestors(IJavaElement element) {
-	ArrayList parents = new ArrayList();
-	IJavaElement parent = element.getParent();
-	while (parent != null) {
-		parents.add(parent);
-		parent = parent.getParent();
+
+	/**
+	 * Returns a collection of all the parents of this element in bottom-up
+	 * order.
+	 * 
+	 */
+	private ArrayList getAncestors(IJavaElement element) {
+		ArrayList parents = new ArrayList();
+		IJavaElement parent = element.getParent();
+		while (parent != null) {
+			parents.add(parent);
+			parent = parent.getParent();
+		}
+		parents.trimToSize();
+		return parents;
 	}
-	parents.trimToSize();
-	return parents;
-}
-/**
- * @see IRegion
- */
-public IJavaElement[] getElements() {
-	int size= fRootElements.size();
-	IJavaElement[] roots= new IJavaElement[size];
-	for (int i = 0; i < size; i++) {
-		roots[i]= (IJavaElement) fRootElements.get(i);
+
+	/**
+	 * @see IRegion
+	 */
+	public IJavaElement[] getElements() {
+		int size = fRootElements.size();
+		IJavaElement[] roots = new IJavaElement[size];
+		for (int i = 0; i < size; i++) {
+			roots[i] = (IJavaElement) fRootElements.get(i);
+		}
+
+		return roots;
 	}
 
-	return roots;
-}
-/**
- * @see IRegion#remove(IJavaElement)
- */
-public boolean remove(IJavaElement element) {
+	/**
+	 * @see IRegion#remove(IJavaElement)
+	 */
+	public boolean remove(IJavaElement element) {
 
-	removeAllChildren(element);
-	return fRootElements.remove(element);
-}
-/**
- * Removes any children of this element that are contained within this
- * region as this parent is about to be added to the region.
- *
- * <p>Children are all children, not just direct children.
- */
-private void removeAllChildren(IJavaElement element) {
-	if (element instanceof IParent) {
-		ArrayList newRootElements = new ArrayList();
-		for (int i = 0, size = fRootElements.size(); i < size; i++) {
-			IJavaElement currentRoot = (IJavaElement)fRootElements.get(i);
-			//walk the current root hierarchy
-			IJavaElement parent = currentRoot.getParent();
-			boolean isChild= false;
-			while (parent != null) {
-				if (parent.equals(element)) {
-					isChild= true;
-					break;
+		removeAllChildren(element);
+		return fRootElements.remove(element);
+	}
+
+	/**
+	 * Removes any children of this element that are contained within this
+	 * region as this parent is about to be added to the region.
+	 * 
+	 * <p>
+	 * Children are all children, not just direct children.
+	 */
+	private void removeAllChildren(IJavaElement element) {
+		if (element instanceof IParent) {
+			ArrayList newRootElements = new ArrayList();
+			for (int i = 0, size = fRootElements.size(); i < size; i++) {
+				IJavaElement currentRoot = (IJavaElement) fRootElements.get(i);
+				// walk the current root hierarchy
+				IJavaElement parent = currentRoot.getParent();
+				boolean isChild = false;
+				while (parent != null) {
+					if (parent.equals(element)) {
+						isChild = true;
+						break;
+					}
+					parent = parent.getParent();
+				}
+				if (!isChild) {
+					newRootElements.add(currentRoot);
 				}
-				parent = parent.getParent();
-			}
-			if (!isChild) {
-				newRootElements.add(currentRoot);
 			}
+			fRootElements = newRootElements;
 		}
-		fRootElements= newRootElements;
 	}
-}
-/**
- * Returns a printable representation of this region.
- */
-public String toString() {
-	StringBuffer buffer= new StringBuffer();
-	IJavaElement[] roots= getElements();
-	buffer.append('[');
-	for (int i= 0; i < roots.length; i++) {
-		buffer.append(roots[i].getElementName());
-		if (i < (roots.length - 1)) {
-			buffer.append(", "); //$NON-NLS-1$
+
+	/**
+	 * Returns a printable representation of this region.
+	 */
+	public String toString() {
+		StringBuffer buffer = new StringBuffer();
+		IJavaElement[] roots = getElements();
+		buffer.append('[');
+		for (int i = 0; i < roots.length; i++) {
+			buffer.append(roots[i].getElementName());
+			if (i < (roots.length - 1)) {
+				buffer.append(", "); //$NON-NLS-1$
+			}
 		}
+		buffer.append(']');
+		return buffer.toString();
 	}
-	buffer.append(']');
-	return buffer.toString();
-}
 }