X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.ui%2Fsrc%2Forg%2Fsimantics%2Fui%2Fworkbench%2Fhandler%2FSessionRedoHandler.java;fp=bundles%2Forg.simantics.ui%2Fsrc%2Forg%2Fsimantics%2Fui%2Fworkbench%2Fhandler%2FSessionRedoHandler.java;h=969ff8e2ce0c1f74a54020010414a38aa8a2f92a;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=5eceea7e32f56fc14c2368f0214696f28173547c;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/handler/SessionRedoHandler.java b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/handler/SessionRedoHandler.java
index 5eceea7e3..969ff8e2c 100644
--- a/bundles/org.simantics.ui/src/org/simantics/ui/workbench/handler/SessionRedoHandler.java
+++ b/bundles/org.simantics.ui/src/org/simantics/ui/workbench/handler/SessionRedoHandler.java
@@ -1,111 +1,111 @@
-/*******************************************************************************
- * Copyright (c) 2007- VTT Technical Research Centre of Finland.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.ui.workbench.handler;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.simantics.Simantics;
-import org.simantics.db.ChangeSetIdentifier;
-import org.simantics.db.Operation;
-import org.simantics.db.Session;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.exception.NoHistoryException;
-import org.simantics.db.service.ManagementSupport;
-import org.simantics.db.service.UndoRedoSupport;
-import org.simantics.utils.ui.workbench.WorkbenchUtils;
-
-/**
- * @author Kalle Kondelin
- */
-public class SessionRedoHandler extends AbstractHandler {
-
-    private final boolean DEBUG = false;
-
-    @Override
-    public Object execute(ExecutionEvent e) throws ExecutionException {
-        if (DEBUG)
-            System.out.println("--\nRedo handler called.");
-
-        IWorkbenchPart part = HandlerUtil.getActivePart(e);
-        if (part == null)
-            return null;
-        IActionBars actionBars = WorkbenchUtils.getActionBars(part);
-        final Session session = Simantics.peekSession();
-        if (session == null)
-            return null;
-
-        try {
-            final AtomicReference<String> msg = new AtomicReference<String>();
-            IRunnableWithProgress redo = new IRunnableWithProgress() {
-                @Override
-                public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        monitor.beginTask("Redo", IProgressMonitor.UNKNOWN);
-                        msg.set( redo( session ) );
-                    } catch (NoHistoryException e) {
-                        msg.set("Nothing to redo.");
-                    } catch (DatabaseException e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        monitor.done();
-                    }
-                }
-            };
-
-            // busyCursorWhile does not work because locking the session for undo
-            // will also lock the UI completely.
-            //PlatformUI.getWorkbench().getProgressService().busyCursorWhile(undo);
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-            new ProgressMonitorDialog(shell).run(true, false, redo);
-            actionBars.getStatusLineManager().setMessage( msg.get() );
-        } catch (InvocationTargetException e1) {
-            throw new ExecutionException("Redo failed, database failure.", e1.getTargetException());
-        } catch (InterruptedException e1) {
-            throw new ExecutionException("Redo failed, interrupted.", e1);
-        }
-        return null;
-    }
-
-    private String redo(Session session) throws DatabaseException {
-        UndoRedoSupport support = session.getService(UndoRedoSupport.class);
-        List<Operation> ops = support.redo(session, 1);
-        if(ops.isEmpty())
-            return "Nothing to redo.";
-        
-        Operation mainOperation = ops.get(0);
-        
-        String msg = null;
-        long csId = mainOperation.getCSId();
-
-        ManagementSupport management = session.getService(ManagementSupport.class);
-        for(ChangeSetIdentifier id : management.getChangeSetIdentifiers(csId, csId))
-            if(msg == null)
-                msg = "Redid: " + SessionUndoHandler.getComment(session, id);
-
-        if (DEBUG)
-            System.out.println(msg);
-        return msg;
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007- VTT Technical Research Centre of Finland.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.ui.workbench.handler;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.Simantics;
+import org.simantics.db.ChangeSetIdentifier;
+import org.simantics.db.Operation;
+import org.simantics.db.Session;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.NoHistoryException;
+import org.simantics.db.service.ManagementSupport;
+import org.simantics.db.service.UndoRedoSupport;
+import org.simantics.utils.ui.workbench.WorkbenchUtils;
+
+/**
+ * @author Kalle Kondelin
+ */
+public class SessionRedoHandler extends AbstractHandler {
+
+    private final boolean DEBUG = false;
+
+    @Override
+    public Object execute(ExecutionEvent e) throws ExecutionException {
+        if (DEBUG)
+            System.out.println("--\nRedo handler called.");
+
+        IWorkbenchPart part = HandlerUtil.getActivePart(e);
+        if (part == null)
+            return null;
+        IActionBars actionBars = WorkbenchUtils.getActionBars(part);
+        final Session session = Simantics.peekSession();
+        if (session == null)
+            return null;
+
+        try {
+            final AtomicReference<String> msg = new AtomicReference<String>();
+            IRunnableWithProgress redo = new IRunnableWithProgress() {
+                @Override
+                public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+                    try {
+                        monitor.beginTask("Redo", IProgressMonitor.UNKNOWN);
+                        msg.set( redo( session ) );
+                    } catch (NoHistoryException e) {
+                        msg.set("Nothing to redo.");
+                    } catch (DatabaseException e) {
+                        throw new InvocationTargetException(e);
+                    } finally {
+                        monitor.done();
+                    }
+                }
+            };
+
+            // busyCursorWhile does not work because locking the session for undo
+            // will also lock the UI completely.
+            //PlatformUI.getWorkbench().getProgressService().busyCursorWhile(undo);
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+            new ProgressMonitorDialog(shell).run(true, false, redo);
+            actionBars.getStatusLineManager().setMessage( msg.get() );
+        } catch (InvocationTargetException e1) {
+            throw new ExecutionException("Redo failed, database failure.", e1.getTargetException());
+        } catch (InterruptedException e1) {
+            throw new ExecutionException("Redo failed, interrupted.", e1);
+        }
+        return null;
+    }
+
+    private String redo(Session session) throws DatabaseException {
+        UndoRedoSupport support = session.getService(UndoRedoSupport.class);
+        List<Operation> ops = support.redo(session, 1);
+        if(ops.isEmpty())
+            return "Nothing to redo.";
+        
+        Operation mainOperation = ops.get(0);
+        
+        String msg = null;
+        long csId = mainOperation.getCSId();
+
+        ManagementSupport management = session.getService(ManagementSupport.class);
+        for(ChangeSetIdentifier id : management.getChangeSetIdentifiers(csId, csId))
+            if(msg == null)
+                msg = "Redid: " + SessionUndoHandler.getComment(session, id);
+
+        if (DEBUG)
+            System.out.println(msg);
+        return msg;
+    }
+
+}