[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.263, 1.264

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5554/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java 
Log Message:
split of select and assign

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.263
retrieving revision 1.264
diff -C2 -d -r1.263 -r1.264
*** View.java	21 Nov 2007 21:10:41 -0000	1.263
--- View.java	28 Nov 2007 10:39:21 -0000	1.264
***************
*** 1100,1129 ****
     */
    private void labelSelection(boolean clickable) {
      Collection<Geometric> selection = Selection.primary();
!     if (selection.size() == 1) {
!       Geometric candidate = selection.iterator().next();
!       if (candidate instanceof Surface) {
!         if (TICKLE) {
!           long time = System.currentTimeMillis();
!           long elapsed = time - AbstractTool.getPressedTime();
!           long delay = 0;
!           if (labelSurface == null) {
!             delay = 120;
!           }
!           if (elapsed >= delay) {
!             labelSurface = (Surface) candidate;
!             labelSurface(labelSurface, clickable);
!           } else {
!             int when = (int) (delay - elapsed);
!             tickler.stop();
!             tickler.setDelay(when);
!             tickler.start();
!           }
!         } else {
            labelSurface = (Surface) candidate;
            labelSurface(labelSurface, clickable);
          }
        } else {
!         labelSurface = null;
        }
      } else {
--- 1100,1133 ----
     */
    private void labelSelection(boolean clickable) {
+     Geometric candidate = null;
+     
      Collection<Geometric> selection = Selection.primary();
!     if (selection.size() == 0) {
!       if (target instanceof Geometric) {
!         candidate = (Geometric) target;
!       }
!     } else {
!       candidate = selection.iterator().next();
!     }
!     if (candidate instanceof Surface) {
!       if (TICKLE) {
!         long time = System.currentTimeMillis();
!         long elapsed = time - AbstractTool.getPressedTime();
!         long delay = 0;
!         if (labelSurface == null) {
!           delay = 120;
!         }
!         if (elapsed >= delay) {
            labelSurface = (Surface) candidate;
            labelSurface(labelSurface, clickable);
+         } else {
+           int when = (int) (delay - elapsed);
+           tickler.stop();
+           tickler.setDelay(when);
+           tickler.start();
          }
        } else {
!         labelSurface = (Surface) candidate;
!         labelSurface(labelSurface, clickable);
        }
      } else {