[jboss-svn-commits] JBL Code SVN: r32541 - in labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools: reteoo and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2010-04-13 00:56:44 -0400 (Tue, 13 Apr 2010)
New Revision: 32541

Removed:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/CollectNodeVertex.java
Modified:
   labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/model/VertexPropertySource.java
Log:
JBRULES-2339 JBRULES-2340 eliminating code duplication for Collect and CollectNode
-deleted related eclipse code

Modified: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/model/VertexPropertySource.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/model/VertexPropertySource.java	2010-04-13 04:32:23 UTC (rev 32540)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/editors/rete/model/VertexPropertySource.java	2010-04-13 04:56:44 UTC (rev 32541)
@@ -8,7 +8,6 @@
 import org.drools.reteoo.AccumulateNodeVertex;
 import org.drools.reteoo.AlphaNodeVertex;
 import org.drools.reteoo.BaseVertex;
-import org.drools.reteoo.CollectNodeVertex;
 import org.drools.reteoo.EntryPointNodeVertex;
 import org.drools.reteoo.EvalConditionNodeVertex;
 import org.drools.reteoo.ExistsNodeVertex;
@@ -141,11 +140,7 @@
             initAccumulateNodeProperties( (AccumulateNodeVertex) vertex,
                                           descriptorList,
                                           values );
-        } else if ( vertex instanceof CollectNodeVertex ) {
-            initCollectNodeProperties( (CollectNodeVertex) vertex,
-                                       descriptorList,
-                                       values );
-        } else if ( vertex instanceof RuleTerminalNodeVertex ) {
+        }else if ( vertex instanceof RuleTerminalNodeVertex ) {
             initTerminalNodeProperties( (RuleTerminalNodeVertex) vertex,
                     descriptorList,
                     values );
@@ -211,20 +206,6 @@
 
     }
 
-    private void initCollectNodeProperties(CollectNodeVertex vertex,
-                                           List descriptorList,
-                                           Map valueMap) {
-        addProperty( PROP_NAME,
-                     VERTEX_COLLECT,
-                     descriptorList,
-                     valueMap );
-        addProperty( PROP_ID,
-                     Integer.toString( vertex.getId() ),
-                     descriptorList,
-                     valueMap );
-
-    }
-
     private void initAccumulateNodeProperties(AccumulateNodeVertex vertex,
                                               List descriptorList,
                                               Map valueMap) {

Deleted: labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/CollectNodeVertex.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/CollectNodeVertex.java	2010-04-13 04:32:23 UTC (rev 32540)
+++ labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/reteoo/CollectNodeVertex.java	2010-04-13 04:56:44 UTC (rev 32541)
@@ -1,59 +0,0 @@
-/**
- * 
- */
-package org.drools.reteoo;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * Wraps {@link CollectNode} and adds visual extras like color information
- *
- */
-public class CollectNodeVertex extends BaseVertex {
-    
-    private static final String NODE_NAME = "CollectNode";
-    
-    private final CollectNode node;
-
-    /**
-     * Constructor
-     * 
-     * @param node node to be wrapped
-     */
-    public CollectNodeVertex(final CollectNode node) {
-        super();
-        this.node = node;
-    }
-
-    /* (non-Javadoc)
-     * @see org.drools.reteoo.BaseNodeVertex#getHtml()
-     */
-    public String getHtml() {
-        return NODE_NAME+" : " + this.node.getId() + " : Shared count=" + this.node.getSinkPropagator().size();
-    }
-
-    /* (non-Javadoc)
-     * @see org.drools.eclipse.editors.rete.model.BaseVertex#toString()
-     */
-    public String toString() {
-        return NODE_NAME;
-    }
-
-    /* (non-Javadoc)
-     * @see org.drools.reteoo.BaseNodeVertex#getFillColor()
-     */
-    public Color getFillColor() {
-        return ColorConstants.lightGray;
-    }
-
-    /**
-     * Node ID
-     * 
-     * @return id
-     */
-    public int getId() {
-        return this.node.getId();
-    }
-
-}
\ No newline at end of file