[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Project.java, 1.133, 1.134

[rimestad <rim...@us...>]

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

Modified Files:
	Project.java 
Log Message:
Modified the loadClassificationType method to handle functional and constructional classifications and classificationtypes

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** Project.java	10 Aug 2007 09:27:01 -0000	1.133
--- Project.java	14 Sep 2007 10:11:32 -0000	1.134
***************
*** 877,881 ****
        cl = constructionClas;
        
!       String curid;
        while (st.hasMoreTokens()) {
          curid = st.nextToken();
--- 877,881 ----
        cl = constructionClas;
        
!       String curid = st.nextToken();
        while (st.hasMoreTokens()) {
          curid = st.nextToken();
***************
*** 901,906 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.endsWith(current.getId())) {
              cl = current;
            }
          }
--- 901,907 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid)) {
              cl = current;
+             break;
            }
          }
***************
*** 909,913 ****
        cl = functionalClas;
        boolean first = true;
!       String curid;
        while (st.hasMoreTokens()) {
          if (first) {
--- 910,914 ----
        cl = functionalClas;
        boolean first = true;
!       String curid = st.nextToken();
        while (st.hasMoreTokens()) {
          if (first) {
***************
*** 923,928 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.equalsIgnoreCase(current.getId())) {
              cl = current;
            }
          }
--- 924,930 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid)) {
              cl = current;
+             break;
            }
          }
***************
*** 976,980 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.endsWith(current.getId())) {
              cl = current;
            }
--- 978,982 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (current.getId().endsWith(curid)) {
              cl = current;
            }