aboutsummaryrefslogtreecommitdiffstats
path: root/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
diff options
context:
space:
mode:
Diffstat (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend')
-rw-r--r--Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend10
1 files changed, 4 insertions, 6 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
index 289bbe5c..91d3d286 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/ScriptConsole.xtend
@@ -9,6 +9,8 @@ import java.util.LinkedHashSet
9import java.util.LinkedList 9import java.util.LinkedList
10import java.util.List 10import java.util.List
11import java.util.Map 11import java.util.Map
12import java.util.concurrent.CompletableFuture
13import javax.swing.text.BadLocationException
12import org.eclipse.emf.common.util.URI 14import org.eclipse.emf.common.util.URI
13import org.eclipse.jface.text.DocumentEvent 15import org.eclipse.jface.text.DocumentEvent
14import org.eclipse.jface.text.IDocumentListener 16import org.eclipse.jface.text.IDocumentListener
@@ -17,9 +19,6 @@ import org.eclipse.ui.console.ConsolePlugin
17import org.eclipse.ui.console.MessageConsole 19import org.eclipse.ui.console.MessageConsole
18import org.eclipse.ui.console.MessageConsoleStream 20import org.eclipse.ui.console.MessageConsoleStream
19import org.eclipse.xtend.lib.annotations.Data 21import org.eclipse.xtend.lib.annotations.Data
20import java.util.concurrent.CompletableFuture
21import java.util.concurrent.Future
22import javax.swing.text.BadLocationException
23 22
24//import org.eclipse.ui.console.MessageConsole 23//import org.eclipse.ui.console.MessageConsole
25 24
@@ -44,7 +43,6 @@ class ScriptConsole {
44 static val empty = "" 43 static val empty = ""
45 44
46 public new( 45 public new(
47 boolean printToConsole,
48 boolean printToRuntimeConsole, 46 boolean printToRuntimeConsole,
49 boolean cleanFiles, 47 boolean cleanFiles,
50 URI messageConsoleURI, 48 URI messageConsoleURI,
@@ -60,7 +58,7 @@ class ScriptConsole {
60 this.statisticsWorkspace = prepareWorkspace(statisticsConsoleURI,errorMessagesDuringInitialisation) 58 this.statisticsWorkspace = prepareWorkspace(statisticsConsoleURI,errorMessagesDuringInitialisation)
61 this.statisticsFileName = prepareFileName(statisticsConsoleURI) 59 this.statisticsFileName = prepareFileName(statisticsConsoleURI)
62 60
63 this.printToConsole = printToConsole 61 this.printToConsole = (ConsolePlugin.getDefault() === null)
64 this.runtimeConsole = if(printToRuntimeConsole) { prepareRuntimeConsole } else { null } 62 this.runtimeConsole = if(printToRuntimeConsole) { prepareRuntimeConsole } else { null }
65 63
66 errorMessagesDuringInitialisation.forEach[ 64 errorMessagesDuringInitialisation.forEach[
@@ -195,7 +193,7 @@ class ScriptConsole {
195 throw new IllegalArgumentException 193 throw new IllegalArgumentException
196 } 194 }
197 195
198 return '''«FOR i : 0..<decorators.size»«separatedMessage.get(i)»«decorators.get(i)»«ENDFOR»«separatedMessage.last»''' 196 return '''«FOR i : 0..<decorators.size»«separatedMessage.get(i)»[«decorators.get(i).text»]«ENDFOR»«separatedMessage.last»'''
199 } 197 }
200 private def writeToRuntimeConsole(CharSequence message) { 198 private def writeToRuntimeConsole(CharSequence message) {
201 // 1. reveal the console view 199 // 1. reveal the console view