[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Selection.java, 1.18, 1.19
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2008-08-29 12:27:28
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22055/src/net/sourceforge/bprocessor/model Modified Files: Selection.java Log Message: display space of path Index: Selection.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Selection.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Selection.java 14 Apr 2007 15:00:47 -0000 1.18 --- Selection.java 29 Aug 2008 12:27:32 -0000 1.19 *************** *** 23,27 **** public class Selection implements Collection<Geometric> { /** The logger */ ! private static Logger log = Logger.getLogger(Selection.class); /** The collection of objects mark is used to test for membership */ --- 23,29 ---- public class Selection implements Collection<Geometric> { /** The logger */ ! private static Logger log = Logger.getLogger(Selection.class); ! ! private static final boolean VERIFY = false; /** The collection of objects mark is used to test for membership */ *************** *** 70,82 **** */ public boolean add(Geometric object) { - if (object == null) { - throw new Error("Null object added to selection"); - } - if (!(object instanceof Geometric)) { - throw new Error("Illegal object added to selection " + object.getClass().getName()); - } if (mark.add(object)) { selection.add(object); changed(); return true; } else { --- 72,81 ---- */ public boolean add(Geometric object) { if (mark.add(object)) { selection.add(object); changed(); + if (VERIFY) { + verify(); + } return true; } else { *************** *** 111,118 **** } ! /** ! * dont call clean ! * ! */ private void clean() { mark.clear(); --- 110,114 ---- } ! private void clean() { mark.clear(); *************** *** 231,234 **** --- 227,233 ---- if (touched) { changed(); + if (VERIFY) { + verify(); + } return true; } else { *************** *** 268,271 **** --- 267,282 ---- /** + * + */ + public void verify() { + Container active = Project.getInstance().getActiveSpace(); + for (Geometric current : selection) { + if (current.getOwner() != active) { + throw new Error("Selective wrongness!"); + } + } + } + + /** * Calculate center of selection * @return Center |