[e-cvs] cvs commit: e/src/safej/javax/swing/text AbstractDocument.safej AbstractDocument.safej AbstractDocument.safej AbstractDocument.safej AbstractDocument.safej AbstractDocument.safej AbstractWriter.safej AsyncBoxView.safej AsyncBoxView.safej AsyncBoxView.safej BoxView.safej ComponentView.safej CompositeView.safej DateFormatter.safej DefaultCaret.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultEditorKit.safej DefaultFormatter.safej DefaultFormatterFactory.safej DefaultHighlighter.safej DefaultHighlighter.safej DefaultStyledDocument.safej DefaultStyledDocument.safej DefaultStyledDocument.safej DefaultStyledDocument.safej DefaultTextUI.safej DocumentFilter.safej DocumentFilter.safej EditorKit.safej ElementIterator.safej FieldView.safej FlowView.safej FlowView.safej GapContent.safej GlyphView.safej GlyphView.safej IconView.safe!
j InternationalFormatter.safej JTextComponent.safej JTextComponent.safej JTextComponent.safej LabelView.safej LayeredHighlighter.safej LayeredHighlighter.safej LayoutQueue.safej MaskFormatter.safej NavigationFilter.safej NavigationFilter.safej NumberFormatter.safej ParagraphView.safej PasswordView.safej PlainDocument.safej PlainView.safej Position.safej Segment.safej SimpleAttributeSet.safej StringContent.safej StyleConstants.safej StyleConstants.safej StyleConstants.safej StyleConstants.safej StyleConstants.safej StyleContext.safej StyleContext.safej StyleContext.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej StyledEditorKit.safej TabSet.safej TabStop.safej TableView.safej TableView.safej TableView.safej TextAction.safej Utilities.safej View.safej WrappedPlainView.safej ZoneView.safej
markm@eros.cs.jhu.edu
markm@eros.cs.jhu.edu
Mon, 24 Dec 2001 18:09:52 -0500
markm 01/12/24 18:09:52
Modified: src Makefile
src/esrc/org/erights/e/install confirm.emaker
src/esrc/scripts tamingConverter.e
src/jsrc/org/erights/e/elang/evm ObjectExpr.java
src/jsrc/org/erights/e/elang/interp LoaderScope.java
src/jsrc/org/erights/e/elib/prim ConstructorNode.java
InstanceMethodNode.java ScriptMaker.java
StaticMaker.java StaticMethodNode.java
SugarMethodNode.java VTable.java VarGetterNode.java
src/jsrc/org/quasiliteral/term Term.java
src/safej/java/awt AWTEvent.safej AWTEventMulticaster.safej
AWTKeyStroke.safej AWTPermission.safej
AlphaComposite.safej BasicStroke.safej
BorderLayout.safej
BufferCapabilities$FlipContents.safej
BufferCapabilities.safej Button.safej Canvas.safej
CardLayout.safej Checkbox.safej CheckboxGroup.safej
CheckboxMenuItem.safej Choice.safej Color.safej
Component.safej ComponentOrientation.safej
Container.safej
ContainerOrderFocusTraversalPolicy.safej
Cursor.safej DefaultFocusTraversalPolicy.safej
DefaultKeyboardFocusManager.safej Dialog.safej
Dimension.safej DisplayMode.safej Event.safej
EventQueue.safej FileDialog.safej FlowLayout.safej
FocusTraversalPolicy.safej Font.safej
FontMetrics.safej Frame.safej GradientPaint.safej
Graphics.safej Graphics2D.safej
GraphicsConfigTemplate.safej
GraphicsConfiguration.safej GraphicsDevice.safej
GraphicsEnvironment.safej GridBagConstraints.safej
GridBagLayout.safej GridLayout.safej Image.safej
ImageCapabilities.safej Insets.safej
JobAttributes$DefaultSelectionType.safej
JobAttributes$DestinationType.safej
JobAttributes$DialogType.safej
JobAttributes$MultipleDocumentHandlingType.safej
JobAttributes$SidesType.safej JobAttributes.safej
KeyEventDispatcher.safej KeyboardFocusManager.safej
Label.safej List.safej MediaTracker.safej
Menu.safej MenuBar.safej MenuComponent.safej
MenuItem.safej MenuShortcut.safej
PageAttributes$ColorType.safej
PageAttributes$MediaType.safej
PageAttributes$OrientationRequestedType.safej
PageAttributes$OriginType.safej
PageAttributes$PrintQualityType.safej
PageAttributes.safej Panel.safej Point.safej
Polygon.safej PopupMenu.safej PrintJob.safej
Rectangle.safej RenderingHints$Key.safej
RenderingHints.safej Robot.safej ScrollPane.safej
ScrollPaneAdjustable.safej Scrollbar.safej
SystemColor.safej TextArea.safej
TextComponent.safej TextField.safej
TexturePaint.safej Toolkit.safej Window.safej
src/safej/java/awt/event AWTEventListenerProxy.safej
ActionEvent.safej AdjustmentEvent.safej
ComponentAdapter.safej ComponentEvent.safej
ContainerAdapter.safej ContainerEvent.safej
FocusAdapter.safej FocusEvent.safej
HierarchyBoundsAdapter.safej HierarchyEvent.safej
InputEvent.safej InputMethodEvent.safej
InvocationEvent.safej ItemEvent.safej
KeyAdapter.safej KeyEvent.safej MouseAdapter.safej
MouseEvent.safej MouseMotionAdapter.safej
MouseWheelEvent.safej PaintEvent.safej
TextEvent.safej WindowAdapter.safej
WindowEvent.safej
src/safej/javax/swing AbstractAction.safej
AbstractButton.safej AbstractCellEditor.safej
AbstractListModel.safej AbstractSpinnerModel.safej
ActionMap.safej BorderFactory.safej
Box$Filler.safej Box.safej BoxLayout.safej
ButtonGroup.safej CellRendererPane.safej
ComponentInputMap.safej DebugGraphics.safej
DefaultBoundedRangeModel.safej
DefaultButtonModel.safej DefaultCellEditor.safej
DefaultComboBoxModel.safej
DefaultDesktopManager.safej
DefaultFocusManager.safej
DefaultListCellRenderer$UIResource.safej
DefaultListCellRenderer.safej
DefaultListModel.safej
DefaultListSelectionModel.safej
DefaultSingleSelectionModel.safej
FocusManager.safej GrayFilter.safej ImageIcon.safej
InputMap.safej InputVerifier.safej
InternalFrameFocusTraversalPolicy.safej
JApplet.safej JButton.safej JCheckBox.safej
JCheckBoxMenuItem.safej JColorChooser.safej
JComboBox.safej
JComponent$AccessibleJComponent.safej
JComponent.safej JDesktopPane.safej JDialog.safej
JEditorPane$JEditorPaneAccessibleHypertextSupport$HTMLLink.safej
JEditorPane.safej JFileChooser.safej
JFormattedTextField$AbstractFormatter.safej
JFormattedTextField$AbstractFormatterFactory.safej
JFormattedTextField.safej JFrame.safej
JInternalFrame$JDesktopIcon.safej
JInternalFrame.safej JLabel.safej
JLayeredPane.safej JList.safej JMenu.safej
JMenuBar.safej JMenuItem.safej JOptionPane.safej
JPanel.safej JPasswordField.safej
JPopupMenu$Separator.safej JPopupMenu.safej
JProgressBar.safej JRadioButton.safej
JRadioButtonMenuItem.safej JRootPane.safej
JScrollBar.safej JScrollPane.safej JSeparator.safej
JSlider.safej JSpinner$DateEditor.safej
JSpinner$DefaultEditor.safej
JSpinner$ListEditor.safej
JSpinner$NumberEditor.safej JSpinner.safej
JSplitPane.safej JTabbedPane.safej JTable.safej
JTextArea.safej JTextField.safej JTextPane.safej
JToggleButton$ToggleButtonModel.safej
JToggleButton.safej JToolBar$Separator.safej
JToolBar.safej JToolTip.safej
JTree$DynamicUtilTreeNode.safej JTree.safej
JViewport$ViewListener.safej JViewport.safej
JWindow.safej KeyStroke.safej
LayoutFocusTraversalPolicy.safej LookAndFeel.safej
MenuSelectionManager.safej OverlayLayout.safej
Popup.safej PopupFactory.safej
ProgressMonitor.safej
ProgressMonitorInputStream.safej
RepaintManager.safej
ScrollPaneLayout$UIResource.safej
ScrollPaneLayout.safej SizeRequirements.safej
SizeSequence.safej
SortingFocusTraversalPolicy.safej
SpinnerDateModel.safej SpinnerListModel.safej
SpinnerNumberModel.safej Spring.safej
SpringLayout$Constraints.safej SpringLayout.safej
SwingUtilities.safej Timer.safej
ToolTipManager.safej TransferHandler.safej
UIDefaults$LazyInputMap.safej
UIDefaults$ProxyLazyValue.safej UIDefaults.safej
UIManager$LookAndFeelInfo.safej UIManager.safej
ViewportLayout.safej
src/safej/javax/swing/event AncestorEvent.safej
CaretEvent.safej ChangeEvent.safej
DocumentEvent$EventType.safej
EventListenerList.safej
HyperlinkEvent$EventType.safej HyperlinkEvent.safej
InternalFrameAdapter.safej InternalFrameEvent.safej
ListDataEvent.safej ListSelectionEvent.safej
MenuDragMouseEvent.safej MenuEvent.safej
MenuKeyEvent.safej MouseInputAdapter.safej
PopupMenuEvent.safej
SwingPropertyChangeSupport.safej
TableColumnModelEvent.safej TableModelEvent.safej
TreeExpansionEvent.safej TreeModelEvent.safej
TreeSelectionEvent.safej UndoableEditEvent.safej
src/safej/javax/swing/text
AbstractDocument$AbstractElement.safej
AbstractDocument$BranchElement.safej
AbstractDocument$DefaultDocumentEvent.safej
AbstractDocument$ElementEdit.safej
AbstractDocument$LeafElement.safej
AbstractDocument.safej AbstractWriter.safej
AsyncBoxView$ChildLocator.safej
AsyncBoxView$ChildState.safej AsyncBoxView.safej
BoxView.safej ComponentView.safej
CompositeView.safej DateFormatter.safej
DefaultCaret.safej
DefaultEditorKit$BeepAction.safej
DefaultEditorKit$CopyAction.safej
DefaultEditorKit$CutAction.safej
DefaultEditorKit$DefaultKeyTypedAction.safej
DefaultEditorKit$InsertBreakAction.safej
DefaultEditorKit$InsertContentAction.safej
DefaultEditorKit$InsertTabAction.safej
DefaultEditorKit$PasteAction.safej
DefaultEditorKit.safej DefaultFormatter.safej
DefaultFormatterFactory.safej
DefaultHighlighter$DefaultHighlightPainter.safej
DefaultHighlighter.safej
DefaultStyledDocument$AttributeUndoableEdit.safej
DefaultStyledDocument$ElementBuffer.safej
DefaultStyledDocument$ElementSpec.safej
DefaultStyledDocument.safej DefaultTextUI.safej
DocumentFilter$FilterBypass.safej
DocumentFilter.safej EditorKit.safej
ElementIterator.safej FieldView.safej
FlowView$FlowStrategy.safej FlowView.safej
GapContent.safej GlyphView$GlyphPainter.safej
GlyphView.safej IconView.safej
InternationalFormatter.safej
JTextComponent$AccessibleJTextComponent.safej
JTextComponent$KeyBinding.safej
JTextComponent.safej LabelView.safej
LayeredHighlighter$LayerPainter.safej
LayeredHighlighter.safej LayoutQueue.safej
MaskFormatter.safej
NavigationFilter$FilterBypass.safej
NavigationFilter.safej NumberFormatter.safej
ParagraphView.safej PasswordView.safej
PlainDocument.safej PlainView.safej
Position$Bias.safej Segment.safej
SimpleAttributeSet.safej StringContent.safej
StyleConstants$CharacterConstants.safej
StyleConstants$ColorConstants.safej
StyleConstants$FontConstants.safej
StyleConstants$ParagraphConstants.safej
StyleConstants.safej StyleContext$NamedStyle.safej
StyleContext$SmallAttributeSet.safej
StyleContext.safej
StyledEditorKit$AlignmentAction.safej
StyledEditorKit$BoldAction.safej
StyledEditorKit$FontFamilyAction.safej
StyledEditorKit$FontSizeAction.safej
StyledEditorKit$ForegroundAction.safej
StyledEditorKit$ItalicAction.safej
StyledEditorKit$StyledTextAction.safej
StyledEditorKit$UnderlineAction.safej
StyledEditorKit.safej TabSet.safej TabStop.safej
TableView$TableCell.safej TableView$TableRow.safej
TableView.safej TextAction.safej Utilities.safej
View.safej WrappedPlainView.safej ZoneView.safej
Removed: src/safej/java/lang Boolean.safej
Log:
The 0.8.11alpha1 internal release. First working taming system.
Revision Changes Path
1.134 +2 -2 e/src/Makefile
Index: Makefile
===================================================================
RCS file: /cvs/e/src/Makefile,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- Makefile 2001/12/23 05:54:54 1.133
+++ Makefile 2001/12/24 23:09:37 1.134
@@ -7,8 +7,8 @@
# Prefix tagging this release's attributes
PREFIX=E
-DOTVER=0.8.10
-TAGVER=0_8_10
+DOTVER=0.8.11alpha1
+TAGVER=0_8_11alpha1
RELEASE=working
TOP=..
1.7 +5 -3 e/src/esrc/org/erights/e/install/confirm.emaker
Index: confirm.emaker
===================================================================
RCS file: /cvs/e/src/esrc/org/erights/e/install/confirm.emaker,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- confirm.emaker 2001/08/26 01:21:30 1.6
+++ confirm.emaker 2001/12/24 23:09:37 1.7
@@ -18,7 +18,7 @@
stdout println(welcome)
} else {
- def root := <swing:JFrame> new(welcome)
+ def root := <swing:JFrame> new(welcome, null)
root addWindowListener(def closeListener {
to windowClosing(_) {
interp continueAtTop()
@@ -50,8 +50,10 @@
root pack()
root setBounds(120, 100, 300, 100)
root show()
- okButton requestFocus()
-
+ if (okButton respondsTo("requestFocus", 0)) {
+ # XXX Revisit one a safe form of requestFocus is introduced.
+ okButton requestFocus()
+ }
interp blockAtTop()
}
}
1.3 +11 -6 e/src/esrc/scripts/tamingConverter.e
Index: tamingConverter.e
===================================================================
RCS file: /cvs/e/src/esrc/scripts/tamingConverter.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tamingConverter.e 2001/12/24 05:04:28 1.2
+++ tamingConverter.e 2001/12/24 23:09:37 1.3
@@ -105,27 +105,32 @@
instMeths push(newMeth)
}
}
- def deems := [] diverge()
+ def honored := [] diverge()
switch (oldByproxy) {
- match [term`"true"`] { deems push(term`PassByProxy`) }
+ match [term`"true"`] { honored push(term`PassByProxy`) }
match [term`"false"`] {}
match [] {}
}
switch (oldSelfless) {
- match [term`"true"`] { deems push(term`Selfless`) }
+ match [term`"true"`] { honored push(term`Selfless`) }
match [term`"false"`] {}
match [] {}
}
switch (oldByconstruction) {
- match [term`"true"`] { deems push(term`PassByConstruction`) }
+ match [term`"true"`] { honored push(term`PassByConstruction`) }
match [term`"false"`] {}
match [] {}
}
switch (oldPersistent) {
- match [term`"true"`] { deems push(term`Persistent`) }
+ match [term`"true"`] { honored push(term`Persistent`) }
match [term`"false"`] {}
match [] {}
}
+ def honorary := if (honored size() >= 1) {
+ [term`honorary($honored*)`]
+ } else {
+ []
+ }
def newSafe := switch (oldSafe) {
match term`"true"` { [term`safe`] }
match term`"false"` { [] }
@@ -136,7 +141,7 @@
}
term`class($newSafe?,
$name,
- deem($deems*),
+ $honorary?,
statics($staticMeths*),
methods($instMeths*),
$newClassComment?)`
1.41 +2 -1 e/src/jsrc/org/erights/e/elang/evm/ObjectExpr.java
Index: ObjectExpr.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/evm/ObjectExpr.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ObjectExpr.java 2001/12/22 05:46:08 1.40
+++ ObjectExpr.java 2001/12/24 23:09:37 1.41
@@ -29,6 +29,7 @@
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.tables.FlexList;
+import org.erights.e.elib.tables.ConstSet;
import java.io.IOException;
@@ -230,7 +231,7 @@
MirandaMethods.class);
for (int i = 0, max = optMeths.length; i < max; i++) {
myOptVtableCache.addMethod(optMeths[i],
- ConstMap.EmptyMap);
+ ConstSet.EmptySet);
}
}
}
1.44 +2 -1 e/src/jsrc/org/erights/e/elang/interp/LoaderScope.java
Index: LoaderScope.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elang/interp/LoaderScope.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- LoaderScope.java 2001/12/02 06:01:43 1.43
+++ LoaderScope.java 2001/12/24 23:09:38 1.44
@@ -25,6 +25,7 @@
import org.erights.e.elang.syntax.EParser;
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.prim.StaticMaker;
+import org.erights.e.elib.prim.SafeJ;
import org.erights.e.elib.ref.Ref;
import org.erights.e.elib.ref.Resolver;
import org.erights.e.elib.slot.FinalSlot;
@@ -109,7 +110,7 @@
} catch (ClassNotFoundException cnfe) {
return null;
}
- if (!StaticMaker.approve(clazz)) {
+ if (!SafeJ.approve(clazz)) {
//if fqName is not in the approved list
throw new SecurityException(fqName + " not approved as safe");
}
1.21 +2 -1 e/src/jsrc/org/erights/e/elib/prim/ConstructorNode.java
Index: ConstructorNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/ConstructorNode.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ConstructorNode.java 2001/12/19 10:18:07 1.20
+++ ConstructorNode.java 2001/12/24 23:09:38 1.21
@@ -21,6 +21,7 @@
import org.erights.e.elib.base.MethodNode;
import org.erights.e.elib.tables.ConstMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import java.lang.reflect.Constructor;
@@ -50,7 +51,7 @@
*/
static public void defineMembers(VTable vTable,
Class clazz,
- ConstMap optSafeJ)
+ ConstSet optSafeJ)
throws AlreadyDefinedException {
if (!Modifier.isPublic(clazz.getModifiers())) {
return;
1.20 +3 -16 e/src/jsrc/org/erights/e/elib/prim/InstanceMethodNode.java
Index: InstanceMethodNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/InstanceMethodNode.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- InstanceMethodNode.java 2001/12/19 10:18:07 1.19
+++ InstanceMethodNode.java 2001/12/24 23:09:38 1.20
@@ -21,6 +21,7 @@
import org.erights.e.elib.base.MethodNode;
import org.erights.e.elib.tables.ConstMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import java.lang.reflect.Field;
@@ -52,7 +53,7 @@
*/
static public void defineMembers(VTable vTable,
Class clazz,
- ConstMap optSafeJ)
+ ConstSet optSafeJ)
throws AlreadyDefinedException {
if (!Modifier.isPublic(clazz.getModifiers())) {
return;
@@ -67,21 +68,7 @@
}
}
}
- Field[] fields = clazz.getDeclaredFields();
- if (null != fields) {
- for (int i = 0; i < fields.length; i++) {
- int mods = fields[i].getModifiers();
- if (Modifier.isPublic(mods) && !Modifier.isStatic(mods)) {
- MethodNode field = new VarGetterNode(fields[i]);
- vTable.addMethod(field, optSafeJ);
-
- if (!Modifier.isFinal(mods)) {
- field = new VarSetterNode(fields[i]);
- vTable.addMethod(field, optSafeJ);
- }
- }
- }
- }
+ VarGetterNode.defineMembers(vTable, clazz, false, optSafeJ);
}
/**
1.40 +5 -7 e/src/jsrc/org/erights/e/elib/prim/ScriptMaker.java
Index: ScriptMaker.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/ScriptMaker.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ScriptMaker.java 2001/12/02 06:01:46 1.39
+++ ScriptMaker.java 2001/12/24 23:09:38 1.40
@@ -25,6 +25,7 @@
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.tables.EMap;
import org.erights.e.elib.tables.FlexMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.ClassCache;
import java.util.HashMap;
@@ -259,14 +260,11 @@
for (int i = 0; i < faces.length; i++) {
inherit(vTable, faces[i]);
}
- Class sugar = OptSugar(clazz);
- ConstMap optSafeJ = null;
- if (null != sugar) {
- optSafeJ = SugarMethodNode.optSafeJ(sugar);
- }
+ Class optSugar = OptSugar(clazz);
+ ConstSet optSafeJ = SafeJ.optSafeJ(clazz, optSugar, false);
InstanceMethodNode.defineMembers(vTable, clazz, optSafeJ);
- if (null != sugar) {
- SugarMethodNode.defineMembers(vTable, sugar);
+ if (null != optSugar) {
+ SugarMethodNode.defineMembers(vTable, optSugar);
}
}
myScripts.put(clazz, vTable);
1.29 +23 -175 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StaticMaker.java 2001/12/24 05:04:28 1.28
+++ StaticMaker.java 2001/12/24 23:09:38 1.29
@@ -38,6 +38,7 @@
import org.erights.e.elib.tables.FlexSet;
import org.erights.e.elib.tables.IdentityCacheTable;
import org.erights.e.elib.tables.Twine;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import org.erights.e.elib.util.ClassCache;
import org.erights.e.meta.java.net.URLSugar;
@@ -65,173 +66,6 @@
/**
*
*/
- static private final String[] ApprovedClassList = {
- "java.awt.event.WindowEvent",
-
- //"java.lang.Boolean", only after we remove getBoolean(String)
- "java.lang.Byte",
- "java.lang.Character",
- "java.lang.Comparable",
- "java.lang.Double",
- "java.lang.Float",
- "java.lang.Integer",
- "java.lang.Long",
- "java.lang.Number",
- "java.lang.Object",
- "java.lang.Runnable",
- "java.lang.RuntimeException", //must enforce DeepPassByCopy
- "java.lang.Short",
- //"java.lang.StrictMath", only after we remove random()
- "java.lang.String",
- "java.lang.StringBuffer",
- "java.lang.Throwable", //XXX must enforce DeepPassByCopy
- "java.lang.Void",
-
- "java.math.BigInteger",
-
- "org.apache.oro.text.regex.Perl5Compiler",
- "org.apache.oro.text.regex.Perl5Matcher",
- "org.apache.oro.text.regex.PatternMatcherInput",
-
- "org.erights.e.elang.interp.Loop",
- "org.erights.e.elang.interp.ProtocolDesc",
- "org.erights.e.elang.syntax.EParser",
-
- "org.erights.e.elib.base.MessageDesc",
- "org.erights.e.elib.base.ParamDesc",
- "org.erights.e.elib.eio.TextWriter",
- "org.erights.e.elib.quasi.FirstCharSplitter",
- "org.erights.e.elib.quasi.Identifiers",
- "org.erights.e.elib.quasi.Substituter",
- "org.erights.e.elib.ref.Ref",
- "org.erights.e.elib.prim.E",
- "org.erights.e.elib.prim.Queue",
- "org.erights.e.elib.prim.Thrower",
- "org.erights.e.elib.sealing.Brand",
- "org.erights.e.elib.slot.NullOkMaker",
- "org.erights.e.elib.slot.SimpleSlotMaker",
- "org.erights.e.elib.tables.ConstList",
- "org.erights.e.elib.tables.ConstMap",
- "org.erights.e.elib.tables.EList",
- "org.erights.e.elib.tables.EMap",
- "org.erights.e.elib.tables.FlexList",
- "org.erights.e.elib.tables.FlexMap",
-
- //must enforce DeepPassByCopy
- "org.erights.e.elib.util.TwineException",
-
- "net.captp.api.SturdyRef",
- "org.capml.quasi.XMLQuasiParser",
- };
-
- static private final FlexSet ApprovedClasses;
-
- static {
- int len = ApprovedClassList.length;
- ApprovedClasses = FlexSet.fromType(String.class, len);
- for (int i = 0; i < len; i++) {
- ApprovedClasses.addElement(ApprovedClassList[i], true);
- }
- }
-
- static private final IdentityCacheTable SAFEJ_CACHE =
- new IdentityCacheTable(Term.class, 100);
-
- static private final String[] SafejTagNames = {
- "LiteralChar",
- "LiteralInteger",
- "LiteralFloat64",
- "LiteralString",
-
- "class",
- "name",
- "method",
- "static",
- "signature",
- "suppress",
- "comment",
- "byproxy",
- "selfless",
- "byconstruction",
- "persistent",
- "safe"
- };
-
- /**
- *
- */
- static public final AstroSchema SAFEJ_SCHEMA =
- new BaseSchema("safej", ConstList.fromArray(SafejTagNames));
-
- /**
- *
- */
- static public final AstroBuilder SAFEJ_BUILDER =
- new TermBuilder(SAFEJ_SCHEMA);
-
- /**
- *
- */
- static public final QuasiBuilder SAFEJ_QBUILDER =
- new QuasiBuilderAdaptor(SAFEJ_BUILDER);
-
- /**
- *
- */
- static public Term getOptSafej(String fqn) {
- Twine tfqn = Twine.fromString(fqn);
- Term optResult = (Term)SAFEJ_CACHE.get(tfqn, null);
- if (null != optResult) {
- return optResult;
- }
- String path = StringHelper.replaceAll(fqn, ".", "/") + ".safej";
- URL optTermURL = ClassLoader.getSystemResource(path);
- if (null == optTermURL) {
- return null;
- }
- String termSrc;
- try {
- termSrc = URLSugar.getText(optTermURL);
- } catch (IOException ioe) {
- throw ExceptionMgr.asSafe(ioe);
- }
-// Term result = (Term)TermParser.run(Twine.fromString(termSrc),
-// SAFEJ_QBUILDER);
- Term result = (Term)TermParser.run(Twine.fromString(termSrc));
- SAFEJ_CACHE.put(tfqn, result);
- return result;
- }
-
- /**
- * Is clazz approved as safe? <p>
- *
- * If so, this means an EMaker on clazz follows capability discipline and
- * provides no authority.
- */
- static public boolean approve(Class clazz) {
- String fqn = clazz.getName();
- if (ApprovedClasses.contains(fqn)) {
- return true;
- }
- if (clazz.isArray()) {
- //Array types are safe
- ApprovedClasses.addElement(fqn, true);
- return true;
- }
- Term optTerm = getOptSafej(fqn);
- if (null == optTerm) {
- return false;
- }
- Term arg0 = (Term)optTerm.getArgs().get(0);
- if (arg0.getTag().getTagName() == "safe") {
- return true;
- }
- return false;
- }
-
- /**
- *
- */
static private final String[][] Sugarings = {
{ "java.math.BigInteger",
"org.erights.e.meta.java.math.BigIntegerMakerSugar" }
@@ -300,22 +134,36 @@
private StaticMaker(Class clazz) {
myClass = clazz;
myVTable = new VTable(getClassSig());
+ Class optSugar = OptSugar(clazz);
+ ConstSet optSafeJ = SafeJ.optSafeJ(clazz, optSugar, true);
+ if (null != optSafeJ) {
+ //XXX Kludge: Because the current taming files have misclassified
+ //many static methods as instance methods, we union in the
+ //instance methods. Assuming this is an accurate explanation of
+ //the error in the taming files, and assuming it isn't compounded
+ //by other errors, this kludge is safe, since Java will not allow
+ //the same signature to be used for both an instance and a static
+ //method.
+ ConstSet optMore = SafeJ.optSafeJ(clazz, null, false);
+ if (null != optMore) {
+ optSafeJ = optSafeJ.or(optMore);
+ }
+ }
try {
SugarMethodNode.defineMembers(myVTable,
MirandaMethods.class);
StaticMethodNode.defineMembers(myVTable,
clazz,
- null);
+ optSafeJ);
ConstructorNode.defineMembers(myVTable,
clazz,
- null);
- Class sugar = OptSugar(clazz);
- if (null != sugar) {
+ optSafeJ);
+ if (null != optSugar) {
//note that the static methods for sugaring a maker are used
//as StaticMethodNodes, not as SugarMethodNodes.
StaticMethodNode.defineMembers(myVTable,
- sugar,
- null);
+ optSugar,
+ optSafeJ);
}
} catch (AlreadyDefinedException ade) {
throw ThrowableSugar.backtrace(ade, "can't wrap class");
@@ -330,7 +178,7 @@
* probably find a way to relax it for persistence.
*/
private Object readResolve() throws ObjectStreamException {
- if (approve(myClass)) {
+ if (SafeJ.approve(myClass)) {
StaticMaker result = make(myClass);
//we become valid ourselves as well, just in case there are some
//too early references to us.
@@ -409,7 +257,7 @@
*/
public String toString() {
String left;
- if (approve(myClass)) {
+ if (SafeJ.approve(myClass)) {
left = "<import:";
} else {
left = "<unsafe:";
1.24 +3 -16 e/src/jsrc/org/erights/e/elib/prim/StaticMethodNode.java
Index: StaticMethodNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/StaticMethodNode.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StaticMethodNode.java 2001/12/19 10:18:07 1.23
+++ StaticMethodNode.java 2001/12/24 23:09:38 1.24
@@ -21,6 +21,7 @@
import org.erights.e.elib.base.MethodNode;
import org.erights.e.elib.tables.ConstMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import java.lang.reflect.Field;
@@ -57,7 +58,7 @@
*/
static public void defineMembers(VTable vTable,
Class clazz,
- ConstMap optSafeJ)
+ ConstSet optSafeJ)
throws AlreadyDefinedException {
if (!Modifier.isPublic(clazz.getModifiers())) {
return;
@@ -72,21 +73,7 @@
}
}
}
- Field[] fields = clazz.getDeclaredFields();
- if (null != fields) {
- for (int i = 0; i < fields.length; i++) {
- int mods = fields[i].getModifiers();
- if (Modifier.isPublic(mods) && Modifier.isStatic(mods)) {
- MethodNode field = new VarGetterNode(fields[i]);
- vTable.addMethod(field, optSafeJ);
-
- if (!Modifier.isFinal(mods)) {
- field = new VarSetterNode(fields[i]);
- vTable.addMethod(field, optSafeJ);
- }
- }
- }
- }
+ VarGetterNode.defineMembers(vTable, clazz, true, optSafeJ);
vTable.addMethod(TheTypeVerb, optSafeJ);
vTable.addMethod(TheToStringVerb, optSafeJ);
}
1.22 +1 -40 e/src/jsrc/org/erights/e/elib/prim/SugarMethodNode.java
Index: SugarMethodNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/SugarMethodNode.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SugarMethodNode.java 2001/12/19 10:18:07 1.21
+++ SugarMethodNode.java 2001/12/24 23:09:38 1.22
@@ -24,6 +24,7 @@
import org.erights.e.elib.eio.TextWriter;
import org.erights.e.elib.tables.ConstList;
import org.erights.e.elib.tables.ConstMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import java.io.IOException;
@@ -64,46 +65,6 @@
MethodNode meth = new SugarMethodNode(meths[i]);
vTable.addMethod(meth, null);
}
- }
- }
-
- /**
- * If the sugar class has a static SAFEJ field consisting of an array
- * of strings, return a set (a ConstMap from set elements to null) of
- * these strings; otherwise return null. <p>
- *
- * These strings should be typedVerbs of methods to be included to
- * sugarring.
- */
- static /*package*/ ConstMap optSafeJ(Class clazz) {
- String[] optTypedVerbs =
- (String[])getStaticValue(clazz, "SAFEJ", null);
- if (null == optTypedVerbs) {
- return null;
- } else {
- return ConstList.fromArray(optTypedVerbs).asKeys();
- }
- }
-
- /**
- * Gets the value of clazz's static public field named 'fieldName'. <p>
- *
- * If there is no such field, return 'instead' instead.
- */
- static /*package*/ Object getStaticValue(Class clazz,
- String fieldName,
- Object instead) {
- Field staticField;
- try {
- staticField = clazz.getField(fieldName);
- } catch (NoSuchFieldException nsfe) {
- return instead;
- }
- String[] typedVerbs;
- try {
- return staticField.get(null);
- } catch (IllegalAccessException iae) {
- throw ExceptionMgr.asSafe(iae);
}
}
1.39 +9 -7 e/src/jsrc/org/erights/e/elib/prim/VTable.java
Index: VTable.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/VTable.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- VTable.java 2001/12/10 18:27:00 1.38
+++ VTable.java 2001/12/24 23:09:38 1.39
@@ -27,6 +27,7 @@
import org.erights.e.elib.tables.ConstMap;
import org.erights.e.elib.tables.FlexList;
import org.erights.e.elib.tables.FlexMap;
+import org.erights.e.elib.tables.ConstSet;
import org.erights.e.elib.util.AlreadyDefinedException;
import java.io.IOException;
@@ -76,11 +77,10 @@
/**
* 'methods' must be a map from mverbs (mangled verbs) to MethodNodes, as
- * would be returned by 'methods()'. 'optSafeJ' is a set (a mapping from
- * set elements to null) of the typedVerbs to include, or null to include
- * them all.
+ * would be returned by 'methods()'. 'optSafeJ' is a set of the
+ * typedVerbs to include, or null to include them all.
*/
- public void addMethods(ConstMap methods, ConstMap optSafeJ) {
+ public void addMethods(ConstMap methods, ConstSet optSafeJ) {
String[] mverbs = (String[])methods.getKeys(String.class);
for (int i = 0; i < mverbs.length; i++) {
String mverb = mverbs[i];
@@ -102,13 +102,15 @@
*
* @see #resolve
*/
- public void addMethod(String verb, MethodNode newMeth, ConstMap optSafeJ)
+ public void addMethod(String verb, MethodNode newMeth, ConstSet optSafeJ)
throws AlreadyDefinedException {
String optTypedVerb = newMeth.optTypedVerb();
+
if (null != optTypedVerb &&
null != optSafeJ &&
- !optSafeJ.maps(optTypedVerb)) {
+ ! optSafeJ.contains(optTypedVerb)) {
+
optSafeJ = optSafeJ;
return;
}
@@ -171,7 +173,7 @@
* Throw the method into the pile, if appropriate, and in an order
* independent way.
*/
- public void addMethod(MethodNode newMeth, ConstMap optSafeJ)
+ public void addMethod(MethodNode newMeth, ConstSet optSafeJ)
throws AlreadyDefinedException {
addMethod(newMeth.verb(), newMeth, optSafeJ);
String optTypedVerb = newMeth.optTypedVerb();
1.17 +44 -0 e/src/jsrc/org/erights/e/elib/prim/VarGetterNode.java
Index: VarGetterNode.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/erights/e/elib/prim/VarGetterNode.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VarGetterNode.java 2001/12/19 03:25:38 1.16
+++ VarGetterNode.java 2001/12/24 23:09:38 1.17
@@ -19,8 +19,13 @@
Contributor(s): ______________________________________.
*/
+import org.erights.e.elib.tables.ConstSet;
+import org.erights.e.elib.util.AlreadyDefinedException;
+import org.erights.e.elib.base.MethodNode;
+
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
+import java.lang.reflect.Method;
/**
* A java public instance variable becomes an E zero-arg method which
@@ -79,6 +84,45 @@
return StaticMaker.class;
} else {
return myMember.getDeclaringClass();
+ }
+ }
+
+ /**
+ *
+ */
+ static public void defineMembers(VTable vTable,
+ Class clazz,
+ boolean isStatic,
+ ConstSet optSafeJ)
+ throws AlreadyDefinedException {
+ if (!Modifier.isPublic(clazz.getModifiers())) {
+ return;
+ }
+ Field[] fields = clazz.getDeclaredFields();
+ if (null != fields) {
+ for (int i = 0; i < fields.length; i++) {
+ Field field = fields[i];
+ int mods = field.getModifiers();
+ if (! Modifier.isPublic(mods)) {
+ continue;
+ }
+ if (Modifier.isStatic(mods) != isStatic) {
+ continue;
+ }
+ MethodNode getter = new VarGetterNode(field);
+ if (Modifier.isFinal(mods)) {
+ if (field.getType().isPrimitive()) {
+ //final scalars can't be suppressed
+ vTable.addMethod(getter, null);
+ } else {
+ vTable.addMethod(getter, optSafeJ);
+ }
+ } else {
+ vTable.addMethod(getter, optSafeJ);
+ MethodNode setter = new VarSetterNode(fields[i]);
+ vTable.addMethod(setter, optSafeJ);
+ }
+ }
}
}
}
1.23 +20 -4 e/src/jsrc/org/quasiliteral/term/Term.java
Index: Term.java
===================================================================
RCS file: /cvs/e/src/jsrc/org/quasiliteral/term/Term.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Term.java 2001/12/24 05:04:30 1.22
+++ Term.java 2001/12/24 23:09:38 1.23
@@ -167,15 +167,26 @@
return myOptData;
}
+ /**
+ *
+ */
public String getOptString() {
- return ((Twine)getOptData()).bare();
+ if (null != myOptData && myOptData instanceof Twine) {
+ return ((Twine)myOptData).bare();
+ } else {
+ return null;
+ }
}
/**
*
*/
public Object getOptArgData() {
- return ((Term)myArgs.get(0)).getOptData();
+ if (myArgs.size() >= 1) {
+ return ((Term)myArgs.get(0)).getOptData();
+ } else {
+ return null;
+ }
}
/**
@@ -190,14 +201,19 @@
(null == optTag ?
(Object)new Integer(tagCode) :
(Object)optTag));
- return ((Term)myArgs.get(0)).getOptData();
+ return getOptArgData();
}
/**
*
*/
public String getOptArgString(short tagCode) {
- return ((Twine)getOptArgData(tagCode)).bare();
+ Object optArgData = getOptArgData(tagCode);
+ if (null != optArgData && optArgData instanceof Twine) {
+ return ((Twine)optArgData).bare();
+ } else {
+ return null;
+ }
}
/**
1.3 +0 -1 e/src/safej/java/awt/AWTEvent.safej
Index: AWTEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/AWTEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTEvent.safej 2001/12/24 05:04:30 1.2
+++ AWTEvent.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.AWTEvent",
- deem,
statics(method(suppress, "new(Event)"),
method(suppress, "new(Object, int)")),
methods(method(suppress, "setSource(Object)"),
1.3 +0 -1 e/src/safej/java/awt/AWTEventMulticaster.safej
Index: AWTEventMulticaster.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/AWTEventMulticaster.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTEventMulticaster.safej 2001/12/24 05:04:30 1.2
+++ AWTEventMulticaster.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.AWTEventMulticaster",
- deem,
statics,
methods(method("componentResized(ComponentEvent)"),
method("componentMoved(ComponentEvent)"),
1.3 +0 -1 e/src/safej/java/awt/AWTKeyStroke.safej
Index: AWTKeyStroke.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/AWTKeyStroke.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTKeyStroke.safej 2001/12/24 05:04:30 1.2
+++ AWTKeyStroke.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.AWTKeyStroke",
- deem,
statics,
methods(method("getAWTKeyStroke(char)"),
method("getAWTKeyStroke(Character, int)"),
1.3 +0 -1 e/src/safej/java/awt/AWTPermission.safej
Index: AWTPermission.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/AWTPermission.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTPermission.safej 2001/12/24 05:04:30 1.2
+++ AWTPermission.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.AWTPermission",
- deem,
statics(method(suppress, "new(String)"),
method(suppress, "new(String, String)")),
methods)
1.3 +0 -1 e/src/safej/java/awt/AlphaComposite.safej
Index: AlphaComposite.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/AlphaComposite.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AlphaComposite.safej 2001/12/24 05:04:30 1.2
+++ AlphaComposite.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.AlphaComposite",
- deem,
statics,
methods(method("getInstance(int)"),
method("getInstance(int, float)"),
1.3 +0 -1 e/src/safej/java/awt/BasicStroke.safej
Index: BasicStroke.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/BasicStroke.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicStroke.safej 2001/12/24 05:04:30 1.2
+++ BasicStroke.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.BasicStroke",
- deem,
statics(method("new(float, int, int, float, float[], float)"),
method("new(float, int, int, float)"),
method("new(float, int, int)"),
1.3 +0 -1 e/src/safej/java/awt/BorderLayout.safej
Index: BorderLayout.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/BorderLayout.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BorderLayout.safej 2001/12/24 05:04:30 1.2
+++ BorderLayout.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.BorderLayout",
- deem,
statics(method("new()"),
method("new(int, int)")),
methods(method("getHgap()"),
1.3 +1 -1 e/src/safej/java/awt/BufferCapabilities$FlipContents.safej
Index: BufferCapabilities$FlipContents.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/BufferCapabilities$FlipContents.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BufferCapabilities$FlipContents.safej 2001/12/24 05:04:30 1.2
+++ BufferCapabilities$FlipContents.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.BufferCapabilities.FlipContents", deem, statics, methods)
\ No newline at end of file
+class("java.awt.BufferCapabilities.FlipContents", statics, methods)
\ No newline at end of file
1.3 +0 -1 e/src/safej/java/awt/BufferCapabilities.safej
Index: BufferCapabilities.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/BufferCapabilities.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BufferCapabilities.safej 2001/12/24 05:04:30 1.2
+++ BufferCapabilities.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.BufferCapabilities",
- deem,
statics(method("new(ImageCapabilities, ImageCapabilities, BufferCapabilities.FlipContents)")),
methods(method("getFrontBufferCapabilities()"),
method("getBackBufferCapabilities()"),
1.3 +0 -1 e/src/safej/java/awt/Button.safej
Index: Button.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Button.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Button.safej 2001/12/24 05:04:30 1.2
+++ Button.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Button",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)")),
methods(method(suppress, "addNotify()"),
1.3 +0 -1 e/src/safej/java/awt/Canvas.safej
Index: Canvas.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Canvas.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Canvas.safej 2001/12/24 05:04:30 1.2
+++ Canvas.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Canvas",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(GraphicsConfiguration)")),
methods(method(suppress, "addNotify()"),
1.3 +0 -1 e/src/safej/java/awt/CardLayout.safej
Index: CardLayout.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/CardLayout.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CardLayout.safej 2001/12/24 05:04:30 1.2
+++ CardLayout.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.CardLayout",
- deem,
statics(method("new()"),
method("new(int, int)")),
methods(method("getHgap()"),
1.3 +0 -1 e/src/safej/java/awt/Checkbox.safej
Index: Checkbox.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Checkbox.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Checkbox.safej 2001/12/24 05:04:30 1.2
+++ Checkbox.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Checkbox",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(String, boolean)"),
1.3 +0 -1 e/src/safej/java/awt/CheckboxGroup.safej
Index: CheckboxGroup.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/CheckboxGroup.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckboxGroup.safej 2001/12/24 05:04:30 1.2
+++ CheckboxGroup.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.CheckboxGroup",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "getSelectedCheckbox()"),
method(suppress, "getCurrent()"),
1.3 +0 -1 e/src/safej/java/awt/CheckboxMenuItem.safej
Index: CheckboxMenuItem.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/CheckboxMenuItem.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CheckboxMenuItem.safej 2001/12/24 05:04:30 1.2
+++ CheckboxMenuItem.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.CheckboxMenuItem",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(String, boolean)")),
1.3 +0 -1 e/src/safej/java/awt/Choice.safej
Index: Choice.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Choice.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Choice.safej 2001/12/24 05:04:30 1.2
+++ Choice.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Choice",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "addNotify()"),
method(suppress, "getItemCount()"),
1.3 +10 -2 e/src/safej/java/awt/Color.safej
Index: Color.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Color.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Color.safej 2001/12/24 05:04:30 1.2
+++ Color.safej 2001/12/24 23:09:38 1.3
@@ -1,7 +1,15 @@
class(safe,
"java.awt.Color",
- deem,
- statics(method("new(int, int, int)"),
+ statics(method("white()",
+ comment("XXX Is a Color truly client-immutable? I (MarkM)\n\
+ checked all the instance variables of the JDK1.3\n\
+ implementation of Color (but not subclasses). The problematic\n\
+ one seems to be \"cs\", but this seems to be simply state that\'s\n\
+ initialized lazily. In any case, a casual skim of the API\n\
+ doesn\'t reveal any public access whose intention is to mutate\n\
+ a Color instance.\n\
+ ")),
+ method("new(int, int, int)"),
method("new(int, int, int, int)"),
method("new(int)"),
method("new(int, boolean)"),
1.3 +0 -1 e/src/safej/java/awt/Component.safej
Index: Component.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Component.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Component.safej 2001/12/24 05:04:30 1.2
+++ Component.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Component",
- deem,
statics,
methods(method("getName()"),
method("setName(String)"),
1.3 +0 -1 e/src/safej/java/awt/ComponentOrientation.safej
Index: ComponentOrientation.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/ComponentOrientation.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentOrientation.safej 2001/12/24 05:04:30 1.2
+++ ComponentOrientation.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.ComponentOrientation",
- deem,
statics,
methods(method("isHorizontal()"),
method("isLeftToRight()"),
1.3 +0 -1 e/src/safej/java/awt/Container.safej
Index: Container.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Container.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Container.safej 2001/12/24 05:04:30 1.2
+++ Container.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Container",
- deem,
statics(method(suppress, "new()")),
methods(method("getComponentCount()"),
method(suppress, "countComponents()"),
1.3 +0 -1 e/src/safej/java/awt/ContainerOrderFocusTraversalPolicy.safej
Index: ContainerOrderFocusTraversalPolicy.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/ContainerOrderFocusTraversalPolicy.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerOrderFocusTraversalPolicy.safej 2001/12/24 05:04:30 1.2
+++ ContainerOrderFocusTraversalPolicy.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.ContainerOrderFocusTraversalPolicy",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress,
"getComponentAfter(Container, Component)",
1.3 +0 -1 e/src/safej/java/awt/Cursor.safej
Index: Cursor.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Cursor.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cursor.safej 2001/12/24 05:04:30 1.2
+++ Cursor.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Cursor",
- deem,
statics(method("new(int)")),
methods(method("getPredefinedCursor(int)"),
method("getSystemCustomCursor(String)"),
1.3 +0 -1 e/src/safej/java/awt/DefaultFocusTraversalPolicy.safej
Index: DefaultFocusTraversalPolicy.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/DefaultFocusTraversalPolicy.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultFocusTraversalPolicy.safej 2001/12/24 05:04:30 1.2
+++ DefaultFocusTraversalPolicy.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.DefaultFocusTraversalPolicy",
- deem,
statics(method(suppress, "new()")),
methods,
comment("I have no idea what this is, looks like a jvm1.4 twist"))
1.3 +0 -1 e/src/safej/java/awt/DefaultKeyboardFocusManager.safej
Index: DefaultKeyboardFocusManager.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/DefaultKeyboardFocusManager.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultKeyboardFocusManager.safej 2001/12/24 05:04:30 1.2
+++ DefaultKeyboardFocusManager.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.DefaultKeyboardFocusManager",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "dispatchEvent(AWTEvent)"),
method(suppress, "dispatchKeyEvent(KeyEvent)"),
1.3 +0 -1 e/src/safej/java/awt/Dialog.safej
Index: Dialog.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Dialog.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Dialog.safej 2001/12/24 05:04:30 1.2
+++ Dialog.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Dialog",
- deem,
statics(method(suppress, "new(Frame)"),
method(suppress, "new(Frame, boolean)"),
method(suppress, "new(Frame, String)"),
1.3 +0 -1 e/src/safej/java/awt/Dimension.safej
Index: Dimension.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Dimension.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Dimension.safej 2001/12/24 05:04:30 1.2
+++ Dimension.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Dimension",
- deem,
statics(method("new()"),
method(suppress, "new(Dimension)"),
method("new(int, int)")),
1.3 +0 -1 e/src/safej/java/awt/DisplayMode.safej
Index: DisplayMode.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/DisplayMode.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DisplayMode.safej 2001/12/24 05:04:30 1.2
+++ DisplayMode.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.DisplayMode",
- deem,
statics(method("new(int, int, int, int)")),
methods(method("getHeight()"),
method("getWidth()"),
1.3 +0 -1 e/src/safej/java/awt/Event.safej
Index: Event.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Event.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Event.safej 2001/12/24 05:04:30 1.2
+++ Event.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Event",
- deem,
statics(method(suppress, "new(Object, long, int, int, int, int, int, Object)"),
method(suppress, "new(Object, long, int, int, int, int, int)"),
method(suppress, "new(Object, int, Object)")),
1.3 +0 -1 e/src/safej/java/awt/EventQueue.safej
Index: EventQueue.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/EventQueue.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EventQueue.safej 2001/12/24 05:04:30 1.2
+++ EventQueue.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.EventQueue",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "postEvent(AWTEvent)"),
method(suppress, "getNextEvent()"),
1.3 +0 -1 e/src/safej/java/awt/FileDialog.safej
Index: FileDialog.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/FileDialog.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileDialog.safej 2001/12/24 05:04:30 1.2
+++ FileDialog.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.FileDialog",
- deem,
statics(method("new(Frame)"),
method("new(Frame, String)"),
method("new(Frame, String, int)")),
1.3 +0 -1 e/src/safej/java/awt/FlowLayout.safej
Index: FlowLayout.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/FlowLayout.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlowLayout.safej 2001/12/24 05:04:30 1.2
+++ FlowLayout.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.FlowLayout",
- deem,
statics(method("new()"),
method("new(int)"),
method("new(int, int, int)")),
1.3 +0 -1 e/src/safej/java/awt/FocusTraversalPolicy.safej
Index: FocusTraversalPolicy.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/FocusTraversalPolicy.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FocusTraversalPolicy.safej 2001/12/24 05:04:30 1.2
+++ FocusTraversalPolicy.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.FocusTraversalPolicy",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "getComponentAfter(Container, Component)"),
method(suppress, "getComponentBefore(Container, Component)"),
1.3 +0 -1 e/src/safej/java/awt/Font.safej
Index: Font.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Font.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Font.safej 2001/12/24 05:04:30 1.2
+++ Font.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Font",
- deem,
statics(method("new(String, int, int)"),
method("new(Map)")),
methods(method("getPeer()"),
1.3 +0 -1 e/src/safej/java/awt/FontMetrics.safej
Index: FontMetrics.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/FontMetrics.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FontMetrics.safej 2001/12/24 05:04:30 1.2
+++ FontMetrics.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.FontMetrics",
- deem,
statics,
methods(method("getFont()"),
method("getLeading()"),
1.3 +0 -1 e/src/safej/java/awt/Frame.safej
Index: Frame.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Frame.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Frame.safej 2001/12/24 05:04:30 1.2
+++ Frame.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Frame",
- deem,
statics(method("new()"),
method(suppress, "new(GraphicsConfiguration)"),
method("new(String)"),
1.3 +0 -1 e/src/safej/java/awt/GradientPaint.safej
Index: GradientPaint.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GradientPaint.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GradientPaint.safej 2001/12/24 05:04:30 1.2
+++ GradientPaint.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.GradientPaint",
- deem,
statics(method("new(float, float, Color, float, float, Color)"),
method(suppress, "new(Point2D, Color, Point2D, Color)"),
method("new(float, float, Color, float, float, Color, boolean)"),
1.3 +0 -1 e/src/safej/java/awt/Graphics.safej
Index: Graphics.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Graphics.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Graphics.safej 2001/12/24 05:04:30 1.2
+++ Graphics.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Graphics",
- deem,
statics,
methods(method("create()"),
method("create(int, int, int, int)"),
1.3 +0 -1 e/src/safej/java/awt/Graphics2D.safej
Index: Graphics2D.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Graphics2D.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Graphics2D.safej 2001/12/24 05:04:30 1.2
+++ Graphics2D.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Graphics2D",
- deem,
statics,
methods(method("draw3DRect(int, int, int, int, boolean)"),
method("fill3DRect(int, int, int, int, boolean)"),
1.3 +0 -1 e/src/safej/java/awt/GraphicsConfigTemplate.safej
Index: GraphicsConfigTemplate.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GraphicsConfigTemplate.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsConfigTemplate.safej 2001/12/24 05:04:30 1.2
+++ GraphicsConfigTemplate.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.GraphicsConfigTemplate",
- deem,
statics(method(suppress, "new()")),
methods(method("getBestConfiguration(GraphicsConfiguration[])"),
method("isGraphicsConfigSupported(GraphicsConfiguration)")))
1.3 +0 -1 e/src/safej/java/awt/GraphicsConfiguration.safej
Index: GraphicsConfiguration.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GraphicsConfiguration.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsConfiguration.safej 2001/12/24 05:04:30 1.2
+++ GraphicsConfiguration.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.GraphicsConfiguration",
- deem,
statics,
methods(method(suppress, "getDevice()"),
method(suppress, "createCompatibleImage(int, int)"),
1.3 +0 -1 e/src/safej/java/awt/GraphicsDevice.safej
Index: GraphicsDevice.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GraphicsDevice.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsDevice.safej 2001/12/24 05:04:30 1.2
+++ GraphicsDevice.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.GraphicsDevice",
- deem,
statics,
methods(method(suppress, "getType()"),
method(suppress, "getIDstring()"),
1.3 +0 -1 e/src/safej/java/awt/GraphicsEnvironment.safej
Index: GraphicsEnvironment.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GraphicsEnvironment.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GraphicsEnvironment.safej 2001/12/24 05:04:30 1.2
+++ GraphicsEnvironment.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.GraphicsEnvironment",
- deem,
statics(method(suppress, "getLocalGraphicsEnvironment()")),
methods(method(suppress, "isHeadless()"),
method(suppress, "isHeadlessInstance()"),
1.3 +29 -2 e/src/safej/java/awt/GridBagConstraints.safej
Index: GridBagConstraints.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GridBagConstraints.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GridBagConstraints.safej 2001/12/24 05:04:30 1.2
+++ GridBagConstraints.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,33 @@
class(safe,
"java.awt.GridBagConstraints",
- deem,
statics(method("new()"),
method("new(int, int, int, int, double, double, int, int, Insets, int, int)")),
- methods(method("clone()")))
\ No newline at end of file
+ methods(method("fill()",
+ comment("Added by MarkM")),
+ method("fill(int)",
+ comment("Added by MarkM")),
+ method("gridheight()",
+ comment("Added by MarkM")),
+ method("gridheight(int)",
+ comment("Added by MarkM")),
+ method("gridwidth()",
+ comment("Added by MarkM")),
+ method("gridwidth(int)",
+ comment("Added by MarkM")),
+ method("gridx()",
+ comment("Added by MarkM")),
+ method("gridx(int)",
+ comment("Added by MarkM")),
+ method("gridy()",
+ comment("Added by MarkM")),
+ method("gridy(int)",
+ comment("Added by MarkM")),
+ method("weightx()",
+ comment("Added by MarkM")),
+ method("weightx(double)",
+ comment("Added by MarkM")),
+ method("weighty()",
+ comment("Added by MarkM")),
+ method("weighty(double)",
+ comment("Added by MarkM")),
+ method("clone()")))
\ No newline at end of file
1.3 +0 -1 e/src/safej/java/awt/GridBagLayout.safej
Index: GridBagLayout.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GridBagLayout.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GridBagLayout.safej 2001/12/24 05:04:30 1.2
+++ GridBagLayout.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.GridBagLayout",
- deem,
statics(method("new()")),
methods(method("setConstraints(Component, GridBagConstraints)"),
method("getConstraints(Component)"),
1.3 +0 -1 e/src/safej/java/awt/GridLayout.safej
Index: GridLayout.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/GridLayout.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GridLayout.safej 2001/12/24 05:04:30 1.2
+++ GridLayout.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.GridLayout",
- deem,
statics(method("new()"),
method("new(int, int)"),
method("new(int, int, int, int)")),
1.3 +0 -1 e/src/safej/java/awt/Image.safej
Index: Image.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Image.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Image.safej 2001/12/24 05:04:30 1.2
+++ Image.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Image",
- deem,
statics(method("new()")),
methods(method("getWidth(ImageObserver)"),
method("getHeight(ImageObserver)"),
1.3 +0 -1 e/src/safej/java/awt/ImageCapabilities.safej
Index: ImageCapabilities.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/ImageCapabilities.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImageCapabilities.safej 2001/12/24 05:04:30 1.2
+++ ImageCapabilities.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.ImageCapabilities",
- deem,
statics(method("new(boolean)")),
methods(method("isAccelerated()"),
method("isTrueVolatile()"),
1.3 +0 -1 e/src/safej/java/awt/Insets.safej
Index: Insets.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Insets.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Insets.safej 2001/12/24 05:04:30 1.2
+++ Insets.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Insets",
- deem,
statics(method("new(int, int, int, int)")),
methods(method("equals(Object)"),
method(suppress, "hashCode()"),
1.3 +1 -1 e/src/safej/java/awt/JobAttributes$DefaultSelectionType.safej
Index: JobAttributes$DefaultSelectionType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes$DefaultSelectionType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes$DefaultSelectionType.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes$DefaultSelectionType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.JobAttributes.DefaultSelectionType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.JobAttributes.DefaultSelectionType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/JobAttributes$DestinationType.safej
Index: JobAttributes$DestinationType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes$DestinationType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes$DestinationType.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes$DestinationType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.JobAttributes.DestinationType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.JobAttributes.DestinationType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/JobAttributes$DialogType.safej
Index: JobAttributes$DialogType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes$DialogType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes$DialogType.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes$DialogType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.JobAttributes.DialogType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.JobAttributes.DialogType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/JobAttributes$MultipleDocumentHandlingType.safej
Index: JobAttributes$MultipleDocumentHandlingType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes$MultipleDocumentHandlingType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes$MultipleDocumentHandlingType.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes$MultipleDocumentHandlingType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.JobAttributes.MultipleDocumentHandlingType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.JobAttributes.MultipleDocumentHandlingType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/JobAttributes$SidesType.safej
Index: JobAttributes$SidesType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes$SidesType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes$SidesType.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes$SidesType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.JobAttributes.SidesType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.JobAttributes.SidesType", statics, methods)
\ No newline at end of file
1.3 +0 -1 e/src/safej/java/awt/JobAttributes.safej
Index: JobAttributes.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/JobAttributes.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JobAttributes.safej 2001/12/24 05:04:30 1.2
+++ JobAttributes.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.JobAttributes",
- deem,
statics(method("new()"),
method("new(JobAttributes)"),
method("new(int, JobAttributes.DefaultSelectionType, JobAttributes.DestinationType, JobAttributes.DialogType, String, int, int, JobAttributes.MultipleDocumentHandlingType, int[][], String, JobAttributes.SidesType)")),
1.3 +0 -1 e/src/safej/java/awt/KeyEventDispatcher.safej
Index: KeyEventDispatcher.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/KeyEventDispatcher.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyEventDispatcher.safej 2001/12/24 05:04:30 1.2
+++ KeyEventDispatcher.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.KeyEventDispatcher",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "dispatchKeyEvent(KeyEvent)")),
comment("Abstract"))
1.3 +0 -1 e/src/safej/java/awt/KeyboardFocusManager.safej
Index: KeyboardFocusManager.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/KeyboardFocusManager.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyboardFocusManager.safej 2001/12/24 05:04:30 1.2
+++ KeyboardFocusManager.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.KeyboardFocusManager",
- deem,
statics(method(suppress, "new()"),
method(suppress, "setCurrentKeyboardFocusManager(KeyboardFocusManager)")),
methods(method("getCurrentKeyboardFocusManager()"),
1.3 +0 -1 e/src/safej/java/awt/Label.safej
Index: Label.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Label.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Label.safej 2001/12/24 05:04:30 1.2
+++ Label.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Label",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(String, int)")),
1.3 +0 -1 e/src/safej/java/awt/List.safej
Index: List.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/List.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- List.safej 2001/12/24 05:04:30 1.2
+++ List.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.List",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(int)"),
method(suppress, "new(int, boolean)")),
1.3 +0 -1 e/src/safej/java/awt/MediaTracker.safej
Index: MediaTracker.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/MediaTracker.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MediaTracker.safej 2001/12/24 05:04:30 1.2
+++ MediaTracker.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.MediaTracker",
- deem,
statics(method("new(Component)")),
methods(method("addImage(Image, int)"),
method("addImage(Image, int, int, int)"),
1.3 +0 -1 e/src/safej/java/awt/Menu.safej
Index: Menu.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Menu.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Menu.safej 2001/12/24 05:04:30 1.2
+++ Menu.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Menu",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(String, boolean)")),
1.3 +0 -1 e/src/safej/java/awt/MenuBar.safej
Index: MenuBar.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/MenuBar.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MenuBar.safej 2001/12/24 05:04:30 1.2
+++ MenuBar.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.MenuBar",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "addNotify()"),
method(suppress, "removeNotify()"),
1.3 +0 -1 e/src/safej/java/awt/MenuComponent.safej
Index: MenuComponent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/MenuComponent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MenuComponent.safej 2001/12/24 05:04:30 1.2
+++ MenuComponent.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.MenuComponent",
- deem,
statics(method("new()")),
methods(method("getName()"),
method("setName(String)"),
1.3 +0 -1 e/src/safej/java/awt/MenuItem.safej
Index: MenuItem.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/MenuItem.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MenuItem.safej 2001/12/24 05:04:30 1.2
+++ MenuItem.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.MenuItem",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(String, MenuShortcut)")),
1.3 +0 -1 e/src/safej/java/awt/MenuShortcut.safej
Index: MenuShortcut.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/MenuShortcut.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MenuShortcut.safej 2001/12/24 05:04:30 1.2
+++ MenuShortcut.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.MenuShortcut",
- deem,
statics(method("new(int)"),
method("new(int, boolean)")),
methods(method("getKey()"),
1.3 +1 -1 e/src/safej/java/awt/PageAttributes$ColorType.safej
Index: PageAttributes$ColorType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes$ColorType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes$ColorType.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes$ColorType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.PageAttributes.ColorType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.PageAttributes.ColorType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/PageAttributes$MediaType.safej
Index: PageAttributes$MediaType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes$MediaType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes$MediaType.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes$MediaType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.PageAttributes.MediaType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.PageAttributes.MediaType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/PageAttributes$OrientationRequestedType.safej
Index: PageAttributes$OrientationRequestedType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes$OrientationRequestedType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes$OrientationRequestedType.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes$OrientationRequestedType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.PageAttributes.OrientationRequestedType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.PageAttributes.OrientationRequestedType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/PageAttributes$OriginType.safej
Index: PageAttributes$OriginType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes$OriginType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes$OriginType.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes$OriginType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.PageAttributes.OriginType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.PageAttributes.OriginType", statics, methods)
\ No newline at end of file
1.3 +1 -1 e/src/safej/java/awt/PageAttributes$PrintQualityType.safej
Index: PageAttributes$PrintQualityType.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes$PrintQualityType.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes$PrintQualityType.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes$PrintQualityType.safej 2001/12/24 23:09:38 1.3
@@ -1 +1 @@
-class("java.awt.PageAttributes.PrintQualityType", deem, statics, methods)
\ No newline at end of file
+class("java.awt.PageAttributes.PrintQualityType", statics, methods)
\ No newline at end of file
1.3 +0 -1 e/src/safej/java/awt/PageAttributes.safej
Index: PageAttributes.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PageAttributes.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageAttributes.safej 2001/12/24 05:04:30 1.2
+++ PageAttributes.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.PageAttributes",
- deem,
statics(method("new()"),
method(suppress, "new(PageAttributes)"),
method("new(PageAttributes.ColorType, PageAttributes.MediaType, PageAttributes.OrientationRequestedType, PageAttributes.OriginType, PageAttributes.PrintQualityType, int[])")),
1.3 +0 -1 e/src/safej/java/awt/Panel.safej
Index: Panel.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Panel.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Panel.safej 2001/12/24 05:04:30 1.2
+++ Panel.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Panel",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(LayoutManager)")),
methods(method(suppress, "addNotify()"),
1.3 +0 -1 e/src/safej/java/awt/Point.safej
Index: Point.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Point.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Point.safej 2001/12/24 05:04:30 1.2
+++ Point.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Point",
- deem,
statics(method("new()"),
method("new(Point)"),
method("new(int, int)")),
1.3 +0 -1 e/src/safej/java/awt/Polygon.safej
Index: Polygon.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Polygon.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Polygon.safej 2001/12/24 05:04:30 1.2
+++ Polygon.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Polygon",
- deem,
statics(method("new()"),
method("new(int[], int[], int)")),
methods(method("reset()"),
1.3 +0 -1 e/src/safej/java/awt/PopupMenu.safej
Index: PopupMenu.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PopupMenu.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PopupMenu.safej 2001/12/24 05:04:30 1.2
+++ PopupMenu.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.PopupMenu",
- deem,
statics(method("new()"),
method("new(String)")),
methods(method(suppress, "addNotify()"),
1.3 +0 -1 e/src/safej/java/awt/PrintJob.safej
Index: PrintJob.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/PrintJob.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PrintJob.safej 2001/12/24 05:04:30 1.2
+++ PrintJob.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.PrintJob",
- deem,
statics(method(suppress, "new()")),
methods(method("getGraphics()"),
method("getPageDimension()"),
1.3 +0 -1 e/src/safej/java/awt/Rectangle.safej
Index: Rectangle.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Rectangle.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Rectangle.safej 2001/12/24 05:04:30 1.2
+++ Rectangle.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.Rectangle",
- deem,
statics(method("new()"),
method("new(Rectangle)"),
method("new(int, int, int, int)"),
1.3 +0 -1 e/src/safej/java/awt/RenderingHints$Key.safej
Index: RenderingHints$Key.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/RenderingHints$Key.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderingHints$Key.safej 2001/12/24 05:04:30 1.2
+++ RenderingHints$Key.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.RenderingHints.Key",
- deem,
statics,
methods(method(suppress, "isCompatibleValue(Object)"),
method(suppress, "hashCode()"),
1.3 +0 -1 e/src/safej/java/awt/RenderingHints.safej
Index: RenderingHints.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/RenderingHints.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderingHints.safej 2001/12/24 05:04:30 1.2
+++ RenderingHints.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.RenderingHints",
- deem,
statics(method("new(Map)"),
method("new(RenderingHints.Key, Object)")),
methods(method(suppress, "size()"),
1.3 +0 -1 e/src/safej/java/awt/Robot.safej
Index: Robot.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Robot.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Robot.safej 2001/12/24 05:04:30 1.2
+++ Robot.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Robot",
- deem,
statics(method("new()"),
method("new(GraphicsDevice)")),
methods(method("mouseMove(int, int)"),
1.3 +0 -1 e/src/safej/java/awt/ScrollPane.safej
Index: ScrollPane.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/ScrollPane.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScrollPane.safej 2001/12/24 05:04:30 1.2
+++ ScrollPane.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.ScrollPane",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(int)")),
methods(method(suppress, "getScrollbarDisplayPolicy()"),
1.3 +0 -1 e/src/safej/java/awt/ScrollPaneAdjustable.safej
Index: ScrollPaneAdjustable.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/ScrollPaneAdjustable.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScrollPaneAdjustable.safej 2001/12/24 05:04:30 1.2
+++ ScrollPaneAdjustable.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.ScrollPaneAdjustable",
- deem,
statics,
methods(method("getOrientation()"),
method(suppress, "setMinimum(int)"),
1.3 +0 -1 e/src/safej/java/awt/Scrollbar.safej
Index: Scrollbar.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Scrollbar.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scrollbar.safej 2001/12/24 05:04:30 1.2
+++ Scrollbar.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Scrollbar",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(int)"),
method(suppress, "new(int, int, int, int, int)")),
1.3 +0 -1 e/src/safej/java/awt/SystemColor.safej
Index: SystemColor.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/SystemColor.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SystemColor.safej 2001/12/24 05:04:30 1.2
+++ SystemColor.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.SystemColor",
- deem,
statics,
methods(method("getRGB()"),
method("createContext(ColorModel, Rectangle, Rectangle2D, AffineTransform, RenderingHints)"),
1.3 +0 -1 e/src/safej/java/awt/TextArea.safej
Index: TextArea.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/TextArea.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextArea.safej 2001/12/24 05:04:30 1.2
+++ TextArea.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.TextArea",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(int, int)"),
1.3 +0 -1 e/src/safej/java/awt/TextComponent.safej
Index: TextComponent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/TextComponent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextComponent.safej 2001/12/24 05:04:30 1.2
+++ TextComponent.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.TextComponent",
- deem,
statics,
methods(method(suppress, "enableInputMethods(boolean)"),
method(suppress, "addNotify()"),
1.3 +0 -1 e/src/safej/java/awt/TextField.safej
Index: TextField.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/TextField.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextField.safej 2001/12/24 05:04:30 1.2
+++ TextField.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.TextField",
- deem,
statics(method(suppress, "new()"),
method(suppress, "new(String)"),
method(suppress, "new(int)"),
1.3 +0 -1 e/src/safej/java/awt/TexturePaint.safej
Index: TexturePaint.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/TexturePaint.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TexturePaint.safej 2001/12/24 05:04:30 1.2
+++ TexturePaint.safej 2001/12/24 23:09:38 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.TexturePaint",
- deem,
statics(method("new(BufferedImage, Rectangle2D)")),
methods(method("getImage()"),
method("getAnchorRect()"),
1.3 +0 -1 e/src/safej/java/awt/Toolkit.safej
Index: Toolkit.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Toolkit.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Toolkit.safej 2001/12/24 05:04:30 1.2
+++ Toolkit.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Toolkit",
- deem,
statics(method(suppress, "new()"),
method("getDefaultToolkit()")),
methods(method("setDynamicLayout(boolean)"),
1.3 +0 -1 e/src/safej/java/awt/Window.safej
Index: Window.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/Window.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Window.safej 2001/12/24 05:04:30 1.2
+++ Window.safej 2001/12/24 23:09:38 1.3
@@ -1,5 +1,4 @@
class("java.awt.Window",
- deem,
statics(method(suppress, "new(Frame)"),
method(suppress, "new(Window)"),
method(suppress, "new(Window, GraphicsConfiguration)")),
1.3 +0 -1 e/src/safej/java/awt/event/AWTEventListenerProxy.safej
Index: AWTEventListenerProxy.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/AWTEventListenerProxy.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AWTEventListenerProxy.safej 2001/12/24 05:04:34 1.2
+++ AWTEventListenerProxy.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.AWTEventListenerProxy",
- deem,
statics(method(suppress, "new(long, AWTEventListener)")),
methods(method(suppress, "eventDispatched(AWTEvent)"),
method(suppress, "getEventMask()")))
1.3 +0 -1 e/src/safej/java/awt/event/ActionEvent.safej
Index: ActionEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ActionEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionEvent.safej 2001/12/24 05:04:34 1.2
+++ ActionEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.ActionEvent",
- deem,
statics(method(suppress, "new(Object, int, String)"),
method(suppress, "new(Object, int, String, int)")),
methods(method("getActionCommand()"),
1.3 +0 -1 e/src/safej/java/awt/event/AdjustmentEvent.safej
Index: AdjustmentEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/AdjustmentEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AdjustmentEvent.safej 2001/12/24 05:04:34 1.2
+++ AdjustmentEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.AdjustmentEvent",
- deem,
statics(method(suppress, "new(Adjustable, int, int, int)"),
method(suppress, "new(Adjustable, int, int, int, boolean)")),
methods(method("getAdjustable()"),
1.3 +0 -1 e/src/safej/java/awt/event/ComponentAdapter.safej
Index: ComponentAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ComponentAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentAdapter.safej 2001/12/24 05:04:34 1.2
+++ ComponentAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.ComponentAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "componentResized(ComponentEvent)"),
method(suppress, "componentMoved(ComponentEvent)"),
1.3 +0 -1 e/src/safej/java/awt/event/ComponentEvent.safej
Index: ComponentEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ComponentEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentEvent.safej 2001/12/24 05:04:34 1.2
+++ ComponentEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.ComponentEvent",
- deem,
statics(method(suppress, "new(Component, int)")),
methods(method("getComponent()"),
method(suppress, "paramString()")))
1.3 +0 -1 e/src/safej/java/awt/event/ContainerAdapter.safej
Index: ContainerAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ContainerAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerAdapter.safej 2001/12/24 05:04:34 1.2
+++ ContainerAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.ContainerAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "componentAdded(ContainerEvent)"),
method(suppress, "componentRemoved(ContainerEvent)")))
1.3 +0 -1 e/src/safej/java/awt/event/ContainerEvent.safej
Index: ContainerEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ContainerEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerEvent.safej 2001/12/24 05:04:34 1.2
+++ ContainerEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.ContainerEvent",
- deem,
statics(method(suppress, "new(Component, int, Component)")),
methods(method("getContainer()"),
method("getChild()"),
1.3 +0 -1 e/src/safej/java/awt/event/FocusAdapter.safej
Index: FocusAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/FocusAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FocusAdapter.safej 2001/12/24 05:04:34 1.2
+++ FocusAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.FocusAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "focusGained(FocusEvent)"),
method(suppress, "focusLost(FocusEvent)")))
1.3 +0 -1 e/src/safej/java/awt/event/FocusEvent.safej
Index: FocusEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/FocusEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FocusEvent.safej 2001/12/24 05:04:34 1.2
+++ FocusEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.FocusEvent",
- deem,
statics(method(suppress, "new(Component, int, boolean, Component)"),
method(suppress, "new(Component, int, boolean)"),
method(suppress, "new(Component, int)")),
1.3 +0 -1 e/src/safej/java/awt/event/HierarchyBoundsAdapter.safej
Index: HierarchyBoundsAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/HierarchyBoundsAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyBoundsAdapter.safej 2001/12/24 05:04:34 1.2
+++ HierarchyBoundsAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.HierarchyBoundsAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "ancestorMoved(HierarchyEvent)"),
method(suppress, "ancestorResized(HierarchyEvent)")))
1.3 +0 -1 e/src/safej/java/awt/event/HierarchyEvent.safej
Index: HierarchyEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/HierarchyEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HierarchyEvent.safej 2001/12/24 05:04:34 1.2
+++ HierarchyEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.HierarchyEvent",
- deem,
statics(method(suppress, "new(Component, int, Component, Container)"),
method(suppress, "new(Component, int, Component, Container, long)")),
methods(method(suppress, "getComponent()"),
1.3 +0 -1 e/src/safej/java/awt/event/InputEvent.safej
Index: InputEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/InputEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InputEvent.safej 2001/12/24 05:04:34 1.2
+++ InputEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.InputEvent",
- deem,
statics,
methods(method("isShiftDown()"),
method("isControlDown()"),
1.3 +0 -1 e/src/safej/java/awt/event/InputMethodEvent.safej
Index: InputMethodEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/InputMethodEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InputMethodEvent.safej 2001/12/24 05:04:34 1.2
+++ InputMethodEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.InputMethodEvent",
- deem,
statics(method(suppress, "new(Component, int, AttributedCharacterIterator, int, TextHitInfo, TextHitInfo)"),
method(suppress, "new(Component, int, TextHitInfo, TextHitInfo)")),
methods(method("getText()"),
1.3 +0 -1 e/src/safej/java/awt/event/InvocationEvent.safej
Index: InvocationEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/InvocationEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvocationEvent.safej 2001/12/24 05:04:34 1.2
+++ InvocationEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.InvocationEvent",
- deem,
statics(method(suppress, "new(Object, Runnable)"),
method(suppress, "new(Object, Runnable, Object, boolean)")),
methods(method(suppress, "dispatch()"),
1.3 +0 -1 e/src/safej/java/awt/event/ItemEvent.safej
Index: ItemEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/ItemEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ItemEvent.safej 2001/12/24 05:04:34 1.2
+++ ItemEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.ItemEvent",
- deem,
statics(method(suppress, "new(ItemSelectable, int, Object, int)")),
methods(method("getItemSelectable()"),
method("getItem()"),
1.3 +0 -1 e/src/safej/java/awt/event/KeyAdapter.safej
Index: KeyAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/KeyAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyAdapter.safej 2001/12/24 05:04:34 1.2
+++ KeyAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.KeyAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "keyTyped(KeyEvent)"),
method(suppress, "keyPressed(KeyEvent)"),
1.3 +0 -1 e/src/safej/java/awt/event/KeyEvent.safej
Index: KeyEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/KeyEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KeyEvent.safej 2001/12/24 05:04:34 1.2
+++ KeyEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.KeyEvent",
- deem,
statics(method(suppress, "new(Component, int, long, int, int, char, int)"),
method(suppress, "new(Component, int, long, int, int, char)"),
method(suppress, "new(Component, int, long, int, int)")),
1.3 +0 -1 e/src/safej/java/awt/event/MouseAdapter.safej
Index: MouseAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/MouseAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MouseAdapter.safej 2001/12/24 05:04:34 1.2
+++ MouseAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.MouseAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "mouseClicked(MouseEvent)"),
method(suppress, "mousePressed(MouseEvent)"),
1.3 +0 -1 e/src/safej/java/awt/event/MouseEvent.safej
Index: MouseEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/MouseEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MouseEvent.safej 2001/12/24 05:04:34 1.2
+++ MouseEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.MouseEvent",
- deem,
statics(method(suppress, "new(Component, int, long, int, int, int, int, boolean)")),
methods(method("getX()"),
method("getY()"),
1.3 +0 -1 e/src/safej/java/awt/event/MouseMotionAdapter.safej
Index: MouseMotionAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/MouseMotionAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MouseMotionAdapter.safej 2001/12/24 05:04:34 1.2
+++ MouseMotionAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.MouseMotionAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "mouseDragged(MouseEvent)"),
method(suppress, "mouseMoved(MouseEvent)")))
1.3 +0 -1 e/src/safej/java/awt/event/MouseWheelEvent.safej
Index: MouseWheelEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/MouseWheelEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MouseWheelEvent.safej 2001/12/24 05:04:34 1.2
+++ MouseWheelEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.MouseWheelEvent",
- deem,
statics(method(suppress, "new(Component, int, long, int, int, int, int, boolean, int, int, int)")),
methods(method("getScrollType()"),
method("getScrollAmount()"),
1.3 +0 -1 e/src/safej/java/awt/event/PaintEvent.safej
Index: PaintEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/PaintEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PaintEvent.safej 2001/12/24 05:04:34 1.2
+++ PaintEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.PaintEvent",
- deem,
statics(method(suppress, "new(Component, int, Rectangle)")),
methods(method("getUpdateRect()"),
method(suppress, "setUpdateRect(Rectangle)"),
1.3 +0 -1 e/src/safej/java/awt/event/TextEvent.safej
Index: TextEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/TextEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TextEvent.safej 2001/12/24 05:04:34 1.2
+++ TextEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,4 +1,3 @@
class("java.awt.event.TextEvent",
- deem,
statics(method(suppress, "new(Object, int)")),
methods(method(suppress, "paramString()")))
1.3 +0 -1 e/src/safej/java/awt/event/WindowAdapter.safej
Index: WindowAdapter.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/WindowAdapter.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WindowAdapter.safej 2001/12/24 05:04:34 1.2
+++ WindowAdapter.safej 2001/12/24 23:09:42 1.3
@@ -1,5 +1,4 @@
class("java.awt.event.WindowAdapter",
- deem,
statics(method(suppress, "new()")),
methods(method(suppress, "windowOpened(WindowEvent)"),
method(suppress, "windowClosing(WindowEvent)"),
1.3 +0 -1 e/src/safej/java/awt/event/WindowEvent.safej
Index: WindowEvent.safej
===================================================================
RCS file: /cvs/e/src/safej/java/awt/event/WindowEvent.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WindowEvent.safej 2001/12/24 05:04:34 1.2
+++ WindowEvent.safej 2001/12/24 23:09:42 1.3
@@ -1,6 +1,5 @@
class(safe,
"java.awt.event.WindowEvent",
- deem,
statics(method(suppress, "new(Window, int, Window, int, int)"),
method(suppress, "new(Window, int, Window)"),
method(suppress, "new(Window, int, int, int)"),
1.3 +0 -1 e/src/safej/javax/swing/AbstractAction.safej
Index: AbstractAction.safej
===================================================================
RCS file: /cvs/e/src/safej/javax/swing/AbstractAction.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractAction.safej 2001/12/24 05:04:34 1.2
+++ AbstractAction.safej 2001/12/24 23:09:43 1.3
@@ -1,6 +1,5 @@
class(safe,
"javax.swing.AbstractAction",
- deem,
statics(method("new()"),
method("new(String)"),
method("new(String, Icon)")),
1.3 +0 -1 e/src/safej/javax/swing/AbstractButton.safej
Index: AbstractButton.safej
===================================================================
RCS file: /cvs/e/src/safej/javax/swing/AbstractButton.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractButton.safej 2001/12/24 05:04:34 1.2
+++ AbstractButton.safej 2001/12/24 23:09:43 1.3
@@ -1,6 +1,5 @@
class(safe,
"javax.swing.AbstractButton",
- deem,
statics(method("new()")),
methods(method("getText()"),
method("setText(String)"),
1.3 +0 -1 e/src/safej/javax/swing/AbstractCellEditor.safej
Index: AbstractCellEditor.safej
===================================================================
RCS file: /cvs/e/src/safej/javax/swing/AbstractCellEditor.safej,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractCellEditor.safej 2001/12/24 05:04:34 1.2
+++ AbstractCellEditor.safej 2001/12/24 23:09:43 1.3
@@ -1,6 +1,5 @@
class(safe,
"javax.swing.AbstractCellEditor",
- deem,
statics(method("new()")),
methods(method("isCellEditable(EventObject)"),
method("shouldSelectCell(EventObject)"),
1.3 +0 -1 e/src/safej/javax/swing/AbstractListModel.safej
Index: AbstractListModel.safej
============