[jboss-svn-commits] JBL Code SVN: r19353 - in labs/jbossrules/branches/mic_20080325/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-03-31 23:03:00 -0400 (Mon, 31 Mar 2008)
New Revision: 19353

Modified:
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
   labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
Log:
Rule name is based on DT name

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-04-01 01:50:48 UTC (rev 19352)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/main/java/org/drools/brms/server/util/GuidedDTDRLPersistence.java	2008-04-01 03:03:00 UTC (rev 19353)
@@ -43,7 +43,7 @@
 			String desc = row[1];
 
 			RuleModel rm = new RuleModel();
-			rm.name = getName(dt.tableName, num, desc);
+			rm.name = getName(dt.tableName, num);
 
 			doAttribs(dt.attributeCols, row, rm);
 			doConditions(dt.attributeCols.size(), dt.conditionCols, row, rm);
@@ -185,8 +185,8 @@
 		}
 	}
 
-	String getName(String tableName, String num, String desc) {
-		return (validCell(desc)) ? num + "_" + desc : num + "_" + tableName;
+	String getName(String tableName, String num) {
+		return num + "_" + tableName;
 	}
 
 	boolean validCell(String c) {

Modified: labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-04-01 01:50:48 UTC (rev 19352)
+++ labs/jbossrules/branches/mic_20080325/drools-compiler/src/test/java/org/drools/brms/server/util/GuidedDTDRLPersistenceTest.java	2008-04-01 03:03:00 UTC (rev 19353)
@@ -120,8 +120,8 @@
 
 	public void testName() {
 		GuidedDTDRLPersistence p = new GuidedDTDRLPersistence();
-		assertEquals("42_hey", p.getName("XXX", "42", "hey"));
-		assertEquals("42_XXX", p.getName("XXX", "42", ""));
+		assertEquals("42_XXX", p.getName("XXX", "42"));
+		assertEquals("42_YYY", p.getName("YYY", "42"));
 	}
 
 	public void testAttribs() {