[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui/attrview GenericPanel.java, 1.36, 1.37 ClassificationTextAttribute.java, 1.7, 1.8

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

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

Modified Files:
	GenericPanel.java ClassificationTextAttribute.java 
Log Message:
forgot ClassificationNode in generictreeview, so moved that one as well...

Index: GenericPanel.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** GenericPanel.java	19 Mar 2007 13:03:25 -0000	1.36
--- GenericPanel.java	8 May 2007 12:34:06 -0000	1.37
***************
*** 244,247 ****
--- 244,249 ----
                  obj.setAttributes(attributes);
                  ((Entity)obj).changed();
+               } else if (obj instanceof Camera) {
+                 Project.getInstance().changed((Camera)obj);
                }
              }

Index: ClassificationTextAttribute.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/ClassificationTextAttribute.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ClassificationTextAttribute.java	8 May 2007 11:08:18 -0000	1.7
--- ClassificationTextAttribute.java	8 May 2007 12:34:06 -0000	1.8
***************
*** 35,38 ****
--- 35,40 ----
  import javax.swing.text.PlainDocument;
  
+ import org.apache.log4j.Logger;
+ 
  import net.sourceforge.bprocessor.model.Attribute;
  import net.sourceforge.bprocessor.model.Classification;
***************
*** 44,48 ****
  public class ClassificationTextAttribute extends GenericAttribute 
    implements ActionListener, MouseListener, KeyListener {
! 
    /** The listeners */
    private List listeners;
--- 46,52 ----
  public class ClassificationTextAttribute extends GenericAttribute 
    implements ActionListener, MouseListener, KeyListener {
!   /** The logger */
!   private static Logger log = Logger.getLogger(ClassificationTextAttribute.class);
!   
    /** The listeners */
    private List listeners;
***************
*** 335,347 ****
          attribute.setClassification(entered);
        } else {      
!         Classification newclas;
          if (((Classification) attribute.getValue()).getType() == 0) {
!           Classification egne = Project.getInstance().getClassification("-99", 0);
            newclas = new Classification("-1", editor.getText(), egne, 0);
-           egne.addChild(newclas);
          } else {
!           Classification egne = Project.getInstance().getClassification("-99", 1);
            newclas = new Classification("-1", editor.getText(), egne, 1);
            egne.addChild(newclas);
          }
          
--- 339,354 ----
          attribute.setClassification(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);
          }