diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-03 02:00:28 -0500 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-03-03 02:00:28 -0500 |
commit | 9a3018ae6f98996945de9235afb21a89d847190e (patch) | |
tree | 51f288afd6aef44ad6bf371abb2b84adccc5e0f2 /Framework/hu.bme.mit.inf.dslreasoner.logic.model | |
parent | fixed default model number overriding custom value + added visualisation (diff) | |
download | VIATRA-Generator-9a3018ae6f98996945de9235afb21a89d847190e.tar.gz VIATRA-Generator-9a3018ae6f98996945de9235afb21a89d847190e.tar.zst VIATRA-Generator-9a3018ae6f98996945de9235afb21a89d847190e.zip |
separated init and clear phases in workspaces
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model')
3 files changed, 14 insertions, 4 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/FileSystemWorkspace.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/FileSystemWorkspace.xtend index 54ba1936..78803ddf 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/FileSystemWorkspace.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/FileSystemWorkspace.xtend | |||
@@ -24,9 +24,13 @@ class FileSystemWorkspace extends ReasonerWorkspace{ | |||
24 | getFolderURI | 24 | getFolderURI |
25 | } | 25 | } |
26 | 26 | ||
27 | override initAndClear() { | 27 | override init() { |
28 | val folder = new File(folderURI.toFileString) | 28 | val folder = new File(folderURI.toFileString) |
29 | folder.mkdirs | 29 | folder.mkdirs |
30 | } | ||
31 | |||
32 | override clear() { | ||
33 | val folder = new File(folderURI.toFileString) | ||
30 | for(file : folder.listFiles) { | 34 | for(file : folder.listFiles) { |
31 | file.deleteFile | 35 | file.deleteFile |
32 | } | 36 | } |
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ProjectWorkspace.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ProjectWorkspace.xtend index 0bd350c7..57a79b03 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ProjectWorkspace.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ProjectWorkspace.xtend | |||
@@ -32,8 +32,7 @@ class ProjectWorkspace extends ReasonerWorkspace{ | |||
32 | override getWorkspaceURI() { | 32 | override getWorkspaceURI() { |
33 | getDirUri | 33 | getDirUri |
34 | } | 34 | } |
35 | 35 | override init() { | |
36 | override initAndClear() { | ||
37 | target = ResourcesPlugin.workspace.root | 36 | target = ResourcesPlugin.workspace.root |
38 | 37 | ||
39 | val segments = if(dirUri.platformResource) { | 38 | val segments = if(dirUri.platformResource) { |
@@ -44,6 +43,8 @@ class ProjectWorkspace extends ReasonerWorkspace{ | |||
44 | for(nameSegment : segments) { | 43 | for(nameSegment : segments) { |
45 | target = createContainer(target,nameSegment) | 44 | target = createContainer(target,nameSegment) |
46 | } | 45 | } |
46 | } | ||
47 | override clear() { | ||
47 | target.members.forEach[delete(false,monitor)] | 48 | target.members.forEach[delete(false,monitor)] |
48 | } | 49 | } |
49 | 50 | ||
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ReasonerWorkspace.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ReasonerWorkspace.xtend index 4a5055e8..80190a14 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ReasonerWorkspace.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/workspace/ReasonerWorkspace.xtend | |||
@@ -27,10 +27,15 @@ abstract class ReasonerWorkspace{ | |||
27 | 27 | ||
28 | def URI getWorkspaceURI(); | 28 | def URI getWorkspaceURI(); |
29 | 29 | ||
30 | def public void init() | ||
31 | def public void clear() | ||
30 | /** | 32 | /** |
31 | * Creates the target folder and clears the workspace for the reasoning | 33 | * Creates the target folder and clears the workspace for the reasoning |
32 | */ | 34 | */ |
33 | def public void initAndClear() | 35 | def public void initAndClear() { |
36 | init() | ||
37 | clear() | ||
38 | } | ||
34 | 39 | ||
35 | def protected URI getURI(String name); | 40 | def protected URI getURI(String name); |
36 | protected def Resource getResource(String name) { | 41 | protected def Resource getResource(String name) { |