svn commit: r13483 - trunk/modules/dev/src/org: argouml/kernel argouml/ui tigris

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: bobtarling
Date: 2007-09-02 15:17:30-0700
New Revision: 13483

Added:
   trunk/modules/dev/src/org/argouml/kernel/
      - copied from r13473, /trunk/modules/dev/src/org/tigris/gef/undo/
   trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java
      - copied, changed from r13479, /trunk/modules/dev/src/org/tigris/gef/undo/UndoLogPanel.java
   trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java
      - copied, changed from r13479, /trunk/modules/dev/src/org/tigris/gef/undo/UndoManagerWrapper.java
Removed:
   trunk/modules/dev/src/org/tigris/
Modified:
   trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java

Log:
Remove undo stack - to be reimplemented at a later date

Copied: trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java (from r13479, /trunk/modules/dev/src/org/tigris/gef/undo/UndoLogPanel.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java?view=diff&rev=13483&p1=/trunk/modules/dev/src/org/tigris/gef/undo/UndoLogPanel.java&p2=trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java&r1=13479&r2=13483
==============================================================================
--- /trunk/modules/dev/src/org/tigris/gef/undo/UndoLogPanel.java	(original)
+++ trunk/modules/dev/src/org/argouml/kernel/UndoLogPanel.java	2007-09-02 15:17:30-0700
@@ -22,7 +22,7 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.tigris.gef.undo;
+package org.argouml.kernel;
 
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
@@ -62,7 +62,7 @@
         this.setViewportView(listContainer);
     }
 
-    void addMemento(Memento memento) {
+    void addMemento(Command memento) {
         list.add(new JLabel(memento.toString()));
         doLayout();
         validate();
@@ -72,7 +72,7 @@
         }
     }
 
-    void removeMemento(Memento memento) {
+    void removeMemento(Command memento) {
         list.remove(list.getComponentCount() - 1);
         doLayout();
         validate();

Copied: trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java (from r13479, /trunk/modules/dev/src/org/tigris/gef/undo/UndoManagerWrapper.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java?view=diff&rev=13483&p1=/trunk/modules/dev/src/org/tigris/gef/undo/UndoManagerWrapper.java&p2=trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java&r1=13479&r2=13483
==============================================================================
--- /trunk/modules/dev/src/org/tigris/gef/undo/UndoManagerWrapper.java	(original)
+++ trunk/modules/dev/src/org/argouml/kernel/UndoManagerWrapper.java	2007-09-02 15:17:30-0700
@@ -22,12 +22,13 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.tigris.gef.undo;
+package org.argouml.kernel;
 
 /**
  * By using this wrapper we are able to show the contents of the Undo stack.
  */
-public class UndoManagerWrapper extends UndoManager {
+//public class UndoManagerWrapper extends UndoManager {
+public class UndoManagerWrapper {
 
     /**
      * The Constructor.
@@ -35,44 +36,44 @@
     public UndoManagerWrapper() {
     }
 
-    /*
-     * @see org.tigris.gef.undo.UndoManager#addMemento(org.tigris.gef.undo.Memento)
-     */
-    public void addMemento(Memento memento) {
-        super.addMemento(memento);
-        UndoLogPanel.getInstance().addMemento(memento);
-    }
-
-    /**
-     * @see org.tigris.gef.undo.UndoManager#empty()
-     */
-    public void empty() {
-        super.empty();
-        UndoLogPanel.getInstance().removeAll();
-    }
-
-    /**
-     * @see org.tigris.gef.undo.UndoManager#emptyUndo()
-     */
-    public void emptyUndo() {
-        super.emptyUndo();
-    }
-
-    /*
-     * @see org.tigris.gef.undo.UndoManager#redo(org.tigris.gef.undo.Memento)
-     */
-    protected void redo(Memento memento) {
-        UndoLogPanel.getInstance().addMemento(memento);
-        super.redo(memento);
-    }
-
-    /*
-     * @see org.tigris.gef.undo.UndoManager#undo(org.tigris.gef.undo.Memento)
-     */
-    protected void undo(Memento memento) {
-        UndoLogPanel.getInstance().removeMemento(memento);
-        super.undo(memento);
-    }
-
+//    /*
+//     * @see org.tigris.gef.undo.UndoManager#addMemento(org.tigris.gef.undo.Memento)
+//     */
+//    public void addMemento(Memento memento) {
+//        super.addMemento(memento);
+//        UndoLogPanel.getInstance().addMemento(memento);
+//    }
+//
+//    /**
+//     * @see org.tigris.gef.undo.UndoManager#empty()
+//     */
+//    public void empty() {
+//        super.empty();
+//        UndoLogPanel.getInstance().removeAll();
+//    }
+//
+//    /**
+//     * @see org.tigris.gef.undo.UndoManager#emptyUndo()
+//     */
+//    public void emptyUndo() {
+//        super.emptyUndo();
+//    }
+//
+//    /*
+//     * @see org.tigris.gef.undo.UndoManager#redo(org.tigris.gef.undo.Memento)
+//     */
+//    protected void redo(Memento memento) {
+//        UndoLogPanel.getInstance().addMemento(memento);
+//        super.redo(memento);
+//    }
+//
+//    /*
+//     * @see org.tigris.gef.undo.UndoManager#undo(org.tigris.gef.undo.Memento)
+//     */
+//    protected void undo(Memento memento) {
+//        UndoLogPanel.getInstance().removeMemento(memento);
+//        super.undo(memento);
+//    }
+//
 
 }

Modified: trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java?view=diff&rev=13483&p1=trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java&p2=trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java&r1=13482&r2=13483
==============================================================================
--- trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java	(original)
+++ trunk/modules/dev/src/org/argouml/ui/DeveloperModule.java	2007-09-02 15:17:30-0700
@@ -32,12 +32,12 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.dev.figinspector.FigInspectorPanel;
+import org.argouml.kernel.UndoLogPanel;
+import org.argouml.kernel.UndoManagerWrapper;
 import org.argouml.model.mdr.EventPumpInspectorPanel;
 import org.argouml.moduleloader.ModuleInterface;
 import org.argouml.ui.targetmanager.TargetManagerPanel;
-import org.tigris.gef.undo.UndoLogPanel;
 import org.tigris.gef.undo.UndoManager;
-import org.tigris.gef.undo.UndoManagerWrapper;
 
 /**
  * A module to provide debug windows for developers of ArgoUML.
@@ -51,7 +51,7 @@
     /**
      * Wrapper.
      */
-    private UndoManagerWrapper um = new UndoManagerWrapper();
+//    private UndoManagerWrapper um = new UndoManagerWrapper();
 
     /**
      * This is creatable from the module loader.
@@ -68,7 +68,6 @@
     public boolean enable() {
         // TODO: Add a checkbox menu item to hide/show undo panel
 	LOG.info("Enabling developer module");
-        UndoManager.setInstance(um);
         JMenu editMenu = ProjectBrowser.getInstance().getJMenuBar().getMenu(1);
         editMenu.getMenuComponent(0).setVisible(true);
         editMenu.getMenuComponent(1).setVisible(true);
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.