Reverted commit 116.

Author: prisonerjohn@gmail.com

src/net/nexttext/Book.java

@@ -20,7 +20,6 @@
 package net.nexttext;
 
 import net.nexttext.behaviour.AbstractBehaviour;
-import net.nexttext.behaviour.Behaviour;
 import net.nexttext.property.Property;
 
 import java.awt.FontMetrics;
@@ -41,8 +40,6 @@
 
 import processing.core.*;
 
-import net.nexttext.behaviour.physics.Move;
-
 /**
  * Factory class used for creating TextObjects and adding them to NextText.
  *
@@ -169,6 +166,7 @@ public void setAddToSpatialList(boolean addToSpatialList) {
         this.addToSpatialList = addToSpatialList;
     }
 
+
     int align = PConstants.LEFT;
     /** Set the horizontal alignment type of the group around the position. */
     public void setTextAlign(int align) {

src/net/nexttext/TextObjectBuilder.java

@@ -98,20 +98,4 @@ public void complete(TextObject to) {
             action.complete(to);
         }
     }
-    /**
-     * Set functions to change the prefix and action.
-     * @param prefix
-     */
-    public void set(String prefix) {
-        this.prefix = prefix;
-    }
-    /**
-     * 
-     * @param prefix
-     * @param action
-     */
-    public void set(String prefix, Action action) {
-        this.prefix = prefix;
-        this.action = action;
-    }
 }

src/net/nexttext/behaviour/control/DebugLog.java

@@ -35,16 +35,6 @@ public class Delay extends AbstractAction {
     Action action;
     long timeLeft; // for handling clock discrepancies
 
-    /**
-     * Creates a Delay for the given action.
-     * Default delay time is 10 seconds.
-     */
-    public Delay( Action action) {
-        this.action = action;
-        this.timeLeft = 10000;
-        properties().init("Duration", new NumberProperty(10000));
-    }
-    
     /**
      * Creates a Delay for the given action.
      * 
@@ -101,32 +91,4 @@ public ActionResult behave(TextObject to) {
         }        
         return new ActionResult(false, true, false);
     }
-
-	/**
-	     * Change the action to delay.
-	     */
-	    public void set( Action action) {
-	        this.action = action;
-	    }
-	    
-	    /**
-	     * Change the delay time (in seconds).
-	     * @param duration
-	     */
-	    public void set( float duration) {
-	        this.timeLeft = 1000 * (long)duration;
-	        ((NumberProperty)properties().get("Duration")).set(1000* duration);
-	    }
-	    
-	    /**
-	     * Change delay time and action to delay.
-	     * 
-	     * @param duration In seconds
-	     */
-	    public void set( Action action, float duration ) {
-	        set(action);
-	        set(duration);
-	    }
-    
-    
 }

src/net/nexttext/behaviour/control/Delay.java

@@ -75,9 +75,6 @@ public Descend(Action descendantAction) {
      */
     public Descend(Action descendantAction, int depth) {
         this.descendantAction = descendantAction;
-        if(depth <= 0) {
-        	depth = 1;
-        }
         this.depth = depth;
         this.descendantReqProps = descendantAction.getRequiredProperties();
     }
@@ -157,35 +154,4 @@ private void initRequiredProperties(TextObject to) {
             initedDescendants.put(to, true);
         }
     }
-    
-    /**
-     * Change the action to apply to descendants.
-     * @param descendantAction
-     */
-    public void set(Action descendantAction) {
-       this.descendantAction= descendantAction;
-    }
-
-    /**
-     * Change the depth.
-     *
-     * @param depth is a non-negative integer indicating the number of levels
-     * to descend in the TextObject hierarchy to get the TextObjects to be
-     * acted on.
-     */
-    public void set( int depth) {
-        if(depth <= 0) {
-        	depth = 1;
-        }
-        this.depth = depth;
-    }
-    /**
-     * Change both the action and depth.
-     * @param desccendantAction
-     * @param depth
-     */
-    public void set(Action desccendantAction, int depth) {
-    	set(descendantAction);
-    	set(depth);
-    }
 }

src/net/nexttext/behaviour/control/Descend.java

@@ -47,22 +47,5 @@ public boolean condition( TextObject to ) {
         Rectangle objectBB = to.getBoundingPolygon().getBounds();
 
         return area.intersects(objectBB);
-    }  
-    
-    /**
-     * Set functions to change the area, trua action and false action
-     * @param area
-     * @param trueAction
-     * @param falseAction
-     */
-    
-    public void set(Shape area, Action trueAction, Action falseAction) {
-        set(trueAction, falseAction);
-        this.area = area;
-    }
-    
-    public void set(Shape area) {
-    	this.area = area;
-    }
-    
+    }     
 }

src/net/nexttext/behaviour/control/IsInside.java

@@ -41,35 +41,6 @@ public class Multiplexer extends AbstractAction {
     protected List<Action> actions;
     protected HashMap<Action, HashSet<TextObject>> doneWithObject;
 
-    /**
-     * Creates a Multiplexer with an array of Actions. Actions will repeat indefinitely by default.
-     * @param actionsArray
-     */
-    public Multiplexer(Action[] actionsArray) {
-    	actions = new ArrayList<Action>();
-        doneWithObject = new HashMap<Action, HashSet<TextObject>>();
-    	for (Action a: actionsArray) {
-    		Repeat r = new Repeat(a);
-    		add(r);
-    	}
-    }
-    
-    /**
-     * Creates a Multiplexer with an array of Actions. Actions will repeat the specified
-     * number of times.
-     * @param actionsArray
-     * @param repetitions
-     */
-    
-    public Multiplexer(Action[] actionsArray, int repetitions) {
-    	actions = new ArrayList<Action>();
-        doneWithObject = new HashMap<Action, HashSet<TextObject>>();
-    	for (Action a: actionsArray) {
-    		Repeat r = new Repeat(a, repetitions);
-    		add(r);
-    	}
-    }
-    
     /**
      * @param actions a List containing Action objects.
      */

src/net/nexttext/behaviour/control/Multiplexer.java

@@ -123,12 +123,4 @@ public ActionResult behave(TextObject to) {
     public Map<String, Property> getRequiredProperties() {
         return action.getRequiredProperties();
     }
-    
-    /**
-     * Change tha action to perform on a collision
-     * @param action
-     */
-    public void set(Action action) {
-    	this.action = action;
-    }
 }

src/net/nexttext/behaviour/control/OnCollision.java

@@ -149,24 +149,4 @@ public PVector getLocation() {
             return lastDragged.getPositionAbsolute();
         }
     }
-    
-    /**
-     * Set functions to change the button to check and the true and false actions
-     * @param buttonToCheck
-     * @param trueAction
-     * @param falseAction
-     */
-    public void set(int buttonToCheck, Action trueAction, Action falseAction) {
-    	set(trueAction, falseAction);
-    	this.buttonToCheck = buttonToCheck;
-    }
-    
-    public void set(int buttonToCheck, Action trueAction) {
-    	set(trueAction);
-    	this.buttonToCheck = buttonToCheck;
-    }
-    
-    public void set(int buttonToCheck) {
-    	this.buttonToCheck = buttonToCheck;
-    }
 }

src/net/nexttext/behaviour/control/OnDrag.java

@@ -37,8 +37,8 @@ public class OnMouseDepressed extends Condition {
     int buttonToCheck;
 
     /**
-     * Creates an OnMouseDepressed which performs the given Action when the left mouse
-     *  is pressed.
+     * Creates an OnMouseDepressed which performs the given Action when the mouse 
+     * button 1 is pressed.
      *
      * @param trueAction the Action to perform when the mouse button 1 is pressed
      */
@@ -92,24 +92,4 @@ public OnMouseDepressed(int buttonToCheck, Action trueAction, Action falseAction
     public boolean condition(TextObject to) {
         return mouse.isPressed(buttonToCheck);
     }
-    
-    /**
-     * Set functions to change the button to check and the true and false actions
-     * @param buttonToCheck
-     * @param trueAction
-     * @param falseAction
-     */
-    public void set(int buttonToCheck, Action trueAction, Action falseAction) {
-    	set(trueAction, falseAction);
-    	this.buttonToCheck = buttonToCheck;
-    }
-    
-    public void set(int buttonToCheck, Action trueAction) {
-    	set(trueAction);
-    	this.buttonToCheck = buttonToCheck;
-    }
-    
-    public void set(int buttonToCheck) {
-    	this.buttonToCheck = buttonToCheck;
-    }
 }