diff --git a/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java b/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java
index 19fa1ab22..8c7eab9d6 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/AboutCmd.java
@@ -70,7 +70,8 @@ public class AboutCmd extends AbstractCommand {
 	 * Standard constructor. 
 	 * 
 	 */
-    public AboutCmd() {
+    public AboutCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java b/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java
index 34858a819..b116cbcdd 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/AbstractCommand.java
@@ -69,15 +69,7 @@ public abstract class AbstractCommand implements Command {
 	 * Default ctor.
 	 * 
 	 */
-    protected AbstractCommand() {
-    }
-
-	/** 
-	 * Set the application context.
-	 * 
-	 * @param context Application context.
-	 */
-    public void setContext(AppContext context) {
+    protected AbstractCommand(AppContext context) {
         _context = context;
     }
 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java b/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java
index 19350a97e..bde2b5b4f 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/BuildCmd.java
@@ -68,7 +68,8 @@ public class BuildCmd extends AbstractCommand {
 	 * Standard ctor.
 	 * 
 	 */
-    public BuildCmd() {
+    public BuildCmd(AppContext context) { 
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java b/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java
index 83110efea..b3939c88d 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/ChangeLookAndFeelCmd.java
@@ -67,7 +67,8 @@ public class ChangeLookAndFeelCmd extends AbstractCommand {
 	 * Standard ctor.
 	 *
 	 */
-    public ChangeLookAndFeelCmd() {
+    public ChangeLookAndFeelCmd(AppContext context) {
+        super(context);
     }
 
 	/**
diff --git a/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java b/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java
index 9d9d836e9..33b6cecf9 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/CloseCmd.java
@@ -68,7 +68,8 @@ public class CloseCmd extends AbstractCommand {
 	 * Standard constructor. 
 	 * 
 	 */
-    public CloseCmd() {
+    public CloseCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/Command.java b/src/antidote/org/apache/tools/ant/gui/command/Command.java
index f04547892..47a6093f1 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/Command.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/Command.java
@@ -57,23 +57,16 @@ import org.apache.tools.ant.gui.AppContext;
 
 
 /**
- * Interface for commands.  Implementation needs to have a default ctor. 
+ * Interface for commands. 
  * Details TBD
  * 
  * @version $Revision$ 
  * @author Simeon Fitch 
  */
 public interface Command extends Runnable {
-	/** 
-	 * Set the application context.
-	 * 
-	 * @param context Application context.
-	 */
-    public void setContext(AppContext context);
-
 	/** 
 	 * Run the command. From interface Runnable.
 	 * 
 	 */
-    public void run();
+    void run();
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java b/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java
index ebea8e8a2..14546dcb2 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/DisplayErrorCmd.java
@@ -72,19 +72,23 @@ public class DisplayErrorCmd extends AbstractCommand {
     private Throwable _ex = null;
 
 	/** 
-	 * Default ctor.
+	 * Standard ctor.
 	 * 
+	 * @param context Application context.
 	 */
-    public DisplayErrorCmd() {
+    public DisplayErrorCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
 	 * Standard constuctor.
 	 * 
+	 * @param context Application context.
 	 * @param message Error message.
 	 * @param ex Throwable assocated with error.
 	 */
-    public DisplayErrorCmd(String message, Throwable ex) {
+    public DisplayErrorCmd(AppContext context, String message, Throwable ex) {
+        this(context);
         setMessage(message);
         setThrowable(_ex);
     }
@@ -95,8 +99,8 @@ public class DisplayErrorCmd extends AbstractCommand {
 	 * @param context Application context.
 	 * @param message Error message.
 	 */
-    public DisplayErrorCmd(String message) {
-        this(message, null);
+    public DisplayErrorCmd(AppContext context, String message) {
+        this(context, message, null);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java b/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java
index ce7fa624d..b43d902fb 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/EmacsNotifyCmd.java
@@ -69,9 +69,10 @@ public class EmacsNotifyCmd extends AbstractCommand {
 	/** 
 	 * Standard ctor.
 	 * 
-     * @param state True if notifying on, false for notifying off.
+	 * @param context Application context.
 	 */
-    public EmacsNotifyCmd() {
+    public EmacsNotifyCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java b/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java
index bc3f71cfb..77f6ae612 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/ExitCmd.java
@@ -69,8 +69,10 @@ public class ExitCmd extends AbstractCommand {
 	/** 
 	 * Standard constructor. 
 	 * 
+	 * @param context Application context.
 	 */
-    public ExitCmd() {
+    public ExitCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java b/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java
index 35fe4174f..9637e11c5 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/LoadFileCmd.java
@@ -71,8 +71,10 @@ public class LoadFileCmd extends  AbstractCommand {
 	/** 
 	 * Standard ctor.
 	 * 
+	 * @param context Application context.
 	 */
-    public LoadFileCmd() {
+    public LoadFileCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java b/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java
index bb3ff9c36..d0673d571 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/NoOpCmd.java
@@ -52,6 +52,7 @@
  * <http://www.apache.org/>.
  */
 package org.apache.tools.ant.gui.command;
+import org.apache.tools.ant.gui.AppContext;
 
 /**
  * NoOp command.
@@ -61,6 +62,15 @@ package org.apache.tools.ant.gui.command;
  */
 public class NoOpCmd extends AbstractCommand {
 	/** 
+     * Standard ctor.
+     * 
+	 * @param context Application context.
+	 */
+    public NoOpCmd(AppContext context) {
+        super(context);
+    }
+
+	/** 
 	 * Successfully do nothing.
 	 * 
 	 */
diff --git a/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java b/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java
index ccb13766c..e34727c3c 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/OpenCmd.java
@@ -71,8 +71,10 @@ public class OpenCmd extends AbstractCommand {
 	/** 
 	 * Standard ctor.
 	 * 
+	 * @param context Application context.
 	 */
-    public OpenCmd() {
+    public OpenCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java b/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java
index 6bffa840d..dbeaead2a 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/SaveAsCmd.java
@@ -77,8 +77,10 @@ public class SaveAsCmd extends AbstractCommand {
 	/** 
 	 * Standard ctor.
 	 * 
+	 * @param context Application context.
 	 */
-    public SaveAsCmd() {
+    public SaveAsCmd(AppContext context) {
+        super(context);
     }
 
 	/** 
diff --git a/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java b/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java
index a6459144f..bcad9e2e9 100644
--- a/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java
+++ b/src/antidote/org/apache/tools/ant/gui/command/SaveCmd.java
@@ -62,16 +62,13 @@ import org.apache.tools.ant.gui.AppContext;
  */
 public class SaveCmd extends SaveAsCmd {
 
-    public SaveCmd() {
-    }
-
 	/** 
-	 * Set the application context.
+	 * Standard ctor.
 	 * 
 	 * @param context Application context.
 	 */
-    public void setContext(AppContext context) {
-        super.setContext(context);
+    public SaveCmd(AppContext context) {
+        super(context);
         setFile(context.getProject().getFile());
     }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java b/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java
index 52f3f9072..46f49ad43 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/AntBuildEvent.java
@@ -106,15 +106,6 @@ public class AntBuildEvent extends AntEvent {
         return _type;
     }
 
-	/** 
-	 * Create the appropriate default response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
-    
 	/** 
 	 * Create a string representation of this.
 	 * 
diff --git a/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java b/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java
index a6a5cf337..24829662a 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/AntEvent.java
@@ -53,6 +53,7 @@
  */
 package org.apache.tools.ant.gui.event;
 import org.apache.tools.ant.gui.command.Command;
+import org.apache.tools.ant.gui.command.NoOpCmd;
 import org.apache.tools.ant.gui.AppContext;
 import java.util.EventObject;
 
@@ -87,11 +88,12 @@ public abstract class AntEvent extends EventObject {
 
 
 	/** 
-	 * Create the appropriate default response command to this event.
+	 * Override to create the appropriate default response
+	 * command to this event.
 	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public abstract Command createDefaultCmd();
-
-
+	 * @return Command representing an appropriate response to this event.  
+     */
+    public Command createDefaultCmd() {
+        return new NoOpCmd(getContext());
+    }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java
index edf73d177..dc78ecb5c 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/BuildFinishedEvent.java
@@ -54,8 +54,6 @@
 package org.apache.tools.ant.gui.event;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.gui.AppContext;
-import org.apache.tools.ant.gui.command.NoOpCmd;
-import org.apache.tools.ant.gui.command.Command;
 
 
 /**
@@ -90,12 +88,4 @@ public class BuildFinishedEvent extends AntEvent {
         return _orig;
     }
 
-	/** 
-	 * Create the appropriate response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java
index 9e54605c4..cbf1abd2c 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/BuildStartedEvent.java
@@ -54,8 +54,6 @@
 package org.apache.tools.ant.gui.event;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.gui.AppContext;
-import org.apache.tools.ant.gui.command.NoOpCmd;
-import org.apache.tools.ant.gui.command.Command;
 
 
 /**
@@ -90,12 +88,4 @@ public class BuildStartedEvent extends AntEvent {
         return _orig;
     }
 
-	/** 
-	 * Create the appropriate response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/BusFilter.java b/src/antidote/org/apache/tools/ant/gui/event/BusFilter.java
index 6d0a415cd..5bb48ef86 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/BusFilter.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/BusFilter.java
@@ -69,5 +69,5 @@ public interface BusFilter {
 	 * @param event Event to test.
 	 * @return True if event should be given to BusMember, false otherwise.
 	 */
-    public boolean accept(EventObject event);
+    boolean accept(EventObject event);
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/BusMember.java b/src/antidote/org/apache/tools/ant/gui/event/BusMember.java
index 95967150f..c6bca6adf 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/BusMember.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/BusMember.java
@@ -68,7 +68,7 @@ public interface BusMember {
 	 * 
 	 * @return Filter to use.
 	 */
-    public BusFilter getBusFilter();
+    BusFilter getBusFilter();
 
 	/** 
 	 * Called when an event is to be posed to the member.
@@ -77,6 +77,6 @@ public interface BusMember {
      * @return true if event should be propogated, false if
      * it should be cancelled.
      */
-    public boolean eventPosted(EventObject event);
+    boolean eventPosted(EventObject event);
 
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java
index 1abe33774..b0e60fb71 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/ElementSelectionEvent.java
@@ -53,8 +53,6 @@
  */
 package org.apache.tools.ant.gui.event;
 import org.apache.tools.ant.gui.acs.ACSElement;
-import org.apache.tools.ant.gui.command.Command;
-import org.apache.tools.ant.gui.command.NoOpCmd;
 import org.apache.tools.ant.gui.AppContext;
 
 /**
@@ -89,12 +87,4 @@ public class ElementSelectionEvent extends AntEvent {
         return _selected;
     }
 
-	/** 
-	 * Create the appropriate default response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java
index 04817fefe..5dd46ab11 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/ErrorEvent.java
@@ -109,8 +109,7 @@ public class ErrorEvent extends AntEvent {
 	 * @return Command representing an appropriate response to this event.
 	 */
     public Command createDefaultCmd() {
-        Command retval = new DisplayErrorCmd(_message, _ex);
-        retval.setContext(getContext());
+        Command retval = new DisplayErrorCmd(getContext(), _message, _ex);
         return retval;
     }
 
diff --git a/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java b/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java
index fd49cb6df..32bc0dfb2 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/NewProjectEvent.java
@@ -52,8 +52,6 @@
  * <http://www.apache.org/>.
  */
 package org.apache.tools.ant.gui.event;
-import org.apache.tools.ant.gui.command.Command;
-import org.apache.tools.ant.gui.command.NoOpCmd;
 import org.apache.tools.ant.gui.AppContext;
 
 /**
@@ -72,13 +70,4 @@ public class NewProjectEvent extends AntEvent {
     public NewProjectEvent(AppContext context) {
         super(context);
     }
-
-	/** 
-	 * Create the appropriate default response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java b/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java
index d1788a284..eafb47a68 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/OpenRequestEvent.java
@@ -85,9 +85,8 @@ public class OpenRequestEvent extends AntEvent {
 	 * @return Load command.
 	 */
     public Command createDefaultCmd() {
-        LoadFileCmd load = new LoadFileCmd();
+        LoadFileCmd load = new LoadFileCmd(getContext());
         load.setFile(_file);
-        load.setContext(getContext());
         return load;
     }
 }
diff --git a/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java b/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java
index cf3504af4..f904a954b 100644
--- a/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java
+++ b/src/antidote/org/apache/tools/ant/gui/event/ProjectClosedEvent.java
@@ -53,8 +53,6 @@
  */
 package org.apache.tools.ant.gui.event;
 import org.apache.tools.ant.gui.AppContext;
-import org.apache.tools.ant.gui.command.NoOpCmd;
-import org.apache.tools.ant.gui.command.Command;
 
 
 /**
@@ -65,7 +63,6 @@ import org.apache.tools.ant.gui.command.Command;
  */
 public class ProjectClosedEvent extends AntEvent {
 
-
 	/** 
 	 * Standard ctor.
 	 * 
@@ -74,13 +71,4 @@ public class ProjectClosedEvent extends AntEvent {
     public ProjectClosedEvent(AppContext context) {
         super(context);
     }
-
-	/** 
-	 * Create the appropriate response command to this event.
-	 * 
-	 * @return Command representing an appropriate response to this event.
-	 */
-    public Command createDefaultCmd() {
-        return new NoOpCmd();
-    }
 }