[Bprocessor-commit] /gui/src/net/sourceforge/bprocessor/gui/treeview GenericTreeView.java, 1.94, 1.95

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

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

Modified Files:
	GenericTreeView.java 
Log Message:
altered selection to a generic collection og geometrics which lead to quite alot of changes

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** GenericTreeView.java	10 Apr 2007 13:24:45 -0000	1.94
--- GenericTreeView.java	14 Apr 2007 15:00:42 -0000	1.95
***************
*** 330,334 ****
    public void select(Object target) {
      if (target instanceof Geometric) {
!       Selection.primary().add(target);
      } else {
        AttributeView.instance().display(target);
--- 330,334 ----
    public void select(Object target) {
      if (target instanceof Geometric) {
!       Selection.primary().add((Geometric)target);
      } else {
        AttributeView.instance().display(target);
***************
*** 1361,1365 ****
          GenericTreeView gtv = (GenericTreeView)event.getSource();
          TreePath[] paths = gtv.getSelectionPaths();
!         LinkedList select = new LinkedList();
          for (int i = 0; i < paths.length; i++) {
            Object o = paths[i].getLastPathComponent();
--- 1361,1365 ----
          GenericTreeView gtv = (GenericTreeView)event.getSource();
          TreePath[] paths = gtv.getSelectionPaths();
!         LinkedList<Geometric> select = new LinkedList<Geometric>();
          for (int i = 0; i < paths.length; i++) {
            Object o = paths[i].getLastPathComponent();
***************
*** 1368,1382 ****
              Object target = node.getUserObject();
              if (target instanceof Geometric) {
!               select.add(target);
              } else if (paths.length == 1 && target instanceof Parametric) {
                AttributeView.instance().display(target);
              }
              
            }
          }
!         Selection.primary().retainAll(select);
        } else {
          TreePath[] path = event.getPaths();
!         LinkedList deselect = new LinkedList();
          for (int i = 0; i < path.length; i++) {
            Object object = path[i].getLastPathComponent();
--- 1368,1386 ----
              Object target = node.getUserObject();
              if (target instanceof Geometric) {
!               select.add((Geometric)target);
              } else if (paths.length == 1 && target instanceof Parametric) {
                AttributeView.instance().display(target);
+             } else {
+               log.error("Reached empty branch in ");
              }
              
+           } else {
+             log.error("It were not a defaultMutatableNode");
            }
          }
!         Selection.primary().set(select);
        } else {
          TreePath[] path = event.getPaths();
!         LinkedList<Geometric> deselect = new LinkedList<Geometric>();
          for (int i = 0; i < path.length; i++) {
            Object object = path[i].getLastPathComponent();
***************
*** 1385,1389 ****
              Object target = node.getUserObject();
              if (target instanceof Geometric) {
!               deselect.add(target);
              }
            }
--- 1389,1393 ----
              Object target = node.getUserObject();
              if (target instanceof Geometric) {
!               deselect.add((Geometric)target);
              }
            }