Changeset 72 in default for v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui

Timestamp:

06/15/14 08:59:05 (10 years ago)

Author:

hkaulbersch

Message:

Automatic PDF Generation from .fo files now works

Location:

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui

Files:

• lrun_obj.gif (added)
• plugin.xml (modified) (4 diffs)
• src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandler.java (added)
• src/de/ugoe/cs/swe/bnftools/ui/handler/GenerationHandler.java (modified) (6 diffs)

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/plugin.xml

@@ -248 +248 @@
         </extension>
 
-<!--
+<!--   -->
+   
    <extension
          point="org.eclipse.xtext.builder.participant">
@@ -255 +256 @@
       </participant>
    </extension>
-   -->
-   
-   <!--this is for using a button for generation -->
+
+   
+   <!--this is for using a button for generation 
    <extension
         point="org.eclipse.ui.handlers">
@@ -291 +292 @@
     </menuContribution>
     </extension>
-
+-->
    
    
@@ -433 +434 @@
     </provider>
   </extension>
+  <!--
+  <extension
+        point="org.eclipse.ui.commands">
+     <command
+           defaultHandler="de.ugoe.cs.swe.bnftools.ui.EbnfExecutableExtensionFactory:de.ugoe.cs.swe.bnftools.ui.handler.BT_GenerationHandler"
+           id="de.ugoe.cs.swe.bnftools.ebnf.ui.cmdgenerate"
+           name="button_generate">
+     </command>
+  </extension>
+  <extension
+        point="org.eclipse.ui.menus">
+     <menuContribution
+           allPopups="false"
+           locationURI="toolbar:org.eclipse.ui.main.toolbar">
+        <command
+              commandId="de.ugoe.cs.swe.bnftools.ebnf.ui.cmdgenerate"
+              icon="lrun_obj.gif"
+              style="push"
+              tooltip="Generate Code">
+        </command>
+     </menuContribution>
+  </extension>
+  -->
+  <extension
+        id="product"
+        point="org.eclipse.core.runtime.products">
+     <product
+           application="de.ugoe.cs.swe.bnftools.product.application"
+           name="bnf">
+        <property
+              name="appName"
+              value="bnf">
+        </property>
+     </product>
+  </extension>
 
 </plugin>

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/GenerationHandler.java

@@ -1 +1 @@
 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;
@@ -5 +9 @@
 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;
@@ -11 +16 @@
 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.EclipseResourceFileSystemAccess;
+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;
@@ -30 +39 @@
  
     @Inject
-    private Provider<EclipseResourceFileSystemAccess> fileAccessProvider;
+    private Provider<EclipseResourceFileSystemAccess2> fileAccessProvider;
      
     @Inject
@@ -40 +49 @@
     @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) {
@@ -58 +77 @@
                 }
  
-                final EclipseResourceFileSystemAccess fsa = fileAccessProvider.get();
+                final EclipseResourceFileSystemAccess2 fsa = fileAccessProvider.get();
                 fsa.setOutputPath(srcGenFolder.getFullPath().toString());
+                
+                //complete the filesystemaccess 
+                fsa.setMonitor(new NullProgressMonitor());
+                Map<String, OutputConfiguration> teste = fsa.getOutputConfigurations();
+                        
+                Iterator<Entry<String, OutputConfiguration>> it = teste.entrySet().iterator();
+                
+                while(it.hasNext()){
+                         
+                    Entry<String, OutputConfiguration> 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);