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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/CompositeActionGroup.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/CompositeActionGroup.java
index baacca8..cf9969d 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/CompositeActionGroup.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/CompositeActionGroup.java
@@ -11,7 +11,9 @@
 package net.sourceforge.phpdt.internal.ui.actions;
 
 import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.util.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.actions.ActionContext;
 import org.eclipse.ui.actions.ActionGroup;
@@ -19,42 +21,42 @@ import org.eclipse.ui.actions.ActionGroup;
 public class CompositeActionGroup extends ActionGroup {
 
 	private ActionGroup[] fGroups;
-	
+
 	public CompositeActionGroup() {
 	}
-	
+
 	public CompositeActionGroup(ActionGroup[] groups) {
 		setGroups(groups);
 	}
 
-	protected void setGroups(ActionGroup[] groups) {
+	private void setGroups(ActionGroup[] groups) {
 		Assert.isTrue(fGroups == null);
 		Assert.isNotNull(groups);
-		fGroups= groups;		
+		fGroups = groups;
 	}
-		
+
 	public ActionGroup get(int index) {
 		if (fGroups == null)
 			return null;
 		return fGroups[index];
 	}
-	
+
 	public void addGroup(ActionGroup group) {
 		if (fGroups == null) {
-			fGroups= new ActionGroup[] { group };
+			fGroups = new ActionGroup[] { group };
 		} else {
-			ActionGroup[] newGroups= new ActionGroup[fGroups.length + 1];
+			ActionGroup[] newGroups = new ActionGroup[fGroups.length + 1];
 			System.arraycopy(fGroups, 0, newGroups, 0, fGroups.length);
-			newGroups[fGroups.length]= group;
-			fGroups= newGroups;
+			newGroups[fGroups.length] = group;
+			fGroups = newGroups;
 		}
 	}
-	
+
 	public void dispose() {
 		super.dispose();
 		if (fGroups == null)
 			return;
-		for (int i= 0; i < fGroups.length; i++) {
+		for (int i = 0; i < fGroups.length; i++) {
 			fGroups[i].dispose();
 		}
 	}
@@ -63,7 +65,7 @@ public class CompositeActionGroup extends ActionGroup {
 		super.fillActionBars(actionBars);
 		if (fGroups == null)
 			return;
-		for (int i= 0; i < fGroups.length; i++) {
+		for (int i = 0; i < fGroups.length; i++) {
 			fGroups[i].fillActionBars(actionBars);
 		}
 	}
@@ -72,7 +74,7 @@ public class CompositeActionGroup extends ActionGroup {
 		super.fillContextMenu(menu);
 		if (fGroups == null)
 			return;
-		for (int i= 0; i < fGroups.length; i++) {
+		for (int i = 0; i < fGroups.length; i++) {
 			fGroups[i].fillContextMenu(menu);
 		}
 	}
@@ -81,7 +83,7 @@ public class CompositeActionGroup extends ActionGroup {
 		super.setContext(context);
 		if (fGroups == null)
 			return;
-		for (int i= 0; i < fGroups.length; i++) {
+		for (int i = 0; i < fGroups.length; i++) {
 			fGroups[i].setContext(context);
 		}
 	}
@@ -90,7 +92,7 @@ public class CompositeActionGroup extends ActionGroup {
 		super.updateActionBars();
 		if (fGroups == null)
 			return;
-		for (int i= 0; i < fGroups.length; i++) {
+		for (int i = 0; i < fGroups.length; i++) {
 			fGroups[i].updateActionBars();
 		}
 	}