[Gzz-commits] gzz/gzz/view DefaultBinder.java LastOpDecorator...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/10 13:53:41

Modified files:
        gzz/view       : DefaultBinder.java LastOpDecorator.java 

Log message:
        Be friendlier in some cases

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/gzz/view/DefaultBinder.java
diff -c gzz/gzz/view/DefaultBinder.java:1.6 gzz/gzz/view/DefaultBinder.java:1.7
*** gzz/gzz/view/DefaultBinder.java:1.6 Thu Oct 10 11:57:42 2002
--- gzz/gzz/view/DefaultBinder.java     Thu Oct 10 13:53:40 2002
***************
*** 42,48 ****
  /** Keybindings for the Fallback client.
   */
  public class DefaultBinder implements FallbackBinder {
! public static final String rcsid = "$Id: DefaultBinder.java,v 1.6 2002/10/10 
15:57:42 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 42,48 ----
  /** Keybindings for the Fallback client.
   */
  public class DefaultBinder implements FallbackBinder {
! public static final String rcsid = "$Id: DefaultBinder.java,v 1.7 2002/10/10 
17:53:40 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 116,126 ****
                dims[dim].connect(w.cursor, dir, other.cursor);
            else {
                c = w.cursor;
                for(Iterator i=marks.iterator(); i.hasNext();) {
                    Mark m = (Mark)i.next();
                    c.connect(dims[dim], dir, m.cell);
                    c = m.cell;
!               }
                marks = new ArrayList();
                markedCells = new HashSet();
            }
--- 116,152 ----
                dims[dim].connect(w.cursor, dir, other.cursor);
            else {
                c = w.cursor;
+                 
+                 Set alreadyConnected = new HashSet();
+                 if(c.s(dims[dim], dir) != null)
+                     alreadyConnected.add(c);
+                     
+                 for(Iterator i=marks.iterator(); i.hasNext();) {
+                     Mark m = (Mark)i.next();
+                     if(m.cell.s(dims[dim], -dir) != null)
+                         alreadyConnected.add(m.cell);
+                         
+                     if(i.hasNext() && m.cell.s(dims[dim], dir) != null)
+                         alreadyConnected.add(m.cell);
+                 }
+                 
+                 if(!alreadyConnected.isEmpty()) {
+                     // XXX should show cell(s) in the apology!
+                 
+                     String dimStr = fallback.dimList[w.dimsIndices[dim]].name;
+                     
+                     throw new ClientException(
+                         "Sorry, I couldn't connect, because "+
+                         (alreadyConnected.size() == 1 ? "one " : "some ")+
+                         "of the cells already has a connection "+
+                         "on "+dimStr+".");
+                 }
+                 
                for(Iterator i=marks.iterator(); i.hasNext();) {
                    Mark m = (Mark)i.next();
                    c.connect(dims[dim], dir, m.cell);
                    c = m.cell;
!                 }
                marks = new ArrayList();
                markedCells = new HashSet();
            }
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.17 
gzz/gzz/view/LastOpDecorator.java:1.18
*** gzz/gzz/view/LastOpDecorator.java:1.17      Thu Oct 10 11:57:42 2002
--- gzz/gzz/view/LastOpDecorator.java   Thu Oct 10 13:53:41 2002
***************
*** 32,38 ****
   *  directional op entered.
   */
  public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.17 2002/10/10 15:57:42 benja 
Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 32,38 ----
   *  directional op entered.
   */
  public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.18 2002/10/10 17:53:41 benja 
Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 108,113 ****
--- 108,115 ----
          else if(fallback.mode == fallback.SEARCH)
              ch.addBox(text("Search for: " + fallback.binder.buffer));
          else return;
+         
+         // XXX linebreaking! (only breaks *between* boxes...)
  
        float w = size.width - 2*padding;
        HBroken br = breaker.breakLines(ch, w, 1.0f);