[jboss-svn-commits] JBL Code SVN: r25235 - labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2009-02-11 21:06:37 -0500 (Wed, 11 Feb 2009)
New Revision: 25235

Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLAdapter.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLRuleEditor2.java
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLtoDRLDocument.java
Log:
 -updated IDE to new DSL parser API

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLAdapter.java	2009-02-12 01:07:20 UTC (rev 25234)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLAdapter.java	2009-02-12 02:06:37 UTC (rev 25235)
@@ -15,7 +15,7 @@
 import org.drools.eclipse.editors.completion.DSLTree;
 import org.drools.lang.dsl.DSLMapping;
 import org.drools.lang.dsl.DSLMappingEntry;
-import org.drools.lang.dsl.DSLMappingFile;
+import org.drools.lang.dsl.DSLTokenizedMappingFile;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
@@ -109,7 +109,7 @@
     
     /** This will load in the DSL config file, using the DSLMapping from drools-compiler */
     void readConfig(InputStream stream) throws IOException, CoreException {
-        DSLMappingFile file = new DSLMappingFile();
+    	DSLTokenizedMappingFile file = new DSLTokenizedMappingFile();
         file.parseAndLoad(new InputStreamReader(stream));
 
         DSLMapping grammar = file.getMapping();

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java	2009-02-12 01:07:20 UTC (rev 25234)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLEditor.java	2009-02-12 02:06:37 UTC (rev 25235)
@@ -11,9 +11,10 @@
 
 import org.drools.eclipse.DroolsEclipsePlugin;
 import org.drools.eclipse.builder.IDroolsModelMarker;
+import org.drools.lang.dsl.AntlrDSLMappingEntry;
 import org.drools.lang.dsl.DSLMappingEntry;
 import org.drools.lang.dsl.DSLMappingFile;
-import org.drools.lang.dsl.DefaultDSLMappingEntry;
+import org.drools.lang.dsl.DSLTokenizedMappingFile;
 import org.drools.lang.dsl.MappingError;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
@@ -174,7 +175,7 @@
         	}
 
         	model = new NLGrammarModel();
-            DSLMappingFile file = new DSLMappingFile();
+            DSLMappingFile file = new DSLTokenizedMappingFile();
             file.parseAndLoad( new InputStreamReader( stream ) );
             model.addEntries( file.getMapping().getEntries() );
             stream.close();
@@ -516,7 +517,7 @@
             // Add an item, should pop up the editor
             public void widgetSelected(SelectionEvent e) {
 
-                DSLMappingEntry newItem = new DefaultDSLMappingEntry();
+                DSLMappingEntry newItem = new AntlrDSLMappingEntry();
 
                 MappingEditor editor = new MappingEditor( getSite().getShell() );//shell);
                 editor.create();
@@ -554,10 +555,12 @@
 
                 DSLMappingEntry curr = getCurrentSelected();
                 if (curr != null) {
-	                DSLMappingEntry newItem = new DefaultDSLMappingEntry( curr.getSection(),
+	                DSLMappingEntry newItem = new AntlrDSLMappingEntry( curr.getSection(),
 	                                                                      curr.getMetaData(),
 	                                                                      curr.getMappingKey(),
-	                                                                      curr.getMappingValue() );
+	                                                                      curr.getMappingValue(),
+	                                                                      null,
+	                                                                      null);
 	
 	                MappingEditor editor = new MappingEditor( getSite().getShell() );//shell);
 	                editor.create();

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLRuleEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLRuleEditor2.java	2009-02-12 01:07:20 UTC (rev 25234)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLRuleEditor2.java	2009-02-12 02:06:37 UTC (rev 25235)
@@ -4,6 +4,7 @@
 
 import org.drools.eclipse.DroolsEclipsePlugin;
 import org.drools.lang.dsl.DSLMappingFile;
+import org.drools.lang.dsl.DSLTokenizedMappingFile;
 import org.drools.lang.dsl.DefaultExpander;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -78,7 +79,7 @@
 	        	if (reader == null) {
 	        		throw new IllegalArgumentException("Could not find dsl definition.");
 	        	}
-	            DSLMappingFile mapping = new DSLMappingFile();
+	            DSLMappingFile mapping = new DSLTokenizedMappingFile();
 	            mapping.parseAndLoad(reader);
 	            reader.close();
 	            expander.addDSLMapping(mapping.getMapping());

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLtoDRLDocument.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLtoDRLDocument.java	2009-02-12 01:07:20 UTC (rev 25234)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/dsl/editor/DSLtoDRLDocument.java	2009-02-12 02:06:37 UTC (rev 25235)
@@ -3,6 +3,7 @@
 import java.io.Reader;
 
 import org.drools.lang.dsl.DSLMappingFile;
+import org.drools.lang.dsl.DSLTokenizedMappingFile;
 import org.drools.lang.dsl.DefaultExpander;
 import org.eclipse.jface.text.IDocument;
 
@@ -19,7 +20,7 @@
         DefaultExpander expander = new DefaultExpander();
         try {
         	Reader reader = DSLAdapter.getDSLContent(content, viewer.getResource());
-            DSLMappingFile mapping = new DSLMappingFile();
+            DSLMappingFile mapping = new DSLTokenizedMappingFile();
             mapping.parseAndLoad(reader);
             reader.close();
             expander.addDSLMapping(mapping.getMapping());