[jboss-svn-commits] JBL Code SVN: r19838 - in labs/jbossrules/trunk/drools-compiler/src: test/java/org/drools/brms/server/util and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2008-05-01 23:04:07 -0400 (Thu, 01 May 2008)
New Revision: 19838

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
Log:
fix from 4.0.x

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java	2008-05-02 02:55:11 UTC (rev 19837)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/brms/client/modeldriven/brl/RuleAttribute.java	2008-05-02 03:04:07 UTC (rev 19838)
@@ -12,7 +12,11 @@
     private static final String NOLOOP   = "no-loop";
     private static final String SALIENCE = "salience";
     private static final String ENABLED  = "enabled";
+    private static final String DURATION = "duration";
+    private static final String LOCK_ON_ACTIVE = "lock-on-active";
 
+    private static final String AUTO_FOCUS = "auto-focus";
+
     public RuleAttribute(final String name,
                          final String value) {
         this.attributeName = name;
@@ -30,13 +34,25 @@
     public String toString() {
         StringBuffer ret = new StringBuffer();
         ret.append( this.attributeName );
-        if ( NOLOOP.equals( attributeName ) ) {
+        if ( NOLOOP.equals( attributeName ) )
+        {
             ret.append( " " );
             ret.append( this.value == null ? "true" : this.value );
-        } else if ( SALIENCE.equals( this.attributeName ) || ENABLED.equals(this.attributeName) ) {
+        }
+        else if (SALIENCE.equals( this.attributeName ) ||
+         DURATION.equals( this.attributeName ))
+        {
             ret.append( " " );
             ret.append( this.value );
-        } else if ( this.value != null ) {
+        }
+        else if (ENABLED.equals( this.attributeName ) ||
+         AUTO_FOCUS.equals( this.attributeName ) ||
+         LOCK_ON_ACTIVE.equals( this.attributeName ))
+        {
+            ret.append( " " );
+            ret.append( this.value.equals("true") ? "true" : "false" );
+        }
+        else if ( this.value != null ) {
             ret.append( " \"" );
             ret.append( this.value );
             ret.append( "\"" );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2008-05-02 02:55:11 UTC (rev 19837)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRDRLPersistenceTest.java	2008-05-02 03:04:07 UTC (rev 19838)
@@ -584,4 +584,22 @@
 
     }
 
+    public void testLockOnActive() {
+    	RuleModel m = new RuleModel();
+
+    	m.addAttribute(new RuleAttribute("lock-on-active", "true"));
+    	m.addAttribute(new RuleAttribute("auto-focus", "true"));
+    	m.addAttribute(new RuleAttribute("duration", "42"));
+
+        String s = BRDRLPersistence.getInstance().marshal( m );
+
+        assertTrue(s.indexOf( "lock-on-active true" ) > -1);
+        assertTrue(s.indexOf( "auto-focus true" ) > -1);
+        assertTrue(s.indexOf( "duration 42" ) > -1);
+
+
+
+
+    }
+
 }