added getFile() and refresh() to workspace

author: OszkarSemerath <oszkar.semerath@gmail.com> 2018-02-28 18:10:34 -0500
committer: OszkarSemerath <oszkar.semerath@gmail.com> 2018-02-28 18:10:34 -0500
commit: 896dff596a74f1a79082d65952ef1660bac4877a (patch)
tree: 5866063e3f5b42f406ffeaeda0a682a999af1e64
parent: Merge branch 'master' of https://github.com/viatra/VIATRA-Generator (diff)
download: VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.tar.gz
VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.tar.zst
VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.zip
4 files changed, 27 insertions, 1 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend
index fd3e7348..fa677a7c 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend
@@ -51,4 +51,9 @@ class NullWorkspace extends ReasonerWorkspace{
        override public String readText(String name) {
                throw new UnsupportedOperationException(message)
        }
+        
+        override public getFile(String name) {
+                throw new UnsupportedOperationException(message)
+        }
+        override refreshFile(String name) { }
 }
 \ No newline at end of file
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 8efc1ce7..54ba1936 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
@@ -81,4 +81,9 @@ class FileSystemWorkspace extends ReasonerWorkspace{
                }
        }
        
+        override public getFile(String name) {
+                val uri = getURI(name)
+                return new File(uri.toFileString)
+        }
+        override refreshFile(String name) { }
 }
 \ No newline at end of file
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 c7e4dcbf..0bd350c7 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
@@ -113,4 +113,18 @@ class ProjectWorkspace extends ReasonerWorkspace{
                target.members.map[it.name]
        }
        
+        override public getFile(String name) {
+                val file = target.getTargetFile(name);
+                val uri = if(file.isLinked()){
+                   file.getRawLocation();
+                } else {
+                        file.getLocation();
+                }
+                return uri.toFile
+        }
+        
+        override refreshFile(String name) {
+                val file = target.getTargetFile(name)
+                file.refreshLocal(1,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 45cc7b3b..4a5055e8 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
@@ -10,6 +10,7 @@ import org.eclipse.emf.ecore.resource.Resource
 import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.util.List
+import java.io.File
 abstract class ReasonerWorkspace{
        
@@ -39,7 +40,8 @@ abstract class ReasonerWorkspace{
                val URI resourceURI = getURI(name)
                return resSet.createResource(resourceURI);
        }
-        
+        public def File getFile(String name)
+        public def void refreshFile(String name)
        
        /**
         * Writes a model
author	OszkarSemerath <oszkar.semerath@gmail.com>	2018-02-28 18:10:34 -0500
committer	OszkarSemerath <oszkar.semerath@gmail.com>	2018-02-28 18:10:34 -0500
commit	896dff596a74f1a79082d65952ef1660bac4877a (patch)
tree	5866063e3f5b42f406ffeaeda0a682a999af1e64
parent	Merge branch 'master' of https://github.com/viatra/VIATRA-Generator (diff)
download	VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.tar.gz VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.tar.zst VIATRA-Generator-896dff596a74f1a79082d65952ef1660bac4877a.zip

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend index fd3e7348..fa677a7c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/NullWorkspace.xtend
@@ -51,4 +51,9 @@ class NullWorkspace extends ReasonerWorkspace{
51	override public String readText(String name) {	51	override public String readText(String name) {
52	throw new UnsupportedOperationException(message)	52	throw new UnsupportedOperationException(message)
53	}	53	}
		54
		55	override public getFile(String name) {
		56	throw new UnsupportedOperationException(message)
		57	}
		58	override refreshFile(String name) { }
54	} \ No newline at end of file	59	} \ No newline at end of file


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 8efc1ce7..54ba1936 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
@@ -81,4 +81,9 @@ class FileSystemWorkspace extends ReasonerWorkspace{
81	}	81	}
82	}	82	}
83		83
		84	override public getFile(String name) {
		85	val uri = getURI(name)
		86	return new File(uri.toFileString)
		87	}
		88	override refreshFile(String name) { }
84	} \ No newline at end of file	89	} \ No newline at end of file


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 c7e4dcbf..0bd350c7 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
@@ -113,4 +113,18 @@ class ProjectWorkspace extends ReasonerWorkspace{
113	target.members.map[it.name]	113	target.members.map[it.name]
114	}	114	}
115		115
		116	override public getFile(String name) {
		117	val file = target.getTargetFile(name);
		118	val uri = if(file.isLinked()){
		119	file.getRawLocation();
		120	} else {
		121	file.getLocation();
		122	}
		123	return uri.toFile
		124	}
		125
		126	override refreshFile(String name) {
		127	val file = target.getTargetFile(name)
		128	file.refreshLocal(1,monitor)
		129	}
116	}	130	}


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 45cc7b3b..4a5055e8 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
@@ -10,6 +10,7 @@ import org.eclipse.emf.ecore.resource.Resource
10	import java.io.ByteArrayOutputStream	10	import java.io.ByteArrayOutputStream
11	import java.io.IOException	11	import java.io.IOException
12	import java.util.List	12	import java.util.List
		13	import java.io.File
13		14
14	abstract class ReasonerWorkspace{	15	abstract class ReasonerWorkspace{
15		16
@@ -39,7 +40,8 @@ abstract class ReasonerWorkspace{
39	val URI resourceURI = getURI(name)	40	val URI resourceURI = getURI(name)
40	return resSet.createResource(resourceURI);	41	return resSet.createResource(resourceURI);
41	}	42	}
42		43	public def File getFile(String name)
		44	public def void refreshFile(String name)
43		45
44	/**	46	/**
45	* Writes a model	47	* Writes a model