From 5e7409bf21ba231fd26995e8ad978ef2214aecc0 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <oszkar.semerath@gmail.com>
Date: Sat, 24 Feb 2018 20:57:30 -0500
Subject: Handler calls executor

---
 .../ui/execute/ExecuteScriptHandler.java           | 27 ++--------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

(limited to 'Application/hu.bme.mit.inf.dslreasoner.application.ui')

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
index a85ce953..ce1330bd 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ui/src/hu/bme/mit/inf/dslreasoner/application/ui/execute/ExecuteScriptHandler.java
@@ -26,7 +26,6 @@ public class ExecuteScriptHandler extends AbstractHandler implements IHandler {
 	
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		System.out.println("Called");
 		ISelection selection = HandlerUtil.getCurrentSelection(event);
 		if(selection instanceof StructuredSelection) {
 			StructuredSelection structuredSelection = (StructuredSelection) selection;
@@ -35,34 +34,12 @@ public class ExecuteScriptHandler extends AbstractHandler implements IHandler {
 				Object selectedElement = iterator.next();
 				if (selectedElement instanceof IFile) {
 					IFile selectedFile = (IFile) selectedElement;
-					executeFile(selectedFile);
+					URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
+					scriptExecutor.executeScript(uri);
                 }
 			}
 		}
 		return null;
 	}
 
-	private void executeFile(IFile selectedFile) {
-		URI uri = URI.createPlatformResourceURI(selectedFile.getFullPath().toString(), true);
-		
-		ResourceSet rs = new ResourceSetImpl();
-		Resource resource;
-		try {
-			resource = rs.getResource(uri, true);
-		} catch(RuntimeException e) {
-			return;
-		}
-		
-		if(resource.getContents().size() == 1) {
-			EObject content = resource.getContents().get(0);
-			if(content instanceof ConfigurationScript) {
-				ConfigurationScript script = (ConfigurationScript) content;
-				scriptExecutor.executeScript(script);
-			} else {
-				return;
-			}
-		} else {
-			return;
-		}
-	}
 }
-- 
cgit v1.2.3-54-g00ecf