Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/GenerationHandler.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/GenerationHandler.java (revision 69) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/GenerationHandler.java (revision 70) @@ -1,79 +1,79 @@ -package de.ugoe.cs.swe.bnftools.ui.handler; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess; -import org.eclipse.xtext.generator.IGenerator; -import org.eclipse.xtext.resource.IResourceDescriptions; -import org.eclipse.xtext.ui.resource.IResourceSetProvider; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class GenerationHandler extends AbstractHandler implements IHandler { - - @Inject - private IGenerator generator; - - @Inject - private Provider fileAccessProvider; - - @Inject - IResourceDescriptions resourceDescriptions; - - @Inject - IResourceSetProvider resourceSetProvider; - - @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - - ISelection selection = HandlerUtil.getCurrentSelection(event); - if (selection instanceof IStructuredSelection) { - IStructuredSelection structuredSelection = (IStructuredSelection) selection; - Object firstElement = structuredSelection.getFirstElement(); - if (firstElement instanceof IFile) { - IFile file = (IFile) firstElement; - IProject project = file.getProject(); - IFolder srcGenFolder = project.getFolder("src-gen"); - if (!srcGenFolder.exists()) { - try { - srcGenFolder.create(true, true, - new NullProgressMonitor()); - } catch (CoreException e) { - return null; - } - } - - final EclipseResourceFileSystemAccess fsa = fileAccessProvider.get(); - fsa.setOutputPath(srcGenFolder.getFullPath().toString()); - - URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); - ResourceSet rs = resourceSetProvider.get(project); - Resource r = rs.getResource(uri, true); - generator.doGenerate(r, fsa); - - - } - } - return null; - } - - @Override - public boolean isEnabled() { - return true; - } - -} +//package de.ugoe.cs.swe.bnftools.ui.handler; +// +//import org.eclipse.core.commands.AbstractHandler; +//import org.eclipse.core.commands.ExecutionEvent; +//import org.eclipse.core.commands.ExecutionException; +//import org.eclipse.core.commands.IHandler; +//import org.eclipse.core.resources.IFile; +//import org.eclipse.core.resources.IFolder; +//import org.eclipse.core.resources.IProject; +//import org.eclipse.core.runtime.CoreException; +//import org.eclipse.core.runtime.NullProgressMonitor; +//import org.eclipse.emf.common.util.URI; +//import org.eclipse.emf.ecore.resource.Resource; +//import org.eclipse.emf.ecore.resource.ResourceSet; +//import org.eclipse.jface.viewers.ISelection; +//import org.eclipse.jface.viewers.IStructuredSelection; +//import org.eclipse.ui.handlers.HandlerUtil; +//import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess; +//import org.eclipse.xtext.generator.IGenerator; +//import org.eclipse.xtext.resource.IResourceDescriptions; +//import org.eclipse.xtext.ui.resource.IResourceSetProvider; +// +//import com.google.inject.Inject; +//import com.google.inject.Provider; +// +//public class GenerationHandler extends AbstractHandler implements IHandler { +// +// @Inject +// private IGenerator generator; +// +// @Inject +// private Provider fileAccessProvider; +// +// @Inject +// IResourceDescriptions resourceDescriptions; +// +// @Inject +// IResourceSetProvider resourceSetProvider; +// +// @Override +// public Object execute(ExecutionEvent event) throws ExecutionException { +// +// ISelection selection = HandlerUtil.getCurrentSelection(event); +// if (selection instanceof IStructuredSelection) { +// IStructuredSelection structuredSelection = (IStructuredSelection) selection; +// Object firstElement = structuredSelection.getFirstElement(); +// if (firstElement instanceof IFile) { +// IFile file = (IFile) firstElement; +// IProject project = file.getProject(); +// IFolder srcGenFolder = project.getFolder("src-gen"); +// if (!srcGenFolder.exists()) { +// try { +// srcGenFolder.create(true, true, +// new NullProgressMonitor()); +// } catch (CoreException e) { +// return null; +// } +// } +// +// final EclipseResourceFileSystemAccess fsa = fileAccessProvider.get(); +// fsa.setOutputPath(srcGenFolder.getFullPath().toString()); +// +// URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); +// ResourceSet rs = resourceSetProvider.get(project); +// Resource r = rs.getResource(uri, true); +// generator.doGenerate(r, fsa); +// +// +// } +// } +// return null; +// } +// +// @Override +// public boolean isEnabled() { +// return true; +// } +// +//} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF (revision 69) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF (revision 70) @@ -19,4 +19,6 @@ org.eclipse.xtext.common.types Import-Package: org.apache.log4j, + org.eclipse.core.resources, + org.eclipse.core.runtime;version="3.4.0", org.eclipse.xtext.xbase.lib Bundle-RequiredExecutionEnvironment: J2SE-1.5 Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend (revision 69) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.xtend (revision 70) @@ -22,5 +22,6 @@ import org.eclipse.xtext.generator.IFileSystemAccessExtension2 import org.eclipse.emf.common.util.URI; - +import org.eclipse.xtext.generator.IFileSystemAccessExtension +import java.io.PrintWriter /** * Generates code from your model files on save. @@ -31,4 +32,5 @@ //generation of the xsl-file override void doGenerate(Resource resource, IFileSystemAccess fsa) { + var String workspacePath =WorkspaceResolver.getWorkspace(); for (e : resource.allContents.toIterable.filter(EtsiBnf)) { if (e.bnfEntry.size!=0) { @@ -36,15 +38,14 @@ //generate pdf -// var uri = (fsa as IFileSystemAccessExtension2).getURI(e.name+".fo"); -// (fsa as IFileSystemAccessExtension2). -// -// System.out.println(uri.hasAbsolutePath()); -// System.out.println(uri.path.substring(0,uri.path.length-3)); -// System.out.println(uri.file); + var uri = (fsa as IFileSystemAccessExtension2).getURI(e.name+".fo"); + var String fullUri = workspacePath+uri.path.substring(10,uri.path.length); + System.out.println(workspacePath+uri.path.substring(10,uri.path.length)); + var File file = new File(fullUri); + System.out.println(file.exists); // System.out.println(uri.toString()); -// var File file = new File(uri.path).absoluteFile; + + // System.out.println(file.exists); -// var String aPath = file.absolutePath; -// + // foToPdf.createPdfFromFo(file,aPath.substring(0,aPath.length-3)); } Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/WorkspaceResolver.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/WorkspaceResolver.java (revision 70) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/WorkspaceResolver.java (revision 70) @@ -0,0 +1,12 @@ +package de.ugoe.cs.swe.bnftools.generator; + +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; + +public class WorkspaceResolver { + + public static String getWorkspace(){ + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + return workspace.getRoot().getLocation().toFile().toURI().getPath(); + } +} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java (revision 69) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/generator/foToPdf.java (revision 70) @@ -22,9 +22,9 @@ public class foToPdf { -// public static void main(String args[]) throws IOException, FOPException, -// TransformerException { -// -// createfoFromPdf("test1","test1"); -// } + public static void main(String args[]) throws IOException, FOPException, + TransformerException { + + createfoFromPdf("test1","test1"); + } public static void createPdfFromFo(String fileName) throws IOException, FOPException,