[jboss-svn-commits] JBL Code SVN: r7909 - in labs/jbossrules/trunk/drools-ide/src/main/java/org/drools: ide/editors/rete/model reteoo

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 28 18:14:07 EST 2006


Author: /services/svn/bin/commit-email.pl: `/opt/subversion/bin/svnlook info /services/jbf-svn/code -r 7909' failed with this output:
Date: svnlook: Inconsistent line ending style
New Revision: 7909

Added:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/QueryTerminalNodeVertex.java
Modified:
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/rete/model/VertexPropertySource.java
   labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/AlphaNodeVertex.java
Log:
2006-11-28 18:14:04 -0500 (Tue, 28 Nov 2006)

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/rete/model/VertexPropertySource.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/rete/model/VertexPropertySource.java	2006-11-28 22:27:59 UTC (rev 7908)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/rete/model/VertexPropertySource.java	2006-11-28 23:14:04 UTC (rev 7909)
@@ -16,6 +16,7 @@
 import org.drools.reteoo.LeftInputAdapterNodeVertex;
 import org.drools.reteoo.NotNodeVertex;
 import org.drools.reteoo.ObjectTypeNodeVertex;
+import org.drools.reteoo.QueryTerminalNodeVertex;
 import org.drools.reteoo.ReteVertex;
 import org.drools.reteoo.RightInputAdapterNodeVertex;
 import org.drools.reteoo.TerminalNodeVertex;
@@ -43,6 +44,8 @@
 
     private static final String       VERTEX_TERMINAL            = "Terminal BaseVertex";
 
+    private static final String       VERTEX_QUERY_TERMINAL      = "Query Terminal BaseVertex";
+
     private static final String       VERTEX_EVAL_CONDITION      = "Eval Condition BaseVertex";
 
     private static final String       VERTEX_NOT                 = "Not BaseVertex";
@@ -77,6 +80,8 @@
     private final IPropertyDescriptor PROP_RULE                  = new PropertyDescriptor( "rule",
                                                                                            "Rule" );
 
+    private final IPropertyDescriptor PROP_QUERY                 = new PropertyDescriptor( "query",
+                                                                                           "Query" );
     // Alpha-specific
     private final IPropertyDescriptor PROP_ALPHA_FIELD_NAME      = new PropertyDescriptor( "fieldName",
                                                                                            "Field Name" );
@@ -130,9 +135,13 @@
                                        values );
         } else if ( vertex instanceof TerminalNodeVertex ) {
             initTerminalNodeProperties( (TerminalNodeVertex) vertex,
-                                        descriptorList,
-                                        values );
-        } else if ( vertex instanceof EvalConditionNodeVertex ) {
+                    descriptorList,
+                    values );
+    	} else if ( vertex instanceof QueryTerminalNodeVertex ) {
+            initQueryTerminalNodeProperties( (QueryTerminalNodeVertex) vertex,
+                    descriptorList,
+                    values );
+    	} else if ( vertex instanceof EvalConditionNodeVertex ) {
             initEvalConditionNodeProperties( (EvalConditionNodeVertex) vertex,
                                              descriptorList,
                                              values );
@@ -375,6 +384,25 @@
 
     }
 
+    private void initQueryTerminalNodeProperties(QueryTerminalNodeVertex node,
+		            List descriptorList,
+		            Map valueMap) {
+		
+		addProperty( PROP_NAME,
+				     VERTEX_QUERY_TERMINAL,
+                     descriptorList,
+                     valueMap );
+		addProperty( PROP_ID,
+                     Integer.toString( node.getId() ),
+                     descriptorList,
+		             valueMap );
+		addProperty( PROP_QUERY,
+		             node.getQueryName(),
+		             descriptorList,
+		             valueMap );
+		
+	}
+
     private void addProperty(IPropertyDescriptor field,
                              String value,
                              List descriptorList,

Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/AlphaNodeVertex.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/AlphaNodeVertex.java	2006-11-28 22:27:59 UTC (rev 7908)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/AlphaNodeVertex.java	2006-11-28 23:14:04 UTC (rev 7909)
@@ -5,7 +5,9 @@
 
 import org.drools.base.ClassFieldExtractor;
 import org.drools.rule.LiteralConstraint;
+import org.drools.spi.AlphaNodeFieldConstraint;
 import org.drools.spi.Constraint;
+import org.drools.spi.FieldExtractor;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.swt.graphics.Color;
 
@@ -33,9 +35,16 @@
      * @see org.drools.reteoo.BaseNodeVertex#getHtml()
      */
     public String getHtml() {
-        final LiteralConstraint constraint = (LiteralConstraint) this.node.getConstraint();
-        final ClassFieldExtractor extractor = (ClassFieldExtractor) constraint.getFieldExtractor();
-        return NODE_NAME + "<BR/>field : " + extractor.getFieldName() + "<BR/>evaluator : " + constraint.getEvaluator() + "<BR/>value :  " + constraint.getField();
+    	AlphaNodeFieldConstraint constraint = this.node.getConstraint();
+        if (constraint instanceof LiteralConstraint) {
+        	LiteralConstraint literalConstraint = (LiteralConstraint) constraint;
+            FieldExtractor extractor = literalConstraint.getFieldExtractor();
+            if (extractor instanceof ClassFieldExtractor) {
+            	ClassFieldExtractor classFieldExtractor = (ClassFieldExtractor) extractor;
+            	return NODE_NAME + "<BR/>field : " + classFieldExtractor.getFieldName() + "<BR/>evaluator : " + literalConstraint.getEvaluator() + "<BR/>value :  " + literalConstraint.getField();
+            }
+        }
+        return NODE_NAME + "<BR/>";
     }
 
     /* (non-Javadoc)
@@ -59,9 +68,15 @@
      * @return field name
      */
     public String getFieldName() {
-        LiteralConstraint constraint = (LiteralConstraint) this.node.getConstraint();
-        ClassFieldExtractor extractor = (ClassFieldExtractor) constraint.getFieldExtractor();
-        return extractor.getFieldName();
+    	AlphaNodeFieldConstraint constraint = this.node.getConstraint();
+        if (constraint instanceof LiteralConstraint) {
+        	LiteralConstraint literalConstraint = (LiteralConstraint) constraint;
+            FieldExtractor extractor = literalConstraint.getFieldExtractor();
+            if (extractor instanceof ClassFieldExtractor) {
+            	return ((ClassFieldExtractor) extractor).getFieldName();
+            }
+        }
+        return null;
     }
 
     /**
@@ -70,8 +85,12 @@
      * @return evaluator string
      */
     public String getEvaluator() {
-        LiteralConstraint constraint = (LiteralConstraint) this.node.getConstraint();
-        return constraint.getEvaluator().toString();
+    	AlphaNodeFieldConstraint constraint = this.node.getConstraint();
+        if (constraint instanceof LiteralConstraint) {
+        	LiteralConstraint literalConstraint = (LiteralConstraint) constraint;
+        	return literalConstraint.getEvaluator().toString();
+        }
+        return null;
     }
 
     /**
@@ -80,8 +99,12 @@
      * @return field string
      */
     public String getValue() {
-        LiteralConstraint constraint = (LiteralConstraint) this.node.getConstraint();
-        return constraint.getField().toString();
+    	AlphaNodeFieldConstraint constraint = this.node.getConstraint();
+        if (constraint instanceof LiteralConstraint) {
+        	LiteralConstraint literalConstraint = (LiteralConstraint) constraint;
+        	return literalConstraint.getField().toString();
+        }
+        return null;
     }
 
     /**

Added: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/QueryTerminalNodeVertex.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/QueryTerminalNodeVertex.java	2006-11-28 22:27:59 UTC (rev 7908)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/reteoo/QueryTerminalNodeVertex.java	2006-11-28 23:14:04 UTC (rev 7909)
@@ -0,0 +1,66 @@
+/**
+ * 
+ */
+package org.drools.reteoo;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.swt.graphics.Color;
+
+/**
+ * Wraps {@link QueryTerminalNode} and adds visual extras like color information
+ *
+ */
+public class QueryTerminalNodeVertex extends BaseVertex {
+    
+    private static final String NODE_NAME = "QueryTerminalNode";
+    
+    private final QueryTerminalNode node;
+
+    /**
+     * Constructor
+     * 
+     * @param node node to be wrapped
+     */
+    public QueryTerminalNodeVertex(final QueryTerminalNode node) {
+        super();
+        this.node = node;
+    }
+
+    /* (non-Javadoc)
+     * @see org.drools.reteoo.BaseNodeVertex#getHtml()
+     */
+    public String getHtml() {
+        return NODE_NAME+" : " + this.node.getId() + " : " + this.node.getRule();
+    }
+
+    /* (non-Javadoc)
+     * @see org.drools.ide.editors.rete.model.BaseVertex#toString()
+     */
+    public String toString() {
+        return NODE_NAME;
+    }
+
+    /* (non-Javadoc)
+     * @see org.drools.reteoo.BaseNodeVertex#getFillColor()
+     */
+    public Color getFillColor() {
+        return ColorConstants.darkGray;
+    }
+
+    /**
+     * Node ID
+     * 
+     * @return id
+     */
+    public int getId() {
+        return this.node.getId();
+    }
+
+    /**
+     * @return
+     */
+    public String getQueryName() {
+        return node.getRule().getName();
+    }
+
+}
\ No newline at end of file




More information about the jboss-svn-commits mailing list