[jboss-svn-commits] JBL Code SVN: r19869 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/rpc and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 6 08:45:51 EDT 2008
Author: michael.neale at jboss.com
Date: 2008-05-06 08:45:51 -0400 (Tue, 06 May 2008)
New Revision: 19869
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/PackageHierarchy.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/explorer/PackageHierarchyTest.java
Log:
yay - in jetlagged state I was able to make this work
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/PackageHierarchy.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/PackageHierarchy.java 2008-05-06 05:17:52 UTC (rev 19868)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/explorer/PackageHierarchy.java 2008-05-06 12:45:51 UTC (rev 19869)
@@ -3,19 +3,27 @@
import java.util.ArrayList;
import java.util.List;
+import org.drools.brms.client.rpc.PackageConfigData;
+
public class PackageHierarchy {
public Folder root = new Folder();
- public void addPackage(String packageName) {
+ public void addPackage(PackageConfigData conf) {
Folder folder = root;
- String[] folders = packageName.split("\\.");
+ String[] folders = conf.name.split("\\.");
for (int i = 0; i < folders.length; i++) {
String f = folders[i];
Folder existing = folder.contains(f);
if (existing == null || existing.children.size() == 0) {
- folder = folder.add(f);
+ if (i == folders.length - 1) {
+ //leaf
+ folder = folder.add(f, conf);
+ } else {
+ folder = folder.add(f, null);
+ }
+
} else {
folder = existing;
}
@@ -26,13 +34,15 @@
public static class Folder {
String name;
+ PackageConfigData conf;
boolean hasChildren() {
return children.size() > 0;
}
- public Folder add(String f) {
+ public Folder add(String f, PackageConfigData conf) {
Folder n = new Folder();
n.name = f;
+ n.conf = conf;
children.add(n);
return n;
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java 2008-05-06 05:17:52 UTC (rev 19868)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/PackageConfigData.java 2008-05-06 12:45:51 UTC (rev 19869)
@@ -1,13 +1,13 @@
package org.drools.brms.client.rpc;
/*
* Copyright 2005 JBoss Inc
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,8 +30,13 @@
implements
IsSerializable {
+ public PackageConfigData() {}
+ public PackageConfigData(String name) {
+ this.name = name;
+ }
+
public String uuid;
- public String header;
+ public String header;
public String externalURI;
public String name;
public String description;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/explorer/PackageHierarchyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/explorer/PackageHierarchyTest.java 2008-05-06 05:17:52 UTC (rev 19868)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/explorer/PackageHierarchyTest.java 2008-05-06 12:45:51 UTC (rev 19869)
@@ -1,6 +1,7 @@
package org.drools.brms.client.explorer;
import org.drools.brms.client.explorer.PackageHierarchy.Folder;
+import org.drools.brms.client.rpc.PackageConfigData;
import junit.framework.TestCase;
@@ -8,25 +9,29 @@
public void testSimple() {
PackageHierarchy h = new PackageHierarchy();
- h.addPackage("com.foo");
+ h.addPackage(new PackageConfigData("com.foo"));
Folder root = h.root;
assertEquals(1, root.children.size());
Folder f = (Folder) root.children.get(0);
+ assertEquals(null, f.conf);
assertEquals("com", f.name);
assertEquals(1, f.children.size());
f = (Folder) f.children.get(0);
assertEquals("foo", f.name);
+ assertNotNull(f.conf);
- h.addPackage("com.bar");
+ h.addPackage(new PackageConfigData("com.bar"));
f = (Folder) root.children.get(0);
assertEquals("com", f.name);
+ assertNull(f.conf);
assertEquals(2, f.children.size());
f = (Folder) f.children.get(1);
assertEquals("bar", f.name);
+ assertNotNull(f.conf);
- h.addPackage("goo.bar.baz");
+ h.addPackage(new PackageConfigData("goo.bar.baz"));
assertEquals(2, root.children.size());
f = (Folder) root.children.get(1);
assertEquals("goo", f.name);
@@ -40,7 +45,7 @@
assertEquals("baz", f.name);
- h.addPackage("goo.char.baz");
+ h.addPackage(new PackageConfigData("goo.char.baz"));
assertEquals(2, root.children.size());
f = (Folder) root.children.get(1);
assertEquals(2, f.children.size());
@@ -50,7 +55,7 @@
f = (Folder) f.children.get(0);
assertEquals("baz", f.name);
- h.addPackage("Whee");
+ h.addPackage(new PackageConfigData("Whee"));
assertEquals(3, root.children.size());
@@ -59,8 +64,8 @@
public void testComplex() {
PackageHierarchy h = new PackageHierarchy();
- h.addPackage("com.bar");
- h.addPackage("com.bar.baz");
+ h.addPackage(new PackageConfigData("com.bar"));
+ h.addPackage(new PackageConfigData("com.bar.baz"));
assertEquals(1, h.root.children.size());
Folder f = (Folder) h.root.children.get(0);
assertEquals(2, f.children.size());
More information about the jboss-svn-commits
mailing list