[jboss-svn-commits] JBL Code SVN: r9899 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.

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

Author: michael.neale at jboss.com
Date: 2007-03-01 21:55:53 -0500 (Thu, 01 Mar 2007)
New Revision: 9899

Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageIterator.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/PackageItemTest.java
Log:
fixed a bug with package iterators

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-03-02 00:47:15 UTC (rev 9898)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageItem.java	2007-03-02 02:55:53 UTC (rev 9899)
@@ -82,6 +82,21 @@
     }
 
 
+    
+    public String getName() {
+        try {
+            if (this.rulesRepository.isNotSnapshot( this.node.getParent() )) {
+                return super.getName();
+            } else {
+                System.out.println(this.node.getPath());
+                return this.node.getParent().getName();
+                
+            }
+        } catch (RepositoryException e) {
+            throw new RulesRepositoryException( e );
+        }
+    }
+
     /**
      * Adds a rule to the current package with no category (not recommended !).
      * Without categories, its going to be hard to find rules later on

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageIterator.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageIterator.java	2007-03-02 00:47:15 UTC (rev 9898)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/PackageIterator.java	2007-03-02 02:55:53 UTC (rev 9899)
@@ -13,11 +13,12 @@
     implements
     Iterator {
     
-    private NodeIterator packageNodeIterator;
-    private RulesRepository repository;
+    private final NodeIterator packageNodeIterator;
+    private final RulesRepository repository;
 
     public PackageIterator(RulesRepository repository, NodeIterator packageNodes) {
         this.packageNodeIterator = packageNodes;
+        this.repository = repository;
     }
 
     public boolean hasNext() {

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	2007-03-02 00:47:15 UTC (rev 9898)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RulesRepository.java	2007-03-02 02:55:53 UTC (rev 9899)
@@ -751,7 +751,7 @@
 
 
 
-    private boolean isNotSnapshot(Node parentNode) throws RepositoryException {
+    boolean isNotSnapshot(Node parentNode) throws RepositoryException {
         return parentNode.getPath().indexOf( PACKAGE_SNAPSHOT_AREA ) == -1;
     }
     

Modified: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-03-02 00:47:15 UTC (rev 9898)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/PackageItemTest.java	2007-03-02 02:55:53 UTC (rev 9899)
@@ -109,6 +109,8 @@
         PackageItem _pkgLoaded = repo.loadPackageByUUID( pkgLoaded.getUUID() );
         assertNotNull(_pkgLoaded);
         assertEquals(pkgLoaded.getCreatedDate(), _pkgLoaded.getCreatedDate());
+        assertEquals(pkgLoaded.getName(), _pkgLoaded.getName());
+        //assertEquals("testPackageSnapshot", pkgLoaded.getName());
         List loadedAssets = iteratorToList( pkgLoaded.getAssets() );
         List _loadedAssets = iteratorToList( _pkgLoaded.getAssets() );
         assertEquals(loadedAssets.size(), _loadedAssets.size());