From: jsimomaa <jsimomaa@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 14 Jul 2014 12:50:43 +0000 (+0000)
Subject: refs #5096
X-Git-Tag: v1.29.0~244
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=4c6b1416486bc5d6fae5b07004b163e1773d2850;p=simantics%2Fsysdyn.git

refs #5096

Renaming ExpressionFieldUndoHandler to PropertyViewUndoHandler

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29878 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index 6e8d49e6..7b06dd5b 100644
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -2506,7 +2506,7 @@
          </activeWhen>
       </handler>
             <handler
-            class="org.simantics.sysdyn.ui.ExpressionFieldUndoHandler"
+            class="org.simantics.sysdyn.ui.PropertyViewUndoHandler"
             commandId="org.eclipse.ui.edit.undo">
          <activeWhen>
             <reference
@@ -2515,7 +2515,7 @@
          </activeWhen>
       </handler>
       <handler
-            class="org.simantics.sysdyn.ui.ExpressionFieldUndoHandler"
+            class="org.simantics.sysdyn.ui.PropertyViewUndoHandler"
             commandId="org.eclipse.ui.edit.redo">
          <activeWhen>
             <reference
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/ExpressionFieldUndoHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/PropertyViewUndoHandler.java
similarity index 51%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/ExpressionFieldUndoHandler.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/PropertyViewUndoHandler.java
index 3f33ea9c..9fc3a966 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/ExpressionFieldUndoHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/PropertyViewUndoHandler.java
@@ -3,36 +3,47 @@ package org.simantics.sysdyn.ui;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.util.Layer0Utils;
+import org.eclipse.swt.widgets.Widget;
+import org.simantics.browsing.ui.swt.widgets.TrackedText;
 import org.simantics.sysdyn.ui.properties.widgets.expressions.ExpressionField;
+import org.simantics.ui.workbench.handler.SessionUndoHandler;
 
-public class ExpressionFieldUndoHandler extends AbstractHandler {
+public class PropertyViewUndoHandler extends AbstractHandler {
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         String id = event.getCommand().getId();
         
+        Event e = (Event)event.getTrigger();
+        Widget w = e.widget;
+        Object data = w.getData(TrackedText.ID);
+        if (data != null) {
+            TrackedText text = (TrackedText) data;
+            if (id.equals("org.eclipse.ui.edit.undo"))
+                text.undo();
+            else
+                text.redo();
+            return null;
+        }
+        
+        
         Composite c = ((Control)((Event)event.getTrigger()).widget).getParent();
         if (c instanceof ExpressionField) {
             ExpressionField f = (ExpressionField)c;
-            if(id.equals("org.eclipse.ui.edit.undo")) {
+            if (id.equals("org.eclipse.ui.edit.undo")) {
                 f.getSourceViewer().getUndoManager().undo();
             }
             else {
                 f.getSourceViewer().getUndoManager().redo();
             }
         } else {
-            try {
-                Layer0Utils.undo();
-            } catch (DatabaseException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
+                SessionUndoHandler suh = new SessionUndoHandler();
+                suh.execute(event);
+                //Layer0Utils.undo();
+            
         }
         return null;
     }