Changeset 200

Timestamp:

09/26/11 22:56:36 (13 years ago)

Author:

sherbold

Message:

• adapted implementations of ConsoleObservers? to the new interfaces (see comment of previous commit).

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt

Files:

• CommandHistoryDialog.java (modified) (4 diffs)
• SWTConsole.java (modified) (2 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/CommandHistoryDialog.java

@@ -24 +24 @@
 import de.ugoe.cs.util.console.CommandExecuter;
 import de.ugoe.cs.util.console.Console;
-import de.ugoe.cs.util.console.ConsoleObserver;
+import de.ugoe.cs.util.console.listener.ICommandListener;
+
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.DisposeEvent;
@@ -30 +31 @@
 import org.eclipse.swt.events.SelectionEvent;
 
-public class CommandHistoryDialog extends Dialog implements ConsoleObserver {
+public class CommandHistoryDialog extends Dialog implements ICommandListener {
         
         protected java.util.List<String> history = new LinkedList<String>();
@@ -49 +50 @@
                 setText("Command History");
                 isOpen = false;
-                Console.getInstance().registerObserver(this);
+                Console.getInstance().registerCommandListener(this);
         }
 
@@ -160 +161 @@
 
         @Override
-        public void updateText(String newMessage) {
-                // ignore
-        }
-
-        @Override
-        public void errStream(String errMessage) {
-                // ignore
-        }
-
-        @Override
-        public void trace(String traceMessage) {
-                // ignore
-        }
-
-        @Override
-        public void printStacktrace(Exception e) {
-                // ignore
-                
-        }
-
-        @Override
         public void commandNotification(String command) {
                 history.add(command);

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swt/SWTConsole.java

@@ -5 +5 @@
 import de.ugoe.cs.util.StringTools;
 import de.ugoe.cs.util.console.Console;
-import de.ugoe.cs.util.console.ConsoleObserver;
+import de.ugoe.cs.util.console.listener.ICommandListener;
+import de.ugoe.cs.util.console.listener.IErrorListener;
+import de.ugoe.cs.util.console.listener.IOutputListener;
+import de.ugoe.cs.util.console.listener.ITraceListener;
 
-public class SWTConsole implements ConsoleObserver {
+public class SWTConsole implements IOutputListener, IErrorListener, ITraceListener, ICommandListener {
 
         Text output;
         
         public SWTConsole(Text output) {
-                Console.getInstance().registerObserver(this);
+                Console.getInstance().registerOutputListener(this);
+                Console.getInstance().registerErrorListener(this);
+                Console.getInstance().registerTraceListener(this);
+                Console.getInstance().registerCommandListener(this);
                 this.output = output;
         }
@@ -31 +37 @@
                 output.append(traceMessage);
         }
-
-        @Override
-        public void printStacktrace(Exception e) {
-                // TODO print stacktrace
-        }
         
         @Override