[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/attrview ClassificationIdAttribute.java, 1.3, 1.4 GenericPanel.java, 1.30, 1.31

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31108/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	ClassificationIdAttribute.java GenericPanel.java 
Log Message:
Fixed types so the id field is now correct aswell. Also added so types are saved and loaded.

Index: GenericPanel.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** GenericPanel.java	21 Dec 2006 14:22:28 -0000	1.30
--- GenericPanel.java	6 Jan 2007 21:10:46 -0000	1.31
***************
*** 214,218 ****
          if (a.getClassification() != null && 
              !a.getClassification().getId().equalsIgnoreCase("-1") &&
!             a.getLevel() != 4) {
            // Handles the id part of classification
            ClassificationIdAttribute caid = new ClassificationIdAttribute(a);
--- 214,218 ----
          if (a.getClassification() != null && 
              !a.getClassification().getId().equalsIgnoreCase("-1") &&
!             !a.getName().equalsIgnoreCase("Type")) {
            // Handles the id part of classification
            ClassificationIdAttribute caid = new ClassificationIdAttribute(a);

Index: ClassificationIdAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ClassificationIdAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClassificationIdAttribute.java	16 Nov 2006 23:20:04 -0000	1.3
--- ClassificationIdAttribute.java	6 Jan 2007 21:10:46 -0000	1.4
***************
*** 65,69 ****
      if (!attribute.getClassification().getName().equalsIgnoreCase("Classification") &&
          !attribute.getClassification().getId().equalsIgnoreCase("-1")) {
!       component.add(createValueLabel(attribute.getClassification().getFullId()));  
      }
      Box header = Box.createHorizontalBox();
--- 65,70 ----
      if (!attribute.getClassification().getName().equalsIgnoreCase("Classification") &&
          !attribute.getClassification().getId().equalsIgnoreCase("-1")) {
!       component.add(createValueLabel(attribute.getClassification()
!           .getFullId(attribute.getLevel())));  
      }
      Box header = Box.createHorizontalBox();
***************
*** 190,194 ****
        if (attribute.getClassification() != null  
            && !attribute.getClassification().getName().equalsIgnoreCase("Classification")) {
!         editor = (JTextField) createValueEditor(attribute.getClassification().getFullId());
        } else {
          editor = (JTextField) createValueEditor("");
--- 191,196 ----
        if (attribute.getClassification() != null  
            && !attribute.getClassification().getName().equalsIgnoreCase("Classification")) {
!         editor = (JTextField) createValueEditor(attribute.getClassification()
!             .getFullId(attribute.getLevel()));
        } else {
          editor = (JTextField) createValueEditor("");
***************
*** 234,238 ****
        editor.removeKeyListener(this);
        editor = null;
!       component.add(createValueLabel(clas.getFullId()));
        component.revalidate();
        valueChanged();
--- 236,240 ----
        editor.removeKeyListener(this);
        editor = null;
!       component.add(createValueLabel(clas.getFullId(attribute.getLevel())));
        component.revalidate();
        valueChanged();