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

Timestamp:

07/02/14 13:59:44 (10 years ago)

Author:

hkaulbersch

Message:

commit: generator improved

Location:

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

Files:

• handler/BT_GenerationHandlerPDF.java (moved) (moved from v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/handler/BT_GenerationHandler.java) (6 diffs)
• handler/BT_GenerationHandlerRTF.java (added)
• handler/GenerationHandler.java (deleted)
• labeling/EbnfLabelProvider.xtend (modified) (3 diffs)

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

@@ -26 +26 @@
 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;
@@ -32 +33 @@
 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;
@@ -42 +44 @@
 import com.google.inject.Provider;
 
-public class BT_GenerationHandler  extends AbstractHandler implements IHandler {
+import de.ugoe.cs.swe.bnftools.generator.EbnfGenerator;
+
+public class BT_GenerationHandlerPDF  extends AbstractHandler implements IHandler {
 
         @Inject
@@ -56 +60 @@
     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 = "";
@@ -65 +81 @@
              mode = event.getCommand().getName();
           } catch (NotDefinedException e1) {
-          // TODO Auto-generated catch block
             e1.printStackTrace();
           }
@@ -127 +142 @@
           wrapper.setValue(mode);
           //
-         
+          EbnfGenerator gen = (EbnfGenerator)generator;
           // add string to resource
           r.getContents().add(wrapper);
-         
-          generator.doGenerate(r, fsa);
-         
+          gen.doGenerate(r, fsa,false);
+          //generator.doGenerate(r, fsa);
+
           return null;
          
         }
-    
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
- 
 }

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.xtend

@@ -5 +5 @@
 
 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 +20 @@
  * 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 +32 @@
         
         def text(BnfEntry entry){
-                'BnfEntry'
-        }
+                'Rule: '+entry.rule.name
+                        }
         
         def text(Rule rule){
-                'Rule: '+rule.name
+                
         }