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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/09 05:10:08

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

Log message:
        Add ability to show errors in status bar.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: gzz/gzz/view/DefaultBinder.java
diff -c gzz/gzz/view/DefaultBinder.java:1.4 gzz/gzz/view/DefaultBinder.java:1.5
*** gzz/gzz/view/DefaultBinder.java:1.4 Mon Oct  7 13:27:02 2002
--- gzz/gzz/view/DefaultBinder.java     Wed Oct  9 05:10:08 2002
***************
*** 42,48 ****
  /** Keybindings for the Fallback client.
   */
  public class DefaultBinder implements FallbackBinder {
! public static final String rcsid = "$Id: DefaultBinder.java,v 1.4 2002/10/07 
17:27:02 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.5 2002/10/09 
09:10:08 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 91,96 ****
--- 91,100 ----
       *  We want to be able to have big mark sets.
       */
      public Set markedCells = new HashSet();
+     
+     /** A string describing the last error that occurred, if any.
+      */
+     public String errstring = null;
  
      public DefaultBinder(Fallback fallback) {
          this.fallback = fallback;
***************
*** 194,199 ****
--- 198,204 ----
        }
  
        wasInWindow = (Fallback.Win)win;
+         errstring = null;
  
        try {
            if(fallback.mode == NORMAL)
***************
*** 262,268 ****
                  cell.delete();
                  fallback.windows[1].cursor = home;
              } else {
!                 pa("Cannot delete home cell");
              }
        } else if(k.length() == 1) {
            switch(k.charAt(0)) {
--- 267,273 ----
                  cell.delete();
                  fallback.windows[1].cursor = home;
              } else {
!                 errstring = "Sorry, I can't delete the home cell.";
              }
        } else if(k.length() == 1) {
            switch(k.charAt(0)) {
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.15 
gzz/gzz/view/LastOpDecorator.java:1.16
*** gzz/gzz/view/LastOpDecorator.java:1.15      Tue Oct  8 03:34:54 2002
--- gzz/gzz/view/LastOpDecorator.java   Wed Oct  9 05:10:08 2002
***************
*** 32,38 ****
   *  directional op entered.
   */
  public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.15 2002/10/08 07:34:54 tjl 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.16 2002/10/09 09:10:08 benja 
Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 63,69 ****
  
          if(dbg) pa("fallback.binder.directOp: "+fallback.binder.directOp);
  
!         if(fallback.mode == fallback.NORMAL) {
              switch(fallback.binder.directOp) {
                  case DefaultBinder.NONE: return;
                  case DefaultBinder.CONNECT:
--- 63,71 ----
  
          if(dbg) pa("fallback.binder.directOp: "+fallback.binder.directOp);
  
!         if(fallback.binder.errstring != null) {
!             ch.addBox(text(fallback.binder.errstring));
!         } else if(fallback.mode == fallback.NORMAL) {
              switch(fallback.binder.directOp) {
                  case DefaultBinder.NONE: return;
                  case DefaultBinder.CONNECT: