[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.94, 1.95

[Nikolaj B. <nbr...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11015/src/net/sourceforge/bprocessor/model

Modified Files:
	Project.java 
Log Message:
Fixed a loading issue with functional classifications

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** Project.java	17 Nov 2006 15:47:28 -0000	1.94
--- Project.java	19 Nov 2006 20:29:03 -0000	1.95
***************
*** 891,905 ****
      if (type == 0) {
        cl = constructionClas;
      } else {
        cl = functionalClas;
!     }
!     String curid;
!     while (st.hasMoreTokens()) {
!       curid = st.nextToken();
!       Iterator it = cl.getChildren().iterator();
!       while (it.hasNext()) {
!         Classification current = (Classification) it.next();
!         if (curid.equalsIgnoreCase(current.getId())) {
!           cl = current;
          }
        }
--- 891,926 ----
      if (type == 0) {
        cl = constructionClas;
+       
+       String curid;
+       while (st.hasMoreTokens()) {
+         curid = st.nextToken();
+         Iterator it = cl.getChildren().iterator();
+         while (it.hasNext()) {
+           Classification current = (Classification) it.next();
+           if (curid.equalsIgnoreCase(current.getId())) {
+             cl = current;
+           }
+         }
+       }
      } else {
        cl = functionalClas;
!       boolean first = true;
!       String curid;
!       while (st.hasMoreTokens()) {
!         if (first) {
!           curid = st.nextToken();
!         first = false;
!         } else {
!           curid = st.nextToken();
!           if (st.hasMoreTokens()) {
!             curid = curid + "." + st.nextToken();
!           }
!         }
!         Iterator it = cl.getChildren().iterator();
!         while (it.hasNext()) {
!           Classification current = (Classification) it.next();
!           if (curid.equalsIgnoreCase(current.getId())) {
!             cl = current;
!           }
          }
        }