[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz gzz/zzutil/Containment.java lava/gzz/client...
|
From: |
Benja Fallenstein |
|
Subject: |
[Gzz-commits] gzz gzz/zzutil/Containment.java lava/gzz/client... |
|
Date: |
Tue, 07 Jan 2003 16:49:11 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Benja Fallenstein <address@hidden> 03/01/07 16:49:08
Modified files:
gzz/zzutil : Containment.java
lava/gzz/client: PotionFallbackBinder.java
lava/gzz/modules/email: AllEmailsThat.java FromFilter.java
NewerFilterFn.java OlderFilterFn.java
SubjectFilter.java SubjectFilterFn.java
ToFilter.java
lava/gzz/potion: Call.java
lava/gzz/potion/potions: AndFilterFn.java
ConstantExpression.java InsertChar.java
MarkHalfRank.java OrFilterFn.java
PrefixOrOther.java ToggleMark.java
Types.java
lava/gzz/view : PendingPotionDecorator.java
Added files:
lava/gzz/potion/potions: PrefixFunction.java
Log message:
More work towards email client demo: "Clone
all emails from "address@hidden" [where?] does now work
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/zzutil/Containment.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/client/PotionFallbackBinder.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/AllEmailsThat.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/FromFilter.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/NewerFilterFn.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/OlderFilterFn.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/SubjectFilter.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/SubjectFilterFn.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/modules/email/ToFilter.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/Call.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/PrefixFunction.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/AndFilterFn.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/ConstantExpression.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/InsertChar.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/MarkHalfRank.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/OrFilterFn.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/PrefixOrOther.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/ToggleMark.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/potion/potions/Types.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/view/PendingPotionDecorator.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gzz/gzz/zzutil/Containment.java
diff -u gzz/gzz/zzutil/Containment.java:1.1 gzz/gzz/zzutil/Containment.java:1.2
--- gzz/gzz/zzutil/Containment.java:1.1 Sat Dec 7 20:06:08 2002
+++ gzz/gzz/zzutil/Containment.java Tue Jan 7 16:49:08 2003
@@ -34,6 +34,7 @@
* together.
*/
public static String getContainedText(Cell c) {
+ c = c.getRootclone();
Dim d_contain = c.space.getDim(Ids.d_contain);
Dim d_contain_list = c.space.getDim(Ids.d_contain_list);
@@ -54,6 +55,7 @@
* as specified by the containment mechanism.
*/
public static Enfilade1D getContainedEnfilade(Cell c) {
+ c = c.getRootclone();
VStreamCellTexter t = (VStreamCellTexter)c.space.getCellTexter();
Dim d_contain = c.space.getDim(Ids.d_contain);
Dim d_contain_list = c.space.getDim(Ids.d_contain_list);
@@ -84,6 +86,7 @@
*/
public static void addContainedCell(Cell into, Cell add)
throws IllegalArgumentException {
+ into = into.getRootclone();
Dim d_contain = into.space.getDim(Ids.d_contain);
Dim d_contain_list = into.space.getDim(Ids.d_contain_list);
Index: gzz/lava/gzz/client/PotionFallbackBinder.java
diff -u gzz/lava/gzz/client/PotionFallbackBinder.java:1.6
gzz/lava/gzz/client/PotionFallbackBinder.java:1.7
--- gzz/lava/gzz/client/PotionFallbackBinder.java:1.6 Mon Jan 6 07:11:46 2003
+++ gzz/lava/gzz/client/PotionFallbackBinder.java Tue Jan 7 16:49:08 2003
@@ -10,11 +10,11 @@
public static boolean dbg = false;
private static void pa(String s) { System.out.println(s); }
- public FunctionExpression currentFunctionExpression;
- public CommandCall currentCommand;
- public int currentWin;
+ public Call currentCall;
+ public Fallback.Win currentWin;
public static Object NORMAL_MODE = new Object();
+ public static Object PARAM_EDIT_MODE = new Object();
public static Object CHAR_KEY = new Object();
public static Object ANY_KEY = new Object();
@@ -24,6 +24,8 @@
protected Map bindingsByMode;
public Object mode = NORMAL_MODE;
+ protected gzz.potion.potions.ConstantExpression currentParam;
+
public Set markedCells = new HashSet();
/** An arrow key.
@@ -52,6 +54,51 @@
public void keystroke(String k, Fallback.Win win) {
if(dbg) pa("Key: "+k);
+ if(k.equals("Esc") || k.equals("Escape")) {
+ // The 'safety belt': Esc always returns to normal mode
+ mode = NORMAL_MODE;
+ fallback.windows[fallback.RIGHT].textCursor = -1;
+ currentCall = null;
+ currentWin = null;
+ AbstractUpdateManager.setNoAnimation();
+ AbstractUpdateManager.chg();
+ return;
+ }
+
+ if(mode == PARAM_EDIT_MODE) {
+ String s = currentParam.getStringValue();
+
+ if(k.length() == 1) {
+ currentParam.setStringValue(s + k);
+ } else if(k.equals("Backspace") && s.length() > 0) {
+ currentParam.setStringValue(s.substring(0, s.length() - 1));
+ } else if(k.equals("Tab") || k.equals("Tabulator")) {
+ mode = NORMAL_MODE;
+
+ if(currentCall instanceof CommandCall &&
+ currentCall.isComplete()) {
+ if(dbg) pa("Execute: "+currentCall);
+ Map context = getContext(currentWin, k);
+ ((CommandCall)currentCall).execute(context);
+ currentCall = null;
+ currentWin = null;
+ }
+ }
+
+ AbstractUpdateManager.setNoAnimation();
+ AbstractUpdateManager.chg();
+ return;
+ } else if((k.equals("Tab") || k.equals("Tabulator")) &&
+ mode == NORMAL_MODE && currentCall != null &&
+ !currentCall.isComplete()) {
+ mode = PARAM_EDIT_MODE;
+ currentParam = new gzz.potion.potions.ConstantExpression("");
+ currentCall = currentCall.setNextParam(currentParam);
+ AbstractUpdateManager.setNoAnimation();
+ AbstractUpdateManager.chg();
+ return;
+ }
+
Map bindings = (Map)bindingsByMode.get(mode);
Object binding = bindings.get(k);
if(binding == null && k.length() == 1)
@@ -62,64 +109,97 @@
if(dbg) pa("Binding: "+binding);
if(binding == null) {
// no binding for this key: clear pending
- currentCommand = null;
+ // XXX not until "Shift" etc. don't clear as well...
+ //currentCall = null;
+ //currentWin = null;
AbstractUpdateManager.chg();
- } else if(binding instanceof FunctionExpression){
- FunctionExpression f = (FunctionExpression)binding;
- if(currentCommand==null){
- currentFunctionExpression = f;
- } else {
- Map context = getContext(fallback.windows[currentWin], k);
- currentCommand = (CommandCall)currentCommand.setNextParam(f);
- if(currentCommand.isComplete()) {
- if(dbg) pa("Execute: "+currentCommand);
- currentCommand.execute(context);
- currentCommand = null;
- }
+ } else if(binding instanceof FunctionCall){
+ FunctionCall f = (FunctionCall)binding;
+ if(currentCall == null || currentCall.isComplete()){
+ currentCall = f;
+ } else if(!currentCall.isComplete()) {
+ currentCall = currentCall.setNextParam(f);
}
} else if(binding instanceof Action) {
Action action = (Action)binding;
- currentCommand = action.command;
- currentWin = action.window;
- if(dbg) pa("Replaced currentCommand.");
- if(currentFunctionExpression!=null)
- currentCommand =
(CommandCall)currentCommand.setNextParam(currentFunctionExpression);
- currentFunctionExpression=null;
- if(currentCommand.isComplete()) {
- if(dbg) pa("Execute: "+currentCommand);
- Map context = getContext(fallback.windows[currentWin], k);
- currentCommand.execute(context);
- currentCommand = null;
- }
+
+ if(currentCall instanceof FunctionCall &&
+ !action.command.isComplete())
+ currentCall = changePrefix(action.command,
(FunctionCall)currentCall);
+ else
+ currentCall = action.command;
+
+ currentWin = fallback.windows[action.window];
+ if(dbg) pa("Replaced currentCall.");
} else if(binding instanceof Arrow) {
Arrow a = (Arrow)binding;
Fallback.Win w = fallback.windows[a.win];
AbstractUpdateManager.prioritize(w.getScreen());
- if(currentCommand == null) {
+ if(currentCall == null) {
if(dbg) pa("Move.");
Cell n = w.cursor.s(w.dims[a.axis], a.dir);
if(n != null) w.cursor = n;
+ // No call to AUM.setNoAnimation(): *Do* animate!
+ AbstractUpdateManager.chg();
+ return;
+ } else if(currentCall.isComplete()) {
+ currentCall = null;
+ currentWin = null;
} else {
Map context = getContext(w, k);
- Type t = currentCommand.getNextParam();
+ Type t = currentCall.getNextParam();
FunctionExpression e = t.readDir(a.win, a.axis, a.dir, context);
if(dbg) pa("Read direction: "+e);
if(e == null) {
+ currentCall = null; currentWin = null;
AbstractUpdateManager.chg();
+ AbstractUpdateManager.setNoAnimation();
return;
}
- currentCommand = (CommandCall)currentCommand.setNextParam(e);
- if(dbg) pa("Updated currentCommand: "+currentCommand);
- if(currentCommand.isComplete()) {
- if(dbg) pa("Execute: "+currentCommand);
- currentCommand.execute(context);
- currentCommand = null;
- }
+ currentCall = (CommandCall)currentCall.setNextParam(e);
+ currentWin = w;
+ if(dbg) pa("Updated currentCall: "+currentCall);
}
+ } else {
+ // XXX How to handle this right?
+ // Currently not user-friendly...
+ throw new Error("Unrecognized binding type");
+ }
+
+ if(currentCall instanceof CommandCall && currentCall.isComplete()) {
+ if(dbg) pa("Execute: "+currentCall);
+ Map context = getContext(currentWin, k);
+ ((CommandCall)currentCall).execute(context);
+ currentCall = null;
+ currentWin = null;
+ } else {
+ AbstractUpdateManager.setNoAnimation();
}
AbstractUpdateManager.chg();
+ }
+
+ /** Change any PrefixOrXXX in a call to a given value.
+ */
+ protected static Call changePrefix(Call call, FunctionCall value) {
+ Head h = call.head;
+ if(h instanceof gzz.potion.potions.PrefixFunction)
+ return value;
+
+ FunctionExpression[] n = new FunctionExpression[call.params.length];
+ for(int i=0; i<n.length; i++) {
+ n[i] = call.params[i];
+ if(n[i] instanceof FunctionCall)
+ n[i] = (FunctionCall)changePrefix((FunctionCall)n[i], value);
+ }
+
+ if(call instanceof CommandCall)
+ return new CommandCall((Command)h, n);
+ else if(call instanceof FunctionCall)
+ return new FunctionCall((Function)h, n);
+ else
+ throw new IllegalArgumentException("Unknown Call type: "+call);
}
public Map getContext(Fallback.Win win, String key) {
Index: gzz/lava/gzz/modules/email/AllEmailsThat.java
diff -u gzz/lava/gzz/modules/email/AllEmailsThat.java:1.1
gzz/lava/gzz/modules/email/AllEmailsThat.java:1.2
--- gzz/lava/gzz/modules/email/AllEmailsThat.java:1.1 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/AllEmailsThat.java Tue Jan 7 16:49:08 2003
@@ -10,7 +10,7 @@
public AllEmailsThat() {
super(new Object[] {
- "Return all E-Mails that ", Types.FILTER});
+ "all e-mails ", Types.FILTER});
}
public List evaluate(List[] params, Map context) {
Index: gzz/lava/gzz/modules/email/FromFilter.java
diff -u gzz/lava/gzz/modules/email/FromFilter.java:1.2
gzz/lava/gzz/modules/email/FromFilter.java:1.3
--- gzz/lava/gzz/modules/email/FromFilter.java:1.2 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/FromFilter.java Tue Jan 7 16:49:08 2003
@@ -23,10 +23,7 @@
if(!c.t().substring(0,6).equals("From: ")){
throw new Error();
}
- if(c.t().indexOf(s.substring(6))==-1)
- return false;
- else
- return true;
+ return c.t().substring(6).indexOf(s) > 0;
}
}
Index: gzz/lava/gzz/modules/email/NewerFilterFn.java
diff -u gzz/lava/gzz/modules/email/NewerFilterFn.java:1.1
gzz/lava/gzz/modules/email/NewerFilterFn.java:1.2
--- gzz/lava/gzz/modules/email/NewerFilterFn.java:1.1 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/NewerFilterFn.java Tue Jan 7 16:49:08 2003
@@ -12,7 +12,7 @@
public NewerFilterFn() {
super(new Object[] {
- "which are newer than ", Types.DATE
+ "which were sent after ", Types.DATE
});
}
Index: gzz/lava/gzz/modules/email/OlderFilterFn.java
diff -u gzz/lava/gzz/modules/email/OlderFilterFn.java:1.1
gzz/lava/gzz/modules/email/OlderFilterFn.java:1.2
--- gzz/lava/gzz/modules/email/OlderFilterFn.java:1.1 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/OlderFilterFn.java Tue Jan 7 16:49:08 2003
@@ -12,7 +12,7 @@
public OlderFilterFn() {
super(new Object[] {
- "which are older than ", Types.DATE
+ "which were sent before ", Types.DATE
});
}
Index: gzz/lava/gzz/modules/email/SubjectFilter.java
diff -u gzz/lava/gzz/modules/email/SubjectFilter.java:1.1
gzz/lava/gzz/modules/email/SubjectFilter.java:1.2
--- gzz/lava/gzz/modules/email/SubjectFilter.java:1.1 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/SubjectFilter.java Tue Jan 7 16:49:08 2003
@@ -23,10 +23,7 @@
if(!c.t().substring(0,9).equals("Subject: ")){
throw new Error();
}
- if(c.t().indexOf(s.substring(9))==-1)
- return false;
- else
- return true;
+ return c.t().substring(9).indexOf(s.substring(9)) > 0;
}
}
Index: gzz/lava/gzz/modules/email/SubjectFilterFn.java
diff -u gzz/lava/gzz/modules/email/SubjectFilterFn.java:1.1
gzz/lava/gzz/modules/email/SubjectFilterFn.java:1.2
--- gzz/lava/gzz/modules/email/SubjectFilterFn.java:1.1 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/SubjectFilterFn.java Tue Jan 7 16:49:08 2003
@@ -12,7 +12,7 @@
public SubjectFilterFn() {
super(new Object[] {
- "Subject ", Types.TEXT
+ "with ", Types.TEXT, " in the subject"
});
}
Index: gzz/lava/gzz/modules/email/ToFilter.java
diff -u gzz/lava/gzz/modules/email/ToFilter.java:1.2
gzz/lava/gzz/modules/email/ToFilter.java:1.3
--- gzz/lava/gzz/modules/email/ToFilter.java:1.2 Mon Jan 6 06:42:54 2003
+++ gzz/lava/gzz/modules/email/ToFilter.java Tue Jan 7 16:49:08 2003
@@ -23,10 +23,8 @@
if(!c.t().substring(0,4).equals("To: ")){
throw new Error();
}
- if(c.t().indexOf(s.substring(4))==-1)
- return false;
- else
- return true;
+
+ return c.t().substring(4).indexOf(s) >= 0;
}
}
Index: gzz/lava/gzz/potion/Call.java
diff -u gzz/lava/gzz/potion/Call.java:1.7 gzz/lava/gzz/potion/Call.java:1.8
--- gzz/lava/gzz/potion/Call.java:1.7 Fri Jan 3 13:05:06 2003
+++ gzz/lava/gzz/potion/Call.java Tue Jan 7 16:49:08 2003
@@ -26,8 +26,8 @@
public abstract class Call implements Expression {
- Head head;
- FunctionExpression[] params;
+ public final Head head;
+ public final FunctionExpression[] params;
public Call(Head head, FunctionExpression[] params) {
this.head = head;
Index: gzz/lava/gzz/potion/potions/AndFilterFn.java
diff -u gzz/lava/gzz/potion/potions/AndFilterFn.java:1.1
gzz/lava/gzz/potion/potions/AndFilterFn.java:1.2
--- gzz/lava/gzz/potion/potions/AndFilterFn.java:1.1 Mon Jan 6 08:04:15 2003
+++ gzz/lava/gzz/potion/potions/AndFilterFn.java Tue Jan 7 16:49:08 2003
@@ -11,7 +11,7 @@
public AndFilterFn() {
super(new Object[] {
- Types.FILTER, "AND ", Types.FILTER
+ Types.FILTER, " AND ", Types.FILTER
});
}
Index: gzz/lava/gzz/potion/potions/ConstantExpression.java
diff -u gzz/lava/gzz/potion/potions/ConstantExpression.java:1.1
gzz/lava/gzz/potion/potions/ConstantExpression.java:1.2
--- gzz/lava/gzz/potion/potions/ConstantExpression.java:1.1 Wed Jan 1
19:00:49 2003
+++ gzz/lava/gzz/potion/potions/ConstantExpression.java Tue Jan 7 16:49:08 2003
@@ -20,6 +20,19 @@
this.showAs = showAs;
}
+ public ConstantExpression(String value) {
+ setStringValue(value);
+ }
+
+ public void setStringValue(String value) {
+ this.value = Collections.nCopies(1, value);
+ this.showAs = '"' + value + '"';
+ }
+
+ public String getStringValue() {
+ return (String)value.get(0);
+ }
+
public String getString(Map context) {
return showAs;
}
Index: gzz/lava/gzz/potion/potions/InsertChar.java
diff -u gzz/lava/gzz/potion/potions/InsertChar.java:1.1
gzz/lava/gzz/potion/potions/InsertChar.java:1.2
--- gzz/lava/gzz/potion/potions/InsertChar.java:1.1 Mon Jan 6 06:57:30 2003
+++ gzz/lava/gzz/potion/potions/InsertChar.java Tue Jan 7 16:49:08 2003
@@ -22,5 +22,7 @@
win.insertText(s);
}
+
+ AbstractUpdateManager.setNoAnimation();
}
-}
\ No newline at end of file
+}
Index: gzz/lava/gzz/potion/potions/MarkHalfRank.java
diff -u gzz/lava/gzz/potion/potions/MarkHalfRank.java:1.1
gzz/lava/gzz/potion/potions/MarkHalfRank.java:1.2
--- gzz/lava/gzz/potion/potions/MarkHalfRank.java:1.1 Mon Jan 6 10:19:28 2003
+++ gzz/lava/gzz/potion/potions/MarkHalfRank.java Tue Jan 7 16:49:08 2003
@@ -34,5 +34,7 @@
}
}
}
+
+ AbstractUpdateManager.setNoAnimation();
}
}
Index: gzz/lava/gzz/potion/potions/OrFilterFn.java
diff -u gzz/lava/gzz/potion/potions/OrFilterFn.java:1.1
gzz/lava/gzz/potion/potions/OrFilterFn.java:1.2
--- gzz/lava/gzz/potion/potions/OrFilterFn.java:1.1 Mon Jan 6 08:04:15 2003
+++ gzz/lava/gzz/potion/potions/OrFilterFn.java Tue Jan 7 16:49:08 2003
@@ -11,7 +11,7 @@
public OrFilterFn() {
super(new Object[] {
- Types.FILTER, "OR ", Types.FILTER
+ Types.FILTER, " OR ", Types.FILTER
});
}
Index: gzz/lava/gzz/potion/potions/PrefixOrOther.java
diff -u gzz/lava/gzz/potion/potions/PrefixOrOther.java:1.3
gzz/lava/gzz/potion/potions/PrefixOrOther.java:1.4
--- gzz/lava/gzz/potion/potions/PrefixOrOther.java:1.3 Mon Jan 6 06:57:30 2003
+++ gzz/lava/gzz/potion/potions/PrefixOrOther.java Tue Jan 7 16:49:08 2003
@@ -8,7 +8,7 @@
import gzz.*;
import gzz.potion.*;
-public class PrefixOrOther implements Function {
+public class PrefixOrOther implements PrefixFunction {
protected Cell getCell(Map context) {
Fallback.Win win = (Fallback.Win)context.get(ViewContext.class);
Index: gzz/lava/gzz/potion/potions/ToggleMark.java
diff -u gzz/lava/gzz/potion/potions/ToggleMark.java:1.1
gzz/lava/gzz/potion/potions/ToggleMark.java:1.2
--- gzz/lava/gzz/potion/potions/ToggleMark.java:1.1 Sun Jan 5 05:41:06 2003
+++ gzz/lava/gzz/potion/potions/ToggleMark.java Tue Jan 7 16:49:08 2003
@@ -27,5 +27,7 @@
binder.markedCells.add(c);
}
+
+ AbstractUpdateManager.setNoAnimation();
}
}
Index: gzz/lava/gzz/potion/potions/Types.java
diff -u gzz/lava/gzz/potion/potions/Types.java:1.8
gzz/lava/gzz/potion/potions/Types.java:1.9
--- gzz/lava/gzz/potion/potions/Types.java:1.8 Mon Jan 6 19:57:00 2003
+++ gzz/lava/gzz/potion/potions/Types.java Tue Jan 7 16:49:08 2003
@@ -33,7 +33,7 @@
public static Type CELL = new SimpleType("which cell?");
public static Type AXIS = new SimpleType("which axis?");
public static Type POS_OR_NEG = new SimpleType("posward or negward?");
- public static Type FILTER = new SimpleType("which filter?");
+ public static Type FILTER = new SimpleType("which are what?");
public static Type PERSON = new SimpleType("whom?");
public static Type TEXT = new SimpleType("which text?");
public static Type DATE = new SimpleType("which date?");
Index: gzz/lava/gzz/view/PendingPotionDecorator.java
diff -u gzz/lava/gzz/view/PendingPotionDecorator.java:1.3
gzz/lava/gzz/view/PendingPotionDecorator.java:1.4
--- gzz/lava/gzz/view/PendingPotionDecorator.java:1.3 Mon Jan 6 06:57:30 2003
+++ gzz/lava/gzz/view/PendingPotionDecorator.java Tue Jan 7 16:49:08 2003
@@ -36,7 +36,7 @@
* potion op entered.
*/
public class PendingPotionDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: PendingPotionDecorator.java,v 1.3 2003/01/06 11:57:30
benja Exp $";
+String rcsid = "$Id: PendingPotionDecorator.java,v 1.4 2003/01/07 21:49:08
benja Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.err.println(s); }
@@ -51,16 +51,16 @@
if(!(fallback.binder instanceof PotionFallbackBinder)) return;
PotionFallbackBinder binder = (PotionFallbackBinder)fallback.binder;
- if(dbg) pa("Next potion action: "+binder.currentCommand);
+ if(dbg) pa("Next potion action: "+binder.currentCall);
- if(binder.currentCommand == null)
+ if(binder.currentCall == null)
return;
Dimension size = sc.getSize();
HChain ch = new LinebreakableChain();
Map context = binder.getContext(win, null);
- String text = binder.currentCommand.getString(context);
+ String text = binder.currentCall.getString(context);
if(dbg) pa("Potion action text: "+text);
ch.addBox(text(text));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz gzz/zzutil/Containment.java lava/gzz/client...,
Benja Fallenstein <=