[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/attrview GenericPanel.java, 1.58, 1.59 ClassificationTextAttribute.java, 1.13, 1.14

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv28248/src/net/sourceforge/bprocessor/gui/attrview

Modified Files:
	GenericPanel.java ClassificationTextAttribute.java 
Log Message:
Classification update problem

Index: GenericPanel.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** GenericPanel.java	31 Aug 2010 13:48:06 -0000	1.58
--- GenericPanel.java	26 Oct 2010 06:44:25 -0000	1.59
***************
*** 104,108 ****
          simpleUpdate = true;
        }
!       Project.getInstance().changed();
        Project.getInstance().checkpoint();
      }
--- 104,108 ----
          simpleUpdate = true;
        }
!       Project.getInstance().changed(obj);
        Project.getInstance().checkpoint();
      }

Index: ClassificationTextAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ClassificationTextAttribute.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ClassificationTextAttribute.java	18 Sep 2009 10:16:18 -0000	1.13
--- ClassificationTextAttribute.java	26 Oct 2010 06:44:25 -0000	1.14
***************
*** 197,213 ****
      if (value != null) {
        valueLabel = new JLabel(value.getName());
-       /*if (attribute.getClassification().getId().equalsIgnoreCase("-1")) {
-       valueLabel =  new JLabel(value.getName());
-     } else {
-       if (attribute.getClassification() == null ||
-           ((Classification)attribute.getValue()).getName().
-           equalsIgnoreCase(attribute.getClassification().getParent().getName())) {
-         valueLabel =  new JLabel(value.getName());
-       } else {
-         //valueLabel =  new JLabel(value.getParent().getName() + "." + value.getName());
-         valueLabel =  new JLabel(value.getName());
-       }
-     }*/
-       
      } else {
        valueLabel = new JLabel("None");
--- 197,200 ----
***************
*** 284,293 ****
        if (e.getSource() instanceof MyMenuItem) {
          MyMenuItem source = (MyMenuItem)(e.getSource());
-         System.out.println("menu selected " + source);
-         
          attribute.setValue(source.getClassification());
-         component.remove(0);
-         component.add(createValueLabel((Structure)attribute.getThe2ndValue()));
-         component.revalidate();
          valueChanged(); 
        }
--- 271,275 ----
***************
*** 346,366 ****
        if (entered != null) {
          attribute.setValue(entered);
!       } /*else {      
!         Classification newclas, egne;
!         if (((Classification) attribute.getValue()).getType() == 0) {
!           egne = Project.getInstance().getClassification("-99", 0);
!           newclas = new Classification("-1", editor.getText(), egne, 0);
!         } else {
!           egne = Project.getInstance().getClassification("-99", 1);
!           newclas = new Classification("-1", editor.getText(), egne, 1);
!         }
!         if (egne != null && newclas != null) {
!           egne.addChild(newclas);
!         } else {
!           log.warn("Tried to create classification in " + egne + " as " + newclas);
!         }
!         
!         attribute.setThe2ndValue(newclas);
!       }*/
        component.remove(editor);
        editor.removeKeyListener(this);
--- 328,332 ----
        if (entered != null) {
          attribute.setValue(entered);
!       }
        component.remove(editor);
        editor.removeKeyListener(this);