[jboss-svn-commits] JBL Code SVN: r6175 - in labs/jbossrules/trunk/drools-repository/src: main/java/org/drools/repository test/java/org/drools/repository
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 12 12:26:44 EDT 2006
Author: michael.neale at jboss.com
Date: 2006-09-12 12:26:35 -0400 (Tue, 12 Sep 2006)
New Revision: 6175
Modified:
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java
labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/CategoryItemTestCase.java
labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java
Log:
refactoring goodness
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java 2006-09-12 15:35:05 UTC (rev 6174)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/CategoryItem.java 2006-09-12 16:26:35 UTC (rev 6175)
@@ -33,18 +33,18 @@
public CategoryItem(RulesRepository rulesRepository, Node node) throws RulesRepositoryException {
super(rulesRepository, node);
- try {
- //make sure this node is a tag node
- if(!(this.node.getPrimaryNodeType().getName().equals(TAG_NODE_TYPE_NAME))) {
- String message = this.node.getName() + " is not a node of type " + TAG_NODE_TYPE_NAME + ". It is a node of type: " + this.node.getPrimaryNodeType().getName();
- log.error(message);
- throw new RulesRepositoryException(message);
- }
- }
- catch(Exception e) {
- log.error("Caught exception: " + e);
- throw new RulesRepositoryException(e);
- }
+// try {
+// //make sure this node is a tag node
+// if(!(this.node.getPrimaryNodeType().getName().equals(TAG_NODE_TYPE_NAME))) {
+// String message = this.node.getName() + " is not a node of type " + TAG_NODE_TYPE_NAME + ". It is a node of type: " + this.node.getPrimaryNodeType().getName();
+// log.error(message);
+// throw new RulesRepositoryException(message);
+// }
+// }
+// catch(Exception e) {
+// log.error("Caught exception: " + e);
+// throw new RulesRepositoryException(e);
+// }
}
/**
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java 2006-09-12 15:35:05 UTC (rev 6174)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RuleItem.java 2006-09-12 16:26:35 UTC (rev 6175)
@@ -422,13 +422,7 @@
*/
public List getCategories() throws RulesRepositoryException {
try {
- Node ruleNode;
- if(this.node.getPrimaryNodeType().getName().equals("nt:version")) {
- ruleNode = this.node.getNode("jcr:frozenNode");
- }
- else {
- ruleNode = this.node;
- }
+ Node ruleNode = getVersionContentNode();
List returnList = new ArrayList();
try {
Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2006-09-12 15:35:05 UTC (rev 6174)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java 2006-09-12 16:26:35 UTC (rev 6175)
@@ -707,7 +707,7 @@
try {
Node folderNode = this.getAreaNode(TAG_AREA);
- Node tagNode = null;
+ Node tagNode = folderNode;
StringTokenizer tok = new StringTokenizer(tagName, "/");
while(tok.hasMoreTokens()) {
@@ -790,29 +790,8 @@
throw new RulesRepositoryException(e);
}
}
+
- /**
- * This will provide a list of top level category strings.
- * Use getCategory to get a specific category to drill down into it.
- */
- public List listCategoryNames() throws RulesRepositoryException {
- try {
-
- Node folderNode = this.getAreaNode(TAG_AREA);
- NodeIterator it = folderNode.getNodes();
-
- List nodeNames = new ArrayList();
- while(it.hasNext()) {
- Node catNode = (Node) it.next();
- nodeNames.add( catNode.getName() );
- }
-
- return nodeNames;
- } catch ( RepositoryException e ) {
- throw new RulesRepositoryException(e);
- }
- }
-
/**
* @return The JCR session that this repository is using.
*/
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/CategoryItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/CategoryItemTestCase.java 2006-09-12 15:35:05 UTC (rev 6174)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/CategoryItemTestCase.java 2006-09-12 16:26:35 UTC (rev 6175)
@@ -22,19 +22,22 @@
assertEquals("TestTag", tagItem2.getName());
assertEquals(tagItem1, tagItem2);
- List originalCats = getRepo().listCategoryNames();
+ List originalCats = getRepo().getOrCreateCategory( "/" ).getChildTags(); //listCategoryNames();
+ assertTrue(originalCats.size() > 0);
+ CategoryItem root = (CategoryItem) originalCats.get( 0 );
+ assertNotNull(root.getName());
+ assertNotNull(root.getFullPath());
getRepo().getOrCreateCategory( "FootestTagItem" );
- List cats = getRepo().listCategoryNames();
- assertEquals(originalCats.size() + 1, cats.size());
+ List cats = getRepo().getOrCreateCategory( "/" ).getChildTags();
+ assertEquals(originalCats.size() + 1, cats.size());
-
boolean found = false;
for ( Iterator iter = cats.iterator(); iter.hasNext(); ) {
- String element = (String) iter.next();
- if (element.equals( "FootestTagItem" )) {
+ CategoryItem element = (CategoryItem) iter.next();
+ if (element.getName().equals( "FootestTagItem" )) {
found = true; break;
}
}
Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java 2006-09-12 15:35:05 UTC (rev 6174)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RuleItemTestCase.java 2006-09-12 16:26:35 UTC (rev 6175)
@@ -89,7 +89,7 @@
}
- public void testAddTag() {
+ public void testCategories() {
RuleItem ruleItem1 = getRepo().addRule("testAddTag", "test lhs content", "test rhs content");
ruleItem1.addCategory("testAddTagTestTag");
@@ -109,7 +109,20 @@
RuleItem retItem = (RuleItem) result.get( 0 );
assertEquals("testAddTag", retItem.getName());
+ ruleItem1.updateLhs( "foo" );
+ ruleItem1.checkin( "latest" );
+
+ result = getRepo().findRulesByTag( "testAddTagTestTag" );
+
+ assertEquals(1, result.size());
+ ruleItem1 = (RuleItem) result.get( 0 );
+ assertEquals(2, ruleItem1.getCategories().size());
+
+ assertEquals("foo", ruleItem1.getLhs());
+ RuleItem prev = (RuleItem) ruleItem1.getPrecedingVersion();
+ assertNotNull(prev);
+
}
public void testRemoveTag() {
More information about the jboss-svn-commits
mailing list