X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.osgi%2Fscl%2FUI%2FProgress.scl;h=f09d49d48c2f7d0ac598750de7e9b6e5b90048bb;hb=refs%2Fchanges%2F16%2F1416%2F1;hp=2e1cf6027d34cfee6ce9763d64947d709f46e3c7;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl b/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
index 2e1cf6027..f09d49d48 100644
--- a/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
+++ b/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
@@ -1,13 +1,24 @@
-importJava "org.eclipse.core.runtime.IProgressMonitor" where
-    data ProgressMonitor
-    
-    beginTask :: ProgressMonitor -> String -> Integer -> <Proc> ()
-    worked :: ProgressMonitor -> Integer -> <Proc> ()    
-    done :: ProgressMonitor -> <Proc> ()
-    isCanceled :: ProgressMonitor -> Boolean
-    setCanceled :: ProgressMonitor -> Boolean -> <Proc> ()
-    subTask :: ProgressMonitor -> String -> <Proc> ()
-
-importJava "org.eclipse.core.runtime.NullProgressMonitor" where
-    @JavaName "<init>"
-    createNullProgressMonitor :: () -> <Proc> ProgressMonitor
+importJava "org.eclipse.core.runtime.IProgressMonitor" where
+    data ProgressMonitor
+    
+    beginTask :: ProgressMonitor -> String -> Integer -> <Proc> ()
+    worked :: ProgressMonitor -> Integer -> <Proc> ()    
+    done :: ProgressMonitor -> <Proc> ()
+    isCanceled :: ProgressMonitor -> Boolean
+    setCanceled :: ProgressMonitor -> Boolean -> <Proc> ()
+    subTask :: ProgressMonitor -> String -> <Proc> ()
+
+importJava "org.eclipse.core.runtime.SubMonitor" where
+    data SubMonitor
+
+    @JavaName convert
+    convertMonitor :: ProgressMonitor -> Integer -> <Proc> SubMonitor
+    newChild :: SubMonitor -> Integer -> <Proc> ProgressMonitor
+
+importJava "org.eclipse.core.runtime.NullProgressMonitor" where
+    @JavaName "<init>"
+    createNullProgressMonitor :: () -> <Proc> ProgressMonitor
+
+importJava "org.simantics.scl.osgi.SCLProgressMonitor" where
+    @JavaName "<init>"
+    sclProgressMonitor :: (String -> Float -> <Proc> ()) -> (() -> <Proc> ()) -> (() -> <Proc> Boolean) -> (Boolean -> <Proc> ()) -> (String -> <Proc> ()) -> (String -> <Proc> ()) -> (Float -> <Proc> ()) -> <Proc> ProgressMonitor