[e-cvs] cvs commit: e/src/jsrc/org/erights/e/elib/tables Equalizer.java
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Mon, 13 Aug 2001 18:07:52 -0400
markm 01/08/13 18:07:52
Modified: src Makefile
src/esrc/scripts eBrowser.e
src/jsrc/org/erights/e/elib/tables Equalizer.java
Log:
fixed simplify-doesnt-resolve bug
Revision Changes Path
1.105 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- Makefile 2001/08/13 21:03:21 1.104
+++ Makefile 2001/08/13 22:07:52 1.105
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=tl-E
-DOTVER=0.8.9z
-TAGVER=0_8_9z
+DOTVER=0.8.9za
+TAGVER=0_8_9za
RELEASE=working
TOP=..
1.30 +10 -4 e/src/esrc/scripts/eBrowser.e
Index: eBrowser.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/eBrowser.e,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- eBrowser.e 2001/08/13 01:47:02 1.29
+++ eBrowser.e 2001/08/13 22:07:52 1.30
@@ -74,13 +74,19 @@
}
def popAboutBox() {
- def text := "<html>For Help with eBrowser, see<p>
+ def props := interp getProps()
+ def text := `<html>For Help with eBrowser, see<br>
http://www.skyhunter.com/marcs/eBrowserIndex.html<p><p>
Copyright 1999 Marc Stiegler. All rights reserved.<br>
- This software covered by the Mozilla license.
- For details see<p><p>
- http://www.skyhunter.com/marcs/eBrowser-license.html</html>"
+ This software covered by the Mozilla license. For details see<p><p>
+
+ http://www.skyhunter.com/marcs/eBrowser-license.html<p><p>
+
+ OS version: ${props["os.name"]} ${props["os.version"]} on ${props["os.arch"]}<br>
+ Java version: ${props["java.version"]} at ${props["java.home"] replaceAll("\\", "/")}<br>
+ E version: ${props["e.version"]} at ${props["e.home"]}<br>
+ for ${props["user.name"]} in ${props["user.region"]}</html>`
dialogPromiser new("About eBrowser", text, null, ["OK"])
}
1.22 +5 -4 e/src/jsrc/org/erights/e/elib/tables/Equalizer.java
Index: Equalizer.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/tables/Equalizer.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Equalizer.java 2001/08/13 01:47:03 1.21
+++ Equalizer.java 2001/08/13 22:07:52 1.22
@@ -134,12 +134,13 @@
/**
*
*/
- static public Object simplify(Object obj) {
- Class simpClass = OptSimplification(obj.getClass());
+ static public Object simplify(Object ref) {
+ ref = Ref.resolution(ref);
+ Class simpClass = OptSimplification(ref.getClass());
if (null == simpClass) {
- return obj;
+ return ref;
} else {
- return E.as(obj, simpClass);
+ return E.as(ref, simpClass);
}
}