From 9a3018ae6f98996945de9235afb21a89d847190e Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Sat, 3 Mar 2018 02:00:28 -0500 Subject: separated init and clear phases in workspaces --- .../hu/bme/mit/inf/dslreasoner/workspace/FileSystemWorkspace.xtend | 6 +++++- .../hu/bme/mit/inf/dslreasoner/workspace/ProjectWorkspace.xtend | 5 +++-- .../hu/bme/mit/inf/dslreasoner/workspace/ReasonerWorkspace.xtend | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model/src') 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{ getFolderURI } - override initAndClear() { + override init() { val folder = new File(folderURI.toFileString) folder.mkdirs + } + + override clear() { + val folder = new File(folderURI.toFileString) for(file : folder.listFiles) { file.deleteFile } 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{ override getWorkspaceURI() { getDirUri } - - override initAndClear() { + override init() { target = ResourcesPlugin.workspace.root val segments = if(dirUri.platformResource) { @@ -44,6 +43,8 @@ class ProjectWorkspace extends ReasonerWorkspace{ for(nameSegment : segments) { target = createContainer(target,nameSegment) } + } + override clear() { target.members.forEach[delete(false,monitor)] } 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{ def URI getWorkspaceURI(); + def public void init() + def public void clear() /** * Creates the target folder and clears the workspace for the reasoning */ - def public void initAndClear() + def public void initAndClear() { + init() + clear() + } def protected URI getURI(String name); protected def Resource getResource(String name) { -- cgit v1.2.3-54-g00ecf