Renamed

2 files changed, 22 insertions, 1 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend
new file mode 100644
index 00000000..624e75a5
--- /dev/null
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/EclipseBasedProgressMonitor.xtend
@@ -0,0 +1,21 @@
+package hu.bme.mit.inf.dslreasoner.application.execution

+

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolverProgressMonitor

+import org.eclipse.core.runtime.IProgressMonitor

+

+class EclipseBasedProgressMonitor extends SolverProgressMonitor{

+        val IProgressMonitor internalMonitor

+        

+        public new(IProgressMonitor internalMonitor) {

+                this.internalMonitor = internalMonitor

+        }

+        

+        override protected processWorked(double amount) {

+                internalMonitor.worked((amount*1000).intValue)

+        }

+        

+        override isCancelled() {

+                super.isCancelled() || internalMonitor.isCanceled

+        }

+        

+}
\ No newline at end of file
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
index 2cbfc20d..95a5d03f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
@@ -164,7 +164,7 @@ class GenerationTaskExecutor {
                                 

                                 // 6.2 For each run, the configuration and the workspace is adjusted

                                 solverLoader.setRunIndex(solverConfig,configurationMap,run,console)

-                                solverConfig.progressMonitor = new EclipseProgressMonitor(monitor)

+                                solverConfig.progressMonitor = new EclipseBasedProgressMonitor(monitor)

                                 val reasonerWorkspaceForRun = if(runs > 1) {

                                         reasonerWorkspace.subWorkspace('''run«run»''',"") => [initAndClear]

                                 } else {