[e-cvs] cvs commit: e/src/safej/javax/swing/text JTextComponent.safej
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Wed, 9 Jan 2002 12:22:00 -0500
markm 02/01/09 12:22:00
Modified: src Makefile
src/esrc/scripts ButtonPointer.e
src/jsrc Makefile
src/jsrc/org/erights/e/elib/prim StaticMaker.java
src/safej/javax/swing/text JTextComponent.safej
Added: src/jsrc/org/erights/e/meta/javax/swing/text
JTextComponentMakerSugar.java
Log:
added addKeymap/0 sugar to compensate for taming loss
Revision Changes Path
1.135 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- Makefile 2001/12/24 23:09:37 1.134
+++ Makefile 2002/01/09 17:22:00 1.135
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=E
-DOTVER=0.8.11alpha1
-TAGVER=0_8_11alpha1
+DOTVER=0.8.11alpha2
+TAGVER=0_8_11alpha2
RELEASE=working
TOP=..
1.19 +5 -1 e/src/esrc/scripts/ButtonPointer.e
Index: ButtonPointer.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/ButtonPointer.e,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ButtonPointer.e 2001/12/13 20:24:08 1.18
+++ ButtonPointer.e 2002/01/09 17:22:00 1.19
@@ -7,6 +7,9 @@
println(complaint)
}
+def trace(msg) {
+ stderr print(msg)
+}
def traceln(msg) {
stderr println(msg)
}
@@ -152,7 +155,8 @@
} else {
result
}
- traceln(`$result = relativeURL($osrc, $otarget)`)
+ # traceln(`$result = relativeURL($osrc, $otarget)`)
+ trace(".")
result
}
1.69 +1 -1 e/src/jsrc/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/jsrc/Makefile,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Makefile 2001/12/23 05:54:54 1.68
+++ Makefile 2002/01/09 17:22:00 1.69
@@ -51,7 +51,7 @@
find org/quasiliteral/syntax -name '*.java' >> files.tmp
find org/quasiliteral/term -name '*.java' >> files.tmp
find $(ER)/meta/java -name '*.java' >> files.tmp
- # find $(ER)/meta/javax -name '*.java' >> files.tmp
+ find $(ER)/meta/javax -name '*.java' >> files.tmp
find $(ER)/meta/$(ER)/elib -name '*.java' >> files.tmp
$(JCOMPILE) @files.tmp
1.30 +3 -1 e/src/jsrc/org/erights/e/elib/prim/StaticMaker.java
Index: StaticMaker.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/StaticMaker.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- StaticMaker.java 2001/12/24 23:09:38 1.29
+++ StaticMaker.java 2002/01/09 17:22:00 1.30
@@ -68,7 +68,9 @@
*/
static private final String[][] Sugarings = {
{ "java.math.BigInteger",
- "org.erights.e.meta.java.math.BigIntegerMakerSugar" }
+ "org.erights.e.meta.java.math.BigIntegerMakerSugar" },
+ { "javax.swing.text.JTextComponent",
+ "org.erights.e.meta.javax.swing.text.JTextComponentMakerSugar" }
};
/**
1.1 e/src/jsrc/org/erights/e/meta/javax/swing/text/JTextComponentMakerSugar.java
Index: JTextComponentMakerSugar.java
===================================================================
package org.erights.e.meta.javax.swing.text;
//This file is hereby placed in the public domain
import javax.swing.text.JTextComponent;
import javax.swing.text.Keymap;
import javax.swing.JTextArea;
/**
* Methods for sweetening the JTextComponent maker (the tamed static methods
* of {@link JTextComponent}).
*
* @author <a href="mailto:markm@caplet.com">Mark Miller</a>
*/
public class JTextComponentMakerSugar {
/** Privately remember the default Keymap */
static private Keymap DEFAULT_MAP = new JTextArea().getKeymap();
/** prevent instantiation */
private JTextComponentMakerSugar() {}
/**
* Safe replacement for the suppressed static addKeymap/2.
*/
static public Keymap addKeymap() {
return JTextComponent.addKeymap(null, DEFAULT_MAP);
}
}
1.4 +2 -2 e/src/safej/javax/swing/text/JTextComponent.safej
Index: JTextComponent.safej
===================================================================
RCS file: /cvs/e/src/safej/javax/swing/text/JTextComponent.safej,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JTextComponent.safej 2001/12/24 23:09:49 1.3
+++ JTextComponent.safej 2002/01/09 17:22:00 1.4
@@ -26,7 +26,7 @@
method(suppress,
"getKeymap()",
comment("might return the kernel keymap")),
- method("addKeymap(String, Keymap)"),
+ method(suppress, "addKeymap(String, Keymap)"),
method("removeKeymap(String)"),
method(suppress, "getKeymap(String)"),
method("loadKeymap(Keymap, JTextComponent.KeyBinding[], Action[])"),
@@ -72,4 +72,4 @@
method("getScrollableTracksViewportHeight()"),
method(suppress, "getAccessibleContext()"),
method(suppress, "getInputMethodRequests()"),
- method(suppress, "addInputMethodListener(InputMethodListener)")))
\ No newline at end of file
+ method(suppress, "addInputMethodListener(InputMethodListener)")))