Changeset 67 in default for v2

Timestamp:

05/14/14 14:22:53 (11 years ago)

Author:

hkaulbersch

Message:

Minimized Outline:
-<unnamed> Removed
-Rule is the lowest shown entity

Location:

v2/trunk

Files:

• de.ugoe.cs.swe.bnftools.ebnf.ui/build.properties (modified) (1 diff)
• de.ugoe.cs.swe.bnftools.ebnf.ui/plugin.xml (modified) (2 diffs)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/labeling/EbnfLabelProvider.xtend (modified) (2 diffs)
• de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/outline/EbnfOutlineTreeProvider.xtend (modified) (2 diffs)
• de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java (modified) (1 diff)

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

@@ -5 +5 @@
                .,\
                plugin.xml
+src.includes = .settings/

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

@@ -248 +248 @@
         </extension>
 
+<!---->
    <extension
          point="org.eclipse.xtext.builder.participant">
@@ -254 +255 @@
       </participant>
    </extension>
+   
+   
+   <!--this is for using a button for generation
+   <extension
+        point="org.eclipse.ui.handlers">
+     <handler
+           class="de.ugoe.cs.swe.bnftools.ui.EbnfExecutableExtensionFactory:de.ugoe.cs.swe.bnftools.ui.helper.GenerationHandler"
+           commandId="de.ugoe.cs.swe.bnftools.ui.handler.GenerationCommand">
+     </handler>
+      
+  </extension>
+   
+  <extension
+        point="org.eclipse.ui.commands">
+        <command name="Generate Code"
+              id="de.ugoe.cs.swe.bnftools.ui.handler.GenerationCommand">
+        </command>
+  </extension>
+   
+  <extension point="org.eclipse.ui.menus">
+    <menuContribution locationURI="popup:org.eclipse.jdt.ui.PackageExplorer">
+        <command
+            commandId="de.ugoe.cs.swe.bnftools.ui.handler.GenerationCommand"
+            style="push">
+            <visibleWhen
+                  checkEnabled="false">
+                  <iterate>
+       <adapt type="org.eclipse.core.resources.IResource">
+          <test property="org.eclipse.core.resources.name"
+                value="*.bnf"/>
+       </adapt>
+    </iterate>
+            </visibleWhen>
+        </command>
+    </menuContribution>
+    </extension>
+ -->
+   
+   
    <extension
             point="org.eclipse.ui.preferencePages">

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.ImportSection
+import de.ugoe.cs.swe.bnftools.ebnf.Rule
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry
 
 /**
@@ -18 +21 @@
         }
 
-        // Labels and icons can be computed like this:
+        def text(ImportSection sec){
+                'Imports'
+        }
         
-//      def text(Greeting ele) {
-//              'A greeting to ' + ele.name
-//      }
-//
-//      def image(Greeting ele) {
-//              'Greeting.gif'
-//      }
+        def text(BnfEntry entry){
+                'Rule'
+        }
 }

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

@@ -3 +3 @@
 */
 package de.ugoe.cs.swe.bnftools.ui.outline
+
+import org.eclipse.xtext.ui.editor.outline.impl.DocumentRootNode
+import de.ugoe.cs.swe.bnftools.ebnf.EtsiBnf
+import de.ugoe.cs.swe.bnftools.ebnf.Import
+import org.eclipse.xtext.ui.editor.outline.IOutlineNode
+import org.eclipse.xtext.AbstractElement
+import de.ugoe.cs.swe.bnftools.ebnf.BnfEntry
+import de.ugoe.cs.swe.bnftools.ebnf.ImportSection
+import de.ugoe.cs.swe.bnftools.ebnf.Rule
 
 /**
@@ -10 +19 @@
  */
 class EbnfOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {
-        
+        def void _createChildren(DocumentRootNode parentNode, EtsiBnf bnf) {
+                createNode(parentNode,bnf);
+        }
+
+        def boolean _isLeaf(Rule rule) {
+                return true;
+        }
+
 }

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java

@@ -76 +76 @@
          * Syntax:
          *     (
-             '+' | 
+             '(' | 
+             '}' | 
              '[' | 
+             '*' | 
+             '|' | 
+             '{' | 
              ')' | 
-             '{' | 
              ']' | 
-             '|' | 
-             '*' | 
-             '(' | 
-             '}'
+             '+'
          )*
          */