bprocessor-commit

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

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

Modified Files:
	Project.java 
Log Message:
load of types works

Index: Project.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** Project.java	9 Aug 2007 16:07:53 -0000	1.132
--- Project.java	10 Aug 2007 09:27:01 -0000	1.133
***************
*** 61,65 ****
    private static Classification functionalClas = null;
  
!   private static Collection<ClassificationType> classificatioTypes;
    
    /** The cameras */
--- 61,65 ----
    private static Classification functionalClas = null;
  
!   private static Collection<ClassificationType> classificationTypes;
    
    /** The cameras */
***************
*** 125,129 ****
          constructionClas = (Classification)loaded[0];
          functionalClas = (Classification)loaded[1];
!         classificatioTypes = (Collection<ClassificationType>)loaded[2];
          /*Map<String, ClassificationType> typeMap = ClassificationFileReader.loadTypes("");
          constructionClas = ClassificationFileReader.loadClassification(true, "", typeMap);
--- 125,129 ----
          constructionClas = (Classification)loaded[0];
          functionalClas = (Classification)loaded[1];
!         classificationTypes = (Collection<ClassificationType>)loaded[2];
          /*Map<String, ClassificationType> typeMap = ClassificationFileReader.loadTypes("");
          constructionClas = ClassificationFileReader.loadClassification(true, "", typeMap);
***************
*** 883,889 ****
            if (!Character.isDigit(curid.charAt(1))) {
              if (!Character.isDigit(curid.charAt(2))) {
!               curid = "-" + curid.substring(3);
              } else {
!               curid = "-" + curid.substring(2);
              }
            }
--- 883,889 ----
            if (!Character.isDigit(curid.charAt(1))) {
              if (!Character.isDigit(curid.charAt(2))) {
!               curid = curid.substring(3);
              } else {
!               curid = curid.substring(2);
              }
            }
***************
*** 901,905 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.equalsIgnoreCase(current.getId())) {
              cl = current;
            }
--- 901,905 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.endsWith(current.getId())) {
              cl = current;
            }
***************
*** 940,944 ****
    public ClassificationType findClassificationType(String id, int type) {
      StringTokenizer st = new StringTokenizer(id, ".");
!     ClassificationType res = null;
      Classification cl;
      if (type == Space.CONSTRUCTION) {
--- 940,945 ----
    public ClassificationType findClassificationType(String id, int type) {
      StringTokenizer st = new StringTokenizer(id, ".");
!     int typeIndex = -1;
!     int subTypeIndex = -1;
      Classification cl;
      if (type == Space.CONSTRUCTION) {
***************
*** 947,974 ****
        String curid;
        while (st.hasMoreTokens()) {
          curid = st.nextToken();
          if (("" + curid.charAt(0)).equalsIgnoreCase("-")) {
            if (!Character.isDigit(curid.charAt(1))) {
!             if (cl.getPossibleTypes() != null && cl.getPossibleTypes().getChildren() != null) {
!               res = cl.getPossibleTypes().getChildren().get((int)'A' - (int)curid.charAt(1));
!             }
              if (!Character.isDigit(curid.charAt(2))) {
!               if (cl.getPossibleTypes() != null && cl.getPossibleTypes().getChildren() != null) {
!                 res = res.getChildren().get((int)'A' - (int)curid.charAt(2));
!               }
!               curid = "-" + curid.substring(3);
              } else {
!               curid = "-" + curid.substring(2);
              }
            }
          } else {
            if (!Character.isDigit(curid.charAt(0))) {
!             if (cl.getPossibleTypes() != null && cl.getPossibleTypes().getChildren() != null) {
!               res = cl.getPossibleTypes().getChildren().get((int)'A' - (int)curid.charAt(1));
!             }
              if (!Character.isDigit(curid.charAt(1))) {
!               if (cl.getPossibleTypes() != null && cl.getPossibleTypes().getChildren() != null) {
!                 res = res.getChildren().get((int)'A' - (int)curid.charAt(2));
!               }
                curid = curid.substring(2);
              } else {
--- 948,969 ----
        String curid;
        while (st.hasMoreTokens()) {
+         typeIndex = -1;
+         subTypeIndex = -1;
          curid = st.nextToken();
          if (("" + curid.charAt(0)).equalsIgnoreCase("-")) {
            if (!Character.isDigit(curid.charAt(1))) {
!             typeIndex =  curid.charAt(1) - (int)'A';
              if (!Character.isDigit(curid.charAt(2))) {
!               subTypeIndex = curid.charAt(2) - (int)'A';
!               curid = curid.substring(3);
              } else {
!               curid = curid.substring(2);
              }
            }
          } else {
            if (!Character.isDigit(curid.charAt(0))) {
!             typeIndex = curid.charAt(1)  - (int)'A';
              if (!Character.isDigit(curid.charAt(1))) {
!               subTypeIndex = curid.charAt(2)  - (int)'A';
                curid = curid.substring(2);
              } else {
***************
*** 981,991 ****
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.equalsIgnoreCase(current.getId())) {
              cl = current;
            }
          }
        }
      }
!     return res;
    }
    
--- 976,996 ----
          while (it.hasNext()) {
            Classification current = (Classification) it.next();
!           if (curid.endsWith(current.getId())) {
              cl = current;
            }
          }
        }
+       if (typeIndex > -1 && cl != null && cl.getPossibleTypes() != null && 
+           typeIndex < cl.getPossibleTypes().getChildren().size()) {
+         ClassificationType ct = cl.getPossibleTypes().getChildren().get(typeIndex);
+         if (subTypeIndex > -1 && subTypeIndex < ct.getChildren().size()) {
+           ct = ct.getChildren().get(subTypeIndex);
+         }
+         return ct; 
+       } else {
+         return cl.getPossibleTypes();
+       }
      }
!     return null;
    }
    
***************
*** 1001,1006 ****
     * @return the classificatioTypes
     */
!   public static Collection<ClassificationType> getClassificatioTypes() {
!     return classificatioTypes;
    }
  
--- 1006,1011 ----
     * @return the classificatioTypes
     */
!   public static Collection<ClassificationType> getClassificationTypes() {
!     return classificationTypes;
    }
  
***************
*** 1008,1014 ****
     * @param classificatioTypes the classificatioTypes to set
     */
!   public static void setClassificatioTypes(
        List<ClassificationType> classificatioTypes) {
!     Project.classificatioTypes = classificatioTypes;
    }
  }
--- 1013,1019 ----
     * @param classificatioTypes the classificatioTypes to set
     */
!   public static void setClassificationTypes(
        List<ClassificationType> classificatioTypes) {
!     Project.classificationTypes = classificatioTypes;
    }
  }