[jboss-svn-commits] JBL Code SVN: r9249 - in labs/jbossrules/trunk/drools-ide: META-INF and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 1 08:13:05 EST 2007
Author: KrisVerlaenen
Date: 2007-02-01 08:13:05 -0500 (Thu, 01 Feb 2007)
New Revision: 9249
Modified:
labs/jbossrules/trunk/drools-ide/.classpath
labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-ide/build.properties
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/view/rules/RulesView.java
Log:
updates needed for changes in core and compiler:
- added mvel jar to runtime
- updates to rules view for changes in GlobalDescr
- updates to rules view for using start and end characters of descrs now
Modified: labs/jbossrules/trunk/drools-ide/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-ide/.classpath 2007-02-01 12:33:41 UTC (rev 9248)
+++ labs/jbossrules/trunk/drools-ide/.classpath 2007-02-01 13:13:05 UTC (rev 9249)
@@ -1,24 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-3.0b5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/stringtemplate-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.3.4.O.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/xstream-1.1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jsr94-1.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-jci-core-1.0-406301.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-jci-eclipse-3.2.0.666.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-jci-janino-2.4.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/janino-2.4.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/drools-jsr94.jar"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry path="src/main/java" kind="src"/>
+ <classpathentry path="lib/mvel14-1.2beta6.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/antlr-2.7.7.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/antlr-3.0b5.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/stringtemplate-3.0.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/commons-lang-2.1.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/commons-logging-api-1.0.4.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/xml-apis-1.0.b2.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/xpp3-1.1.3.4.O.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/xstream-1.1.3.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/jsr94-1.1.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/commons-jci-core-1.0-406301.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/commons-jci-eclipse-3.2.0.666.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/commons-jci-janino-2.4.3.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/janino-2.4.3.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/drools-compiler.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/drools-core.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/drools-decisiontables.jar" exported="true" kind="lib"/>
+ <classpathentry path="lib/drools-jsr94.jar" exported="true" kind="lib"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
+ <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+ <classpathentry path="bin" kind="output"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2007-02-01 12:33:41 UTC (rev 9248)
+++ labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2007-02-01 13:13:05 UTC (rev 9249)
@@ -27,24 +27,25 @@
com.ibm.icu
Eclipse-LazyStart: true
Bundle-ClassPath: ide.jar,
- lib/commons-lang-2.1.jar,
- lib/commons-logging-api-1.0.4.jar,
- lib/xml-apis-1.0.b2.jar,
- lib/xpp3-1.1.3.4.O.jar,
- lib/xstream-1.1.3.jar,
- lib/jsr94-1.1.jar,
+ lib/antlr-2.7.7.jar,
+ lib/antlr-3.0b5.jar,
lib/commons-jci-core-1.0-406301.jar,
lib/commons-jci-eclipse-3.2.0.666.jar,
lib/commons-jci-janino-2.4.3.jar,
- lib/janino-2.4.3.jar,
+ lib/commons-lang-2.1.jar,
+ lib/commons-logging-api-1.0.4.jar,
lib/drools-compiler.jar,
lib/drools-core.jar,
lib/drools-decisiontables.jar,
lib/drools-jsr94.jar,
+ lib/janino-2.4.3.jar,
+ lib/jsr94-1.1.jar,
lib/jxl-2.4.2.jar,
- lib/antlr-2.7.7.jar,
- lib/antlr-3.0b5.jar,
- lib/stringtemplate-3.0.jar
+ lib/mvel14-1.2beta6.jar,
+ lib/stringtemplate-3.0.jar,
+ lib/xml-apis-1.0.b2.jar,
+ lib/xpp3-1.1.3.4.O.jar,
+ lib/xstream-1.1.3.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Export-Package: org.drools,
org.drools.asm,
Modified: labs/jbossrules/trunk/drools-ide/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-ide/build.properties 2007-02-01 12:33:41 UTC (rev 9248)
+++ labs/jbossrules/trunk/drools-ide/build.properties 2007-02-01 13:13:05 UTC (rev 9249)
@@ -3,6 +3,7 @@
lib/,\
icons/,\
plugin.xml,\
- help/
+ help/,\
+ lib/mvel14-1.2beta6.jar
source.ide.jar = src/main/java/
output.ide.jar = bin/
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/view/rules/RulesView.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/view/rules/RulesView.java 2007-02-01 12:33:41 UTC (rev 9248)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/view/rules/RulesView.java 2007-02-01 13:13:05 UTC (rev 9249)
@@ -23,6 +23,7 @@
import org.drools.ide.core.ui.FilterActionGroup;
import org.drools.lang.descr.FactTemplateDescr;
import org.drools.lang.descr.FunctionDescr;
+import org.drools.lang.descr.GlobalDescr;
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
import org.eclipse.core.resources.IFile;
@@ -121,7 +122,9 @@
boolean isQuery = ruleDescr instanceof QueryDescr;
String ruleName = ruleDescr.getName();
if (!isQuery) {
- Rule rule = DroolsModelBuilder.addRule(pkg, ruleName, file, 0, 0, null);
+ Rule rule = DroolsModelBuilder.addRule(
+ pkg, ruleName, file, ruleDescr.getStartCharacter(),
+ ruleDescr.getEndCharacter() - ruleDescr.getStartCharacter() + 1, null);
// create link between resource and created rule nodes
List droolsElements = (List) resourcesMap.get(file);
if (droolsElements == null) {
@@ -130,7 +133,9 @@
}
droolsElements.add(rule);
} else {
- Query query = DroolsModelBuilder.addQuery(pkg, ruleName, file, 0, 0);
+ Query query = DroolsModelBuilder.addQuery(
+ pkg, ruleName, file, ruleDescr.getStartCharacter(),
+ ruleDescr.getEndCharacter() - ruleDescr.getStartCharacter() + 1);
// create link between resource and created rule nodes
List droolsElements = (List) resourcesMap.get(file);
if (droolsElements == null) {
@@ -143,8 +148,10 @@
// add templates
List templates = drlInfo.getPackageDescr().getFactTemplates();
for (Iterator iterator = templates.iterator(); iterator.hasNext();) {
- String templateName = ((FactTemplateDescr) iterator.next()).getName();
- Template template = DroolsModelBuilder.addTemplate(pkg, templateName, file, 0, 0);
+ FactTemplateDescr templateDescr = (FactTemplateDescr) iterator.next();
+ Template template = DroolsModelBuilder.addTemplate(
+ pkg, templateDescr.getName(), file, templateDescr.getStartCharacter(),
+ templateDescr.getEndCharacter() - templateDescr.getStartCharacter() + 1);
// create link between resource and created rule nodes
List droolsElements = (List) resourcesMap.get(file);
if (droolsElements == null) {
@@ -154,10 +161,12 @@
droolsElements.add(template);
}
// add globals
- Map globals = drlInfo.getPackageDescr().getGlobals();
- for (Iterator iterator = globals.keySet().iterator(); iterator.hasNext();) {
- String globalName = (String) iterator.next();
- Global global = DroolsModelBuilder.addGlobal(pkg, globalName, file, 0, 0);
+ List globals = drlInfo.getPackageDescr().getGlobals();
+ for (Iterator iterator = globals.iterator(); iterator.hasNext();) {
+ GlobalDescr globalDescr = (GlobalDescr) iterator.next();
+ Global global = DroolsModelBuilder.addGlobal(
+ pkg, globalDescr.getIdentifier(), file, globalDescr.getStartCharacter(),
+ globalDescr.getEndCharacter() - globalDescr.getStartCharacter() + 1);
// create link between resource and created rule nodes
List droolsElements = (List) resourcesMap.get(file);
if (droolsElements == null) {
@@ -169,8 +178,11 @@
// add functions
List functions = drlInfo.getPackageDescr().getFunctions();
for (Iterator iterator = functions.iterator(); iterator.hasNext();) {
- String functionName = ((FunctionDescr) iterator.next()).getName();
- Function function = DroolsModelBuilder.addFunction(pkg, functionName, file, 0, 0);
+ FunctionDescr functionDescr = (FunctionDescr) iterator.next();
+ String functionName = functionDescr.getName();
+ Function function = DroolsModelBuilder.addFunction(
+ pkg, functionName, file, functionDescr.getStartCharacter(),
+ functionDescr.getEndCharacter() - functionDescr.getStartCharacter() + 1);
// create link between resource and created rule nodes
List droolsElements = (List) resourcesMap.get(file);
if (droolsElements == null) {
More information about the jboss-svn-commits
mailing list