X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.team.ui%2Fsrc%2Forg%2Fsimantics%2Fteam%2Fui%2Fhandlers%2FStageEditHandler.java;h=2d59e369d3b2baca4d98960f869a4e8b3d23cc89;hb=e88be95edf1f80781646cfdf717ec1b663264179;hp=63c2f0ac9dd658ab8d8d4be67066a13a76abd155;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.team.ui/src/org/simantics/team/ui/handlers/StageEditHandler.java b/bundles/org.simantics.team.ui/src/org/simantics/team/ui/handlers/StageEditHandler.java index 63c2f0ac9..2d59e369d 100644 --- a/bundles/org.simantics.team.ui/src/org/simantics/team/ui/handlers/StageEditHandler.java +++ b/bundles/org.simantics.team.ui/src/org/simantics/team/ui/handlers/StageEditHandler.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.ui.PlatformUI; +import org.simantics.Simantics; import org.simantics.db.Resource; import org.simantics.db.ServerReference; import org.simantics.db.Session; @@ -30,7 +31,6 @@ import org.simantics.team.Activator; import org.simantics.team.internal.StagingLauncher; import org.simantics.team.internal.StagingLauncher.Config; import org.simantics.team.internal.StagingLauncher.StagingResult; -import org.simantics.ui.SimanticsUI; import org.simantics.ui.workbench.handler.AbstractPreferenceHandler; import org.simantics.utils.FileUtils; import org.simantics.utils.ui.ErrorLogger; @@ -49,7 +49,7 @@ public class StageEditHandler extends AbstractPreferenceHandler { public Object execute(ExecutionEvent event) throws ExecutionException { System.out.println("DEBUG: EditStageHandler"); try { - Session session = SimanticsUI.getSession(); + Session session = Simantics.getSession(); File wsFolder = new File(Platform.getInstanceLocation().getURL().getFile()); File stFolder = new File(wsFolder, "staging"); if (!stFolder.isDirectory()) @@ -79,7 +79,7 @@ public class StageEditHandler extends AbstractPreferenceHandler { msg = new String(data, Charset.defaultCharset()); } if (msg.isEmpty() || msg.matches(" *")) - msg = "Staging crashed. Contact application support."; + msg = "Staging crashed."; ShowError.showError("Staging failed, errorcode="+result.getExitValue(), msg, new Exception()); } if (result.getMessageLog() != null) {