More options for SCL progress monitoring

[simantics/platform.git] / bundles / org.simantics.scl.osgi / scl / UI / Progress.scl

diff --git a/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl b/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
index 2e1cf6027d34cfee6ce9763d64947d709f46e3c7..3805e163f4111dc7de09685a0f313aab5de61752 100644 (file)
--- a/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
+++ b/bundles/org.simantics.scl.osgi/scl/UI/Progress.scl
@@ -1,13 +1,33 @@
-importJava "org.eclipse.core.runtime.IProgressMonitor" where\r
-    data ProgressMonitor\r
-    \r
-    beginTask :: ProgressMonitor -> String -> Integer -> <Proc> ()\r
-    worked :: ProgressMonitor -> Integer -> <Proc> ()    \r
-    done :: ProgressMonitor -> <Proc> ()\r
-    isCanceled :: ProgressMonitor -> Boolean\r
-    setCanceled :: ProgressMonitor -> Boolean -> <Proc> ()\r
-    subTask :: ProgressMonitor -> String -> <Proc> ()\r
-\r
-importJava "org.eclipse.core.runtime.NullProgressMonitor" where\r
-    @JavaName "<init>"\r
-    createNullProgressMonitor :: () -> <Proc> ProgressMonitor\r
+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
+    split :: SubMonitor -> Integer -> <Proc> ProgressMonitor
+    @JavaName "worked"
+    workedSM :: SubMonitor -> Integer -> <Proc> ()
+
+importJava "org.eclipse.core.runtime.NullProgressMonitor" where
+    @JavaName "<init>"
+    createNullProgressMonitor :: () -> <Proc> ProgressMonitor
+
+importJava "org.simantics.scl.osgi.SCLProgressMonitor" where
+    data SCLProgressMonitor
+    @JavaName "<init>"
+    sclProgressMonitor :: (String -> Float -> <Proc> ()) -> (() -> <Proc> ()) -> (() -> <Proc> Boolean) -> (Boolean -> <Proc> ()) -> (String -> <Proc> ()) -> (String -> <Proc> ()) -> (Float -> <Proc> ()) -> <Proc> ProgressMonitor
+    @JavaName "getWork"
+    sclProgressMonitorWork :: SCLProgressMonitor -> <Proc> Float
+    @JavaName "getSubTask"
+    sclProgressMonitorSubTask :: SCLProgressMonitor -> <Proc> String
+    
\ No newline at end of file