[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz/gzz client/Fallback.java view/LastOpDecorat...
From: |
Benja Fallenstein |
Subject: |
[Gzz-commits] gzz/gzz client/Fallback.java view/LastOpDecorat... |
Date: |
Wed, 02 Oct 2002 14:40:43 -0400 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 02/10/02 14:40:43
Modified files:
gzz/client : Fallback.java
gzz/view : LastOpDecorator.java
Added files:
gzz/client : FallbackBinder.java
gzz/view : DefaultBinder.java
Removed files:
gzz/view : FallbackBinder.java
Log message:
Abstract out API from FallbackBinder, rename
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/FallbackBinder.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DefaultBinder.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
Patches:
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.43 gzz/gzz/client/Fallback.java:1.44
*** gzz/gzz/client/Fallback.java:1.43 Wed Oct 2 14:26:28 2002
--- gzz/gzz/client/Fallback.java Wed Oct 2 14:40:43 2002
***************
*** 73,79 ****
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.43 2002/10/02
18:26:28 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
--- 73,79 ----
* It implements a subset of the 0.6.0 bindings.
*/
public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.44 2002/10/02
18:40:43 benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 114,120 ****
public Space space;
public View[] viewList;
! public FallbackBinder binder = new FallbackBinder(this);
CellView cellView;
CellContentView cellContentView;
--- 114,120 ----
public Space space;
public View[] viewList;
! public DefaultBinder binder = new DefaultBinder(this);
CellView cellView;
CellContentView cellContentView;
***************
*** 265,274 ****
return viewList[viewIndex];
}
! public void keystroke(String s) { binder.keystroke(s, this); }
! public void mouse(MouseEvent ev) {}
public void timeout(Object o) {}
! public void windowClosed() { binder.windowClosed(this); }
Win(ColorScheme colors) {
for(int i=0; i<dimsIndices.length; i++)
--- 265,276 ----
return viewList[viewIndex];
}
! public void keystroke(String s) { getBinder().keystroke(s, this); }
! public void mouse(MouseEvent ev) { getBinder().mouse(ev, this); }
public void timeout(Object o) {}
! public void windowClosed() { getBinder().windowClosed(this); }
!
! public FallbackBinder getBinder() { return binder; }
Win(ColorScheme colors) {
for(int i=0; i<dimsIndices.length; i++)
Index: gzz/gzz/view/LastOpDecorator.java
diff -c gzz/gzz/view/LastOpDecorator.java:1.13
gzz/gzz/view/LastOpDecorator.java:1.14
*** gzz/gzz/view/LastOpDecorator.java:1.13 Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/LastOpDecorator.java Wed Oct 2 14:40:43 2002
***************
*** 32,38 ****
* directional op entered.
*/
public class LastOpDecorator implements FallbackSceneDecorator {
! String rcsid = "$Id: LastOpDecorator.java,v 1.13 2002/09/29 14:53:45 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.14 2002/10/02 18:40:43 benja
Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
***************
*** 50,56 ****
other = fallback.windows[fallback.RIGHT];
else if(win == fallback.windows[fallback.RIGHT])
other = fallback.windows[fallback.LEFT];
! else if(fallback.binder.directOp == FallbackBinder.REASSIGN_ARROWSET)
other = null; // REASSIGN_ARROWSET is shown in all windows
else
return; // command doesn't apply to this window...
--- 50,56 ----
other = fallback.windows[fallback.RIGHT];
else if(win == fallback.windows[fallback.RIGHT])
other = fallback.windows[fallback.LEFT];
! else if(fallback.binder.directOp == DefaultBinder.REASSIGN_ARROWSET)
other = null; // REASSIGN_ARROWSET is shown in all windows
else
return; // command doesn't apply to this window...
***************
*** 65,72 ****
if(fallback.mode == fallback.NORMAL) {
switch(fallback.binder.directOp) {
! case FallbackBinder.NONE: return;
! case FallbackBinder.CONNECT:
ch.addBox(text("Connect [where?] to "));
if(fallback.binder.marks.isEmpty())
ch.addBox(cell(other.cursor, win));
--- 65,72 ----
if(fallback.mode == fallback.NORMAL) {
switch(fallback.binder.directOp) {
! case DefaultBinder.NONE: return;
! case DefaultBinder.CONNECT:
ch.addBox(text("Connect [where?] to "));
if(fallback.binder.marks.isEmpty())
ch.addBox(cell(other.cursor, win));
***************
*** 78,100 ****
} else
ch.addBox(text("the marked cells"));
break;
! case FallbackBinder.DISCONNECT:
ch.addBox(text("Break [which connection?]")); break;
! case FallbackBinder.HOP:
ch.addBox(text("Hop [in which direction?]")); break;
! case FallbackBinder.NEW:
ch.addBox(text("Create a new cell [where?]")); break;
! case FallbackBinder.CLONE_R:
ch.addBox(text("Clone "));
ch.addBox(cell(fallback.windows[1].cursor, win));
ch.addBox(text(" [where?]", 2));
break;
! case FallbackBinder.CLONE_L:
ch.addBox(text("Clone "));
ch.addBox(cell(fallback.windows[0].cursor, win));
ch.addBox(text(" [where?]", 2));
break;
! case FallbackBinder.REASSIGN_ARROWSET:
ch.addBox(text("Move cursor to reassign arrowset"));
break;
default:
--- 78,100 ----
} else
ch.addBox(text("the marked cells"));
break;
! case DefaultBinder.DISCONNECT:
ch.addBox(text("Break [which connection?]")); break;
! case DefaultBinder.HOP:
ch.addBox(text("Hop [in which direction?]")); break;
! case DefaultBinder.NEW:
ch.addBox(text("Create a new cell [where?]")); break;
! case DefaultBinder.CLONE_R:
ch.addBox(text("Clone "));
ch.addBox(cell(fallback.windows[1].cursor, win));
ch.addBox(text(" [where?]", 2));
break;
! case DefaultBinder.CLONE_L:
ch.addBox(text("Clone "));
ch.addBox(cell(fallback.windows[0].cursor, win));
ch.addBox(text(" [where?]", 2));
break;
! case DefaultBinder.REASSIGN_ARROWSET:
ch.addBox(text("Move cursor to reassign arrowset"));
break;
default:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz/gzz client/Fallback.java view/LastOpDecorat...,
Benja Fallenstein <=