Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandler.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandler.java (revision 72) +++ (revision ) @@ -1,144 +1,0 @@ -package de.ugoe.cs.swe.bnftools.ui.handler; - -import java.io.File; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -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.commands.common.NotDefinedException; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EcorePackage; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.xml.type.SimpleAnyType; -import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2; -import org.eclipse.xtext.generator.IGenerator; -import org.eclipse.xtext.generator.OutputConfiguration; -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 BT_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 { - - //used to save the command name (defined in extensions) - String mode = ""; - - try { - mode = event.getCommand().getName(); - } catch (NotDefinedException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - - // stuff to get the workbench and current file - IWorkbench wb = PlatformUI.getWorkbench(); - IWorkbenchWindow window = wb.getActiveWorkbenchWindow(); - IWorkbenchPage page = window.getActivePage(); - IEditorPart editor = page.getActiveEditor(); - IEditorInput input = editor.getEditorInput(); - IPath path = ((FileEditorInput) input).getPath(); - - String name = path.toString(); - File myfile = new File(name); - - IWorkspace workspace= ResourcesPlugin.getWorkspace(); - IPath location= Path.fromOSString(myfile.getAbsolutePath()); - IFile file= workspace.getRoot().getFileForLocation(location); - - 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 EclipseResourceFileSystemAccess2 fsa = fileAccessProvider.get(); - - fsa.setProject(project); - - //same stuff - //fsa.setOutputPath("src-gen"); - fsa.setOutputPath(srcGenFolder.getName().toString()); - - fsa.setMonitor(new NullProgressMonitor()); - Map teste = fsa.getOutputConfigurations(); - - Iterator> it = teste.entrySet().iterator(); - - //make a new Outputconfiguration <- needed - while(it.hasNext()){ - - Entry next = it.next(); - OutputConfiguration out = next.getValue(); - out.isOverrideExistingResources(); - out.setCreateOutputDirectory(true); // <--- do not touch this - - } - // -----> - - URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); - ResourceSet rs = resourceSetProvider.get(project); - Resource r = rs.getResource(uri, true); - - // to pass a String inside a resource i have to wrap it in a EOBject - SimpleAnyType wrapper = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); - wrapper.setInstanceType(EcorePackage.eINSTANCE.getEString()); - wrapper.setValue(mode); - // - - // add string to resource - r.getContents().add(wrapper); - - generator.doGenerate(r, fsa); - - return null; - - } - - @Override - public boolean isEnabled() { - return true; - } - -} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerPDF.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerPDF.java (revision 84) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerPDF.java (revision 84) @@ -0,0 +1,153 @@ +package de.ugoe.cs.swe.bnftools.ui.handler; + +import java.io.File; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +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.commands.common.NotDefinedException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.xml.type.SimpleAnyType; +import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2; +import org.eclipse.xtext.generator.IGenerator; +import org.eclipse.xtext.generator.OutputConfiguration; +import org.eclipse.xtext.resource.IResourceDescriptions; +import org.eclipse.xtext.ui.resource.IResourceSetProvider; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +import de.ugoe.cs.swe.bnftools.generator.EbnfGenerator; + +public class BT_GenerationHandlerPDF extends AbstractHandler implements IHandler { + + @Inject + private IGenerator generator; + + @Inject + private Provider fileAccessProvider; + + @Inject + IResourceDescriptions resourceDescriptions; + + @Inject + IResourceSetProvider resourceSetProvider; + + + + @Override + public boolean isEnabled() { + return true; + } + + + + + public Object execute(ExecutionEvent event) throws ExecutionException { + MessageDialog.openInformation(HandlerUtil.getActiveShell(event), + "Hello", "Generating PDF"); + + + //used to save the command name (defined in extensions) + String mode = ""; + + try { + mode = event.getCommand().getName(); + } catch (NotDefinedException e1) { + e1.printStackTrace(); + } + + // stuff to get the workbench and current file + IWorkbench wb = PlatformUI.getWorkbench(); + IWorkbenchWindow window = wb.getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + IEditorPart editor = page.getActiveEditor(); + IEditorInput input = editor.getEditorInput(); + IPath path = ((FileEditorInput) input).getPath(); + + String name = path.toString(); + File myfile = new File(name); + + IWorkspace workspace= ResourcesPlugin.getWorkspace(); + IPath location= Path.fromOSString(myfile.getAbsolutePath()); + IFile file= workspace.getRoot().getFileForLocation(location); + + 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 EclipseResourceFileSystemAccess2 fsa = fileAccessProvider.get(); + + fsa.setProject(project); + + //same stuff + //fsa.setOutputPath("src-gen"); + fsa.setOutputPath(srcGenFolder.getName().toString()); + + fsa.setMonitor(new NullProgressMonitor()); + Map teste = fsa.getOutputConfigurations(); + + Iterator> it = teste.entrySet().iterator(); + + //make a new Outputconfiguration <- needed + while(it.hasNext()){ + + Entry next = it.next(); + OutputConfiguration out = next.getValue(); + out.isOverrideExistingResources(); + out.setCreateOutputDirectory(true); // <--- do not touch this + + } + // -----> + + URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); + ResourceSet rs = resourceSetProvider.get(project); + Resource r = rs.getResource(uri, true); + + // to pass a String inside a resource i have to wrap it in a EOBject + SimpleAnyType wrapper = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); + wrapper.setInstanceType(EcorePackage.eINSTANCE.getEString()); + wrapper.setValue(mode); + // + EbnfGenerator gen = (EbnfGenerator)generator; + // add string to resource + r.getContents().add(wrapper); + gen.doGenerate(r, fsa,false); + //generator.doGenerate(r, fsa); + + return null; + + } +} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerRTF.java =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerRTF.java (revision 84) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandlerRTF.java (revision 84) @@ -0,0 +1,152 @@ +package de.ugoe.cs.swe.bnftools.ui.handler; + +import java.io.File; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +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.commands.common.NotDefinedException; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.xml.type.SimpleAnyType; +import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2; +import org.eclipse.xtext.generator.IGenerator; +import org.eclipse.xtext.generator.OutputConfiguration; +import org.eclipse.xtext.resource.IResourceDescriptions; +import org.eclipse.xtext.ui.resource.IResourceSetProvider; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +import de.ugoe.cs.swe.bnftools.generator.EbnfGenerator; + +public class BT_GenerationHandlerRTF extends AbstractHandler implements IHandler { + + @Inject + private IGenerator generator; + + @Inject + private Provider fileAccessProvider; + + @Inject + IResourceDescriptions resourceDescriptions; + + @Inject + IResourceSetProvider resourceSetProvider; + + + + @Override + public boolean isEnabled() { + return true; + } + + + + + public Object execute(ExecutionEvent event) throws ExecutionException { + MessageDialog.openInformation(HandlerUtil.getActiveShell(event), + "Hello", "Generating RTF"); + //used to save the command name (defined in extensions) + String mode = ""; + + try { + mode = event.getCommand().getName(); + } catch (NotDefinedException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + + // stuff to get the workbench and current file + IWorkbench wb = PlatformUI.getWorkbench(); + IWorkbenchWindow window = wb.getActiveWorkbenchWindow(); + IWorkbenchPage page = window.getActivePage(); + IEditorPart editor = page.getActiveEditor(); + IEditorInput input = editor.getEditorInput(); + IPath path = ((FileEditorInput) input).getPath(); + + String name = path.toString(); + File myfile = new File(name); + + IWorkspace workspace= ResourcesPlugin.getWorkspace(); + IPath location= Path.fromOSString(myfile.getAbsolutePath()); + IFile file= workspace.getRoot().getFileForLocation(location); + + 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 EclipseResourceFileSystemAccess2 fsa = fileAccessProvider.get(); + + fsa.setProject(project); + + //same stuff + //fsa.setOutputPath("src-gen"); + fsa.setOutputPath(srcGenFolder.getName().toString()); + + fsa.setMonitor(new NullProgressMonitor()); + Map teste = fsa.getOutputConfigurations(); + + Iterator> it = teste.entrySet().iterator(); + + //make a new Outputconfiguration <- needed + while(it.hasNext()){ + + Entry next = it.next(); + OutputConfiguration out = next.getValue(); + out.isOverrideExistingResources(); + out.setCreateOutputDirectory(true); // <--- do not touch this + + } + // -----> + + URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); + ResourceSet rs = resourceSetProvider.get(project); + Resource r = rs.getResource(uri, true); + + // to pass a String inside a resource i have to wrap it in a EOBject + SimpleAnyType wrapper = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); + wrapper.setInstanceType(EcorePackage.eINSTANCE.getEString()); + wrapper.setValue(mode); + // + EbnfGenerator gen = (EbnfGenerator)generator; + // add string to resource + r.getContents().add(wrapper); + gen.doGenerate(r, fsa,true); + //generator.doGenerate(r, fsa); + + return null; + + } +} 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 72) +++ (revision ) @@ -1,124 +1,0 @@ -package de.ugoe.cs.swe.bnftools.ui.handler; - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -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.commands.common.NotDefinedException; -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.EcorePackage; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.xml.type.SimpleAnyType; -import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.handlers.HandlerUtil; -import org.eclipse.xtext.builder.EclipseResourceFileSystemAccess2; -import org.eclipse.xtext.generator.IGenerator; -import org.eclipse.xtext.generator.OutputConfiguration; -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 { - String mode = ""; - - try { - mode = event.getCommand().getName(); - } catch (NotDefinedException e1) { - // catch block - e1.printStackTrace(); - } - - - - 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 EclipseResourceFileSystemAccess2 fsa = fileAccessProvider.get(); - fsa.setOutputPath(srcGenFolder.getFullPath().toString()); - - //complete the filesystemaccess - fsa.setMonitor(new NullProgressMonitor()); - Map teste = fsa.getOutputConfigurations(); - - Iterator> it = teste.entrySet().iterator(); - - while(it.hasNext()){ - - Entry next = it.next(); - OutputConfiguration out = next.getValue(); - out.isOverrideExistingResources(); - out.setCreateOutputDirectory(true); // <--- do not touch this - - } - // -----> - - URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true); - ResourceSet rs = resourceSetProvider.get(project); - Resource r = rs.getResource(uri, true); - - // to pass a String inside a resource i have to wrap it in a EOBject - SimpleAnyType wrapper = XMLTypeFactory.eINSTANCE.createSimpleAnyType(); - wrapper.setInstanceType(EcorePackage.eINSTANCE.getEString()); - wrapper.setValue(mode); - // - - // add string to resource - r.getContents().add(wrapper); - - generator.doGenerate(r, fsa); - - - } - } - return null; - } - - @Override - public boolean isEnabled() { - return true; - } - -} Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.xtend =================================================================== --- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.xtend (revision 72) +++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.xtend (revision 84) @@ -5,12 +5,13 @@ import com.google.inject.Inject +import de.ugoe.cs.swe.bnftools.ebnf.Atom +import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry +import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList import de.ugoe.cs.swe.bnftools.ebnf.ImportSection import de.ugoe.cs.swe.bnftools.ebnf.Rule -import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry -import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList import de.ugoe.cs.swe.bnftools.ebnf.SingleDefinition import de.ugoe.cs.swe.bnftools.ebnf.Term -import de.ugoe.cs.swe.bnftools.ebnf.Atom -import de.ugoe.cs.swe.bnftools.ebnf.StringRule +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider +import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider /** @@ -19,8 +20,8 @@ * see http://www.eclipse.org/Xtext/documentation.html#labelProvider */ -class EbnfLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider { +class EbnfLabelProvider extends DefaultEObjectLabelProvider { @Inject - new(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) { + new(AdapterFactoryLabelProvider delegate) { super(delegate); } @@ -31,9 +32,9 @@ def text(BnfEntry entry){ - 'BnfEntry' - } + 'Rule: '+entry.rule.name + } def text(Rule rule){ - 'Rule: '+rule.name + }