Re: [kaffe] [gump] utf8const.c
Davanum Srinivas [EMAIL PROTECTED] wrote: looks like we need a lock for locking access to utfLockRoot :( I'd think that the whole utfLockRoot thing is broken (you'd need one utfLockRoot per thread since it's perfectly legal for two threads to work on utf8 constants at the same time). However, I think we could just remove the utfLockRoot thing completely, couldn't we? Even if one of the allocations in utf8const.c triggers a garbage collection, the thread holding the utf8Lock will be resumed before the finaliser starts to free unreachable objects (at least with kaffe-gc). This means that we don't have to drop the lock before doing an allocation, which renders utf8LockRoot useless. Or I just overlooked something ... Regards, Helmer ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] [gump] utf8const.c
Helmer Krämer wrote: Davanum Srinivas [EMAIL PROTECTED] wrote: looks like we need a lock for locking access to utfLockRoot :( I'd think that the whole utfLockRoot thing is broken (you'd need one utfLockRoot per thread since it's perfectly legal for two threads to work on utf8 constants at the same time). However, I think we could just remove the utfLockRoot thing completely, couldn't we? Even if one of the allocations in utf8const.c triggers a garbage collection, the thread holding the utf8Lock will be resumed before the finaliser starts to free unreachable objects (at least with kaffe-gc). This means that we don't have to drop the lock before doing an allocation, which renders utf8LockRoot useless. Or I just overlooked something ... Regards, Helmer The problem is that utf constants are cached in a hash table. If two strings are exactly equals then utf8const does not create a new constant. I don't know if the approach is justified but this justifies the use UTF locking as only one thread at a time should touch the hashtable. The assertion failure in itself is disturbing: it's like the fast lock subsystem is not working properly as it lets at least two threads running concurrently on that part of the code. Regards, Guilhem. ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] merging java.lang.Class ?
Hi, after merging java.lang.Classloader, I tried merging java.lang.Class and got so far that kaffe passes most of the regression tests. The attached patch is not yet ready to go in (I still have to fix the reflection stuff and do some cleanup), but it is far enough to decide whether we want something like it or not. So far, I've simply changed the order of the fields of struct Hjava_lang_Class to match the order of the variables in classpath's java.lang.Class implementation. That way java.lang.Class and struct Hjava_lang_Class are still interchangeable and we don't have to change large parts of the core. The rest of the merging is just renaming some methods and adapting Kaffe_FindClass so kaffe is still able to find the application classes. Any thoughts? Regards, Helmer class.patch.gz Description: Binary data ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: IIOInvalidTreeException fixed
PatchSet 5764
Date: 2005/01/05 19:31:56
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: IIOInvalidTreeException fixed
Members:
ChangeLog:1.3308-1.3309
libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java:1.1-1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3308 kaffe/ChangeLog:1.3309
--- kaffe/ChangeLog:1.3308 Wed Jan 5 18:43:21 2005
+++ kaffe/ChangeLog Wed Jan 5 19:31:56 2005
@@ -1,6 +1,16 @@
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
Resynced with GNU Classpath.
+
+ 2004-12-27 Michael Koch [EMAIL PROTECTED]
+
+ * javax/imageio/metadata/IIOInvalidTreeException.java:
+ Use org.w3c.dom.Node instead of java.lang.Object.
+ (serialVersionUID): New field.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
2005-01-05 Michael Koch [EMAIL PROTECTED]
Index:
kaffe/libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java
diff -u
kaffe/libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java:1.1
kaffe/libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java:1.2
---
kaffe/libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java:1.1
Sun Oct 10 14:55:14 2004
+++ kaffe/libraries/javalib/javax/imageio/metadata/IIOInvalidTreeException.java
Wed Jan 5 19:32:01 2005
@@ -40,23 +40,27 @@
import javax.imageio.IIOException;
+import org.w3c.dom.Node;
+
public class IIOInvalidTreeException extends IIOException
{
- protected /*Node*/ Object offendingNode;
+ private static final long serialVersionUID = -1314083172544132777L;
+
+ protected Node offendingNode;
- public IIOInvalidTreeException(String message, /*Node*/ Object offendingNode)
+ public IIOInvalidTreeException(String message, Node offendingNode)
{
super(message);
this.offendingNode = offendingNode;
}
- public IIOInvalidTreeException(String message, Throwable cause, /*Node*/
Object offendingNode)
+ public IIOInvalidTreeException(String message, Throwable cause, Node
offendingNode)
{
super(message, cause);
this.offendingNode = offendingNode;
}
- public /*Node*/ Object getOffendingNode()
+ public Node getOffendingNode()
{
return offendingNode;
}
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: nio fixes
PatchSet 5767
Date: 2005/01/05 19:45:25
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: nio fixes
Members:
ChangeLog:1.3311-1.3312
libraries/javalib/java/nio/ByteBufferImpl.java:1.8-1.9
libraries/javalib/java/nio/CharBufferImpl.java:1.6-1.7
libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10-1.11
libraries/javalib/java/nio/DoubleBufferImpl.java:1.6-1.7
libraries/javalib/java/nio/FloatBufferImpl.java:1.6-1.7
libraries/javalib/java/nio/IntBufferImpl.java:1.6-1.7
libraries/javalib/java/nio/LongBufferImpl.java:1.6-1.7
libraries/javalib/java/nio/MappedByteBufferImpl.java:1.9-1.10
libraries/javalib/java/nio/ShortBufferImpl.java:1.6-1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3311 kaffe/ChangeLog:1.3312
--- kaffe/ChangeLog:1.3311 Wed Jan 5 19:40:41 2005
+++ kaffe/ChangeLog Wed Jan 5 19:45:25 2005
@@ -1,6 +1,23 @@
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
Resynced with GNU Classpath.
+
+ 2004-12-27 Jeroen Frijters [EMAIL PROTECTED]
+
+ * java/nio/ByteBufferImpl.java,
+ java/nio/CharBufferImpl.java,
+ java/nio/DirectByteBufferImpl.java,
+ java/nio/DoubleBufferImpl.java,
+ java/nio/FloatBufferImpl.java,
+ java/nio/IntBufferImpl.java,
+ java/nio/LongBufferImpl.java,
+ java/nio/MappedByteBufferImpl.java,
+ java/nio/ShortBufferImpl.java
+ (compact): Added explicit read-only check and invalidate mark.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
2004-12-27 Michael Koch [EMAIL PROTECTED]
Index: kaffe/libraries/javalib/java/nio/ByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.8
kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9
--- kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.8Tue Jun 15
17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/ByteBufferImpl.javaWed Jan 5
19:45:27 2005
@@ -112,6 +112,8 @@
public ByteBuffer compact ()
{
+checkIfReadOnly();
+mark = -1;
int pos = position();
if (pos 0)
{
Index: kaffe/libraries/javalib/java/nio/CharBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.6
kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7
--- kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.6Tue Jun 15
17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/CharBufferImpl.javaWed Jan 5
19:45:27 2005
@@ -87,6 +87,8 @@
public CharBuffer compact ()
{
+checkIfReadOnly();
+mark = -1;
int copied = 0;
while (remaining () 0)
Index: kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10
kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.11
--- kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.10 Wed Dec
1 02:42:11 2004
+++ kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java Wed Jan 5
19:45:27 2005
@@ -186,6 +186,8 @@
public ByteBuffer compact()
{
+checkIfReadOnly();
+mark = -1;
int pos = position();
if (pos 0)
{
Index: kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.6
kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.7
--- kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java:1.6 Tue Jun 15
17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java Wed Jan 5
19:45:27 2005
@@ -80,6 +80,8 @@
public DoubleBuffer compact ()
{
+checkIfReadOnly();
+mark = -1;
int copied = 0;
while (remaining () 0)
Index: kaffe/libraries/javalib/java/nio/FloatBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.6
kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.7
--- kaffe/libraries/javalib/java/nio/FloatBufferImpl.java:1.6 Tue Jun 15
17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/FloatBufferImpl.java Wed Jan 5
19:45:27 2005
@@ -80,6 +80,8 @@
public FloatBuffer compact ()
{
+checkIfReadOnly();
+mark = -1;
int copied = 0;
while (remaining () 0)
Index: kaffe/libraries/javalib/java/nio/IntBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.6
kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.7
--- kaffe/libraries/javalib/java/nio/IntBufferImpl.java:1.6 Tue Jun 15
17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/IntBufferImpl.java Wed Jan 5 19:45:27 2005
@@ -80,6 +80,8 @@
public IntBuffer compact ()
{
+checkIfReadOnly();
+mark = -1;
int copied = 0;
while (remaining () 0)
Index: kaffe/libraries/javalib/java/nio/LongBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/LongBufferImpl.java:1.6
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: imageio improvements
PatchSet 5766
Date: 2005/01/05 19:40:41
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: imageio improvements
Members:
ChangeLog:1.3310-1.3311
libraries/javalib/javax/imageio/IIOParam.java:1.2-1.3
libraries/javalib/javax/imageio/ImageReadParam.java:1.2-1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3310 kaffe/ChangeLog:1.3311
--- kaffe/ChangeLog:1.3310 Wed Jan 5 19:37:10 2005
+++ kaffe/ChangeLog Wed Jan 5 19:40:41 2005
@@ -4,6 +4,20 @@
2004-12-27 Michael Koch [EMAIL PROTECTED]
+ * javax/imageio/IIOParam.java
+ (setSourceBands): New method.
+ (setSourceSubsampling): Likewise.
+ * javax/imageio/ImageReadParam.java
+ (setDestination): Likewise.
+ (setDestinationBands): Likewise.
+ (setSourceProgressivePasses): Likewise.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
+ 2004-12-27 Michael Koch [EMAIL PROTECTED]
+
* javax/swing/AbstractAction.java,
javax/swing/AbstractCellEditor.java,
javax/swing/AbstractListModel.java,
Index: kaffe/libraries/javalib/javax/imageio/IIOParam.java
diff -u kaffe/libraries/javalib/javax/imageio/IIOParam.java:1.2
kaffe/libraries/javalib/javax/imageio/IIOParam.java:1.3
--- kaffe/libraries/javalib/javax/imageio/IIOParam.java:1.2 Tue Oct 5
22:11:20 2004
+++ kaffe/libraries/javalib/javax/imageio/IIOParam.java Wed Jan 5 19:40:41 2005
@@ -141,6 +141,11 @@
this.destinationOffset = destinationOffset;
}
+ public void setSourceBands(int[] sourceBands)
+ {
+this.sourceBands = sourceBands;
+ }
+
public void setSourceRegion(Rectangle sourceRegion)
{
if (sourceRegion != null
@@ -153,5 +158,14 @@
// FIXME: Throw IllegalStateException.
this.sourceRegion = sourceRegion;
+ }
+
+ public void setSourceSubsampling(int sourceXSubsampling, int
sourceYSubsampling,
+ int subsamplingXOffset, int
subsamplingYOffset)
+ {
+this.sourceXSubsampling = sourceXSubsampling;
+this.sourceYSubsampling = sourceYSubsampling;
+this.subsamplingXOffset = subsamplingXOffset;
+this.subsamplingYOffset = subsamplingYOffset;
}
}
Index: kaffe/libraries/javalib/javax/imageio/ImageReadParam.java
diff -u kaffe/libraries/javalib/javax/imageio/ImageReadParam.java:1.2
kaffe/libraries/javalib/javax/imageio/ImageReadParam.java:1.3
--- kaffe/libraries/javalib/javax/imageio/ImageReadParam.java:1.2 Tue Oct
5 22:11:20 2004
+++ kaffe/libraries/javalib/javax/imageio/ImageReadParam.java Wed Jan 5
19:40:41 2005
@@ -94,6 +94,22 @@
{
return sourceRenderSize;
}
+
+ public void setDestination(BufferedImage destination)
+ {
+this.destination = destination;
+ }
+
+ public void setDestinationBands(int[] destinationBands)
+ {
+this.destinationBands = destinationBands;
+ }
+
+ public void setSourceProgressivePasses(int minPass, int numPasses)
+ {
+this.minProgressivePass = minPass;
+this.numProgressivePasses = numPasses;
+ }
public void setSourceRenderSize(Dimension size)
throws UnsupportedOperationException
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] [gump] recreating do_lockUTF Assertion
Guilhem, After browsing the kaffe sources i hit on a way to recrate the the problem. Please run java -cp . TraverseJAR /opt/__versions__/kaffe-dev/jre/lib/rt.jar with the classes here: http://brutus.apache.org/~dims/utf.zip. Here's the sample assertion i got: (also in out.txt in utf.zip) LOADED (Thread-33): java/awt/image/ImagingOpException LOADED (Thread-33): gnu/crypto/jce/key/KhazadKeyGeneratorImpl LOADED (Thread-33): gnu/crypto/jce/key/AnubisKeyGeneratorImpl kaffe-bin: utf8const.c:58: do_lockUTF: Assertion `utfLockRoot == ((void *)0)' failed. Please note that this does not happen all the time. I also got some segmentation faults on some runs. thanks, dims = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do you Yahoo!? The all-new My Yahoo! - Get yours free! http://my.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: accessibility fixes
PatchSet 5772
Date: 2005/01/05 20:16:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: accessibility fixes
Members:
ChangeLog:1.3316-1.3317
libraries/javalib/java/awt/CheckboxMenuItem.java:1.13-1.14
libraries/javalib/java/awt/Choice.java:1.4-1.5
libraries/javalib/java/awt/Dialog.java:1.11-1.12
libraries/javalib/java/awt/Frame.java:1.21-1.22
libraries/javalib/java/awt/List.java:1.4-1.5
libraries/javalib/java/awt/MenuComponent.java:1.14-1.15
libraries/javalib/java/awt/MenuItem.java:1.16-1.17
libraries/javalib/java/awt/ScrollPane.java:1.17-1.18
libraries/javalib/java/awt/Scrollbar.java:1.6-1.7
libraries/javalib/java/awt/Window.java:1.25-1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3316 kaffe/ChangeLog:1.3317
--- kaffe/ChangeLog:1.3316 Wed Jan 5 20:12:37 2005
+++ kaffe/ChangeLog Wed Jan 5 20:16:24 2005
@@ -2,6 +2,29 @@
Resynced with GNU Classpath.
+ 2004-12-29 Jerry Quinn [EMAIL PROTECTED]
+
+ * java/awt/CheckboxMenuItem.java (getAccessibleContext,
+ AccessibleAWTCheckboxMenuItem): Implement.
+ * java/awt/Choice.java: Add implements declaration for Accessible.
+ * java/awt/Dialog.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/Frame.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/List.java: Implement AccessibleAWTList,
AccessibleAWTListChild.
+ * java/awt/MenuComponent.java (accessibleContext): Make package visible.
+ * java/awt/MenuItem.java (getAccessibleContext): Implement.
+ * java/awt/Scrollbar.java (AccessibleAWTScrollbar,
getAccessibleContext):
+ Implement.
+ * java/awt/ScrollPane.java (AccessibleAWTScrollPane,
getAccessibleContext):
+ Implement.
+ * java/awt/Window.java (AccessibleAWTWindow): Implement.
+ (isActive, isFocused, getAccessibleContext): Implement.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Michael Koch [EMAIL PROTECTED]
* javax/swing/text/TextAction.java
Index: kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java
diff -u kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13
kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.14
--- kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13 Wed Nov 24
21:49:17 2004
+++ kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java Wed Jan 5
20:16:25 2005
@@ -43,6 +43,11 @@
import java.awt.peer.CheckboxMenuItemPeer;
import java.util.EventListener;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleValue;
+
/**
* This class implements a menu item that has a checkbox on it indicating
* the selected state of some option.
@@ -50,7 +55,8 @@
* @author Aaron M. Renn ([EMAIL PROTECTED])
* @author Tom Tromey [EMAIL PROTECTED]
*/
-public class CheckboxMenuItem extends MenuItem implements ItemSelectable
+public class CheckboxMenuItem extends MenuItem
+ implements ItemSelectable, Accessible
{
/*
@@ -315,5 +321,30 @@
{
return (ItemListener[]) getListeners (ItemListener.class);
}
+
+
+ protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
+implements AccessibleAction, AccessibleValue
+ {
+// I think the base class provides the necessary implementation
+ }
+
+ /**
+ * Gets the AccessibleContext associated with this codeList/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+/* Create the context if this is the first request */
+if (accessibleContext == null)
+ {
+/* Create the context */
+accessibleContext = new AccessibleAWTCheckboxMenuItem();
+ }
+return accessibleContext;
+ }
+
} // class CheckboxMenuItem
Index: kaffe/libraries/javalib/java/awt/Choice.java
diff -u kaffe/libraries/javalib/java/awt/Choice.java:1.4
kaffe/libraries/javalib/java/awt/Choice.java:1.5
--- kaffe/libraries/javalib/java/awt/Choice.java:1.4Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Choice.javaWed Jan 5 20:16:25 2005
@@ -45,6 +45,7 @@
import java.util.EventListener;
import java.util.Vector;
+import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -54,7 +55,8 @@
*
* @author Aaron M. Renn ([EMAIL PROTECTED])
*/
-public class Choice extends Component implements ItemSelectable, Serializable
+public class Choice extends Component
+ implements ItemSelectable, Serializable, Accessible
{
/*
Index: kaffe/libraries/javalib/java/awt/Dialog.java
diff -u
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: accessibility fixes
PatchSet 5772
Date: 2005/01/05 20:16:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: accessibility fixes
Members:
ChangeLog:1.3316-1.3317
libraries/javalib/java/awt/CheckboxMenuItem.java:1.13-1.14
libraries/javalib/java/awt/Choice.java:1.4-1.5
libraries/javalib/java/awt/Dialog.java:1.11-1.12
libraries/javalib/java/awt/Frame.java:1.21-1.22
libraries/javalib/java/awt/List.java:1.4-1.5
libraries/javalib/java/awt/MenuComponent.java:1.14-1.15
libraries/javalib/java/awt/MenuItem.java:1.16-1.17
libraries/javalib/java/awt/ScrollPane.java:1.17-1.18
libraries/javalib/java/awt/Scrollbar.java:1.6-1.7
libraries/javalib/java/awt/Window.java:1.25-1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3316 kaffe/ChangeLog:1.3317
--- kaffe/ChangeLog:1.3316 Wed Jan 5 20:12:37 2005
+++ kaffe/ChangeLog Wed Jan 5 20:16:24 2005
@@ -2,6 +2,29 @@
Resynced with GNU Classpath.
+ 2004-12-29 Jerry Quinn [EMAIL PROTECTED]
+
+ * java/awt/CheckboxMenuItem.java (getAccessibleContext,
+ AccessibleAWTCheckboxMenuItem): Implement.
+ * java/awt/Choice.java: Add implements declaration for Accessible.
+ * java/awt/Dialog.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/Frame.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/List.java: Implement AccessibleAWTList,
AccessibleAWTListChild.
+ * java/awt/MenuComponent.java (accessibleContext): Make package visible.
+ * java/awt/MenuItem.java (getAccessibleContext): Implement.
+ * java/awt/Scrollbar.java (AccessibleAWTScrollbar,
getAccessibleContext):
+ Implement.
+ * java/awt/ScrollPane.java (AccessibleAWTScrollPane,
getAccessibleContext):
+ Implement.
+ * java/awt/Window.java (AccessibleAWTWindow): Implement.
+ (isActive, isFocused, getAccessibleContext): Implement.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Michael Koch [EMAIL PROTECTED]
* javax/swing/text/TextAction.java
Index: kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java
diff -u kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13
kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.14
--- kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13 Wed Nov 24
21:49:17 2004
+++ kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java Wed Jan 5
20:16:25 2005
@@ -43,6 +43,11 @@
import java.awt.peer.CheckboxMenuItemPeer;
import java.util.EventListener;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleValue;
+
/**
* This class implements a menu item that has a checkbox on it indicating
* the selected state of some option.
@@ -50,7 +55,8 @@
* @author Aaron M. Renn ([EMAIL PROTECTED])
* @author Tom Tromey [EMAIL PROTECTED]
*/
-public class CheckboxMenuItem extends MenuItem implements ItemSelectable
+public class CheckboxMenuItem extends MenuItem
+ implements ItemSelectable, Accessible
{
/*
@@ -315,5 +321,30 @@
{
return (ItemListener[]) getListeners (ItemListener.class);
}
+
+
+ protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
+implements AccessibleAction, AccessibleValue
+ {
+// I think the base class provides the necessary implementation
+ }
+
+ /**
+ * Gets the AccessibleContext associated with this codeList/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+/* Create the context if this is the first request */
+if (accessibleContext == null)
+ {
+/* Create the context */
+accessibleContext = new AccessibleAWTCheckboxMenuItem();
+ }
+return accessibleContext;
+ }
+
} // class CheckboxMenuItem
Index: kaffe/libraries/javalib/java/awt/Choice.java
diff -u kaffe/libraries/javalib/java/awt/Choice.java:1.4
kaffe/libraries/javalib/java/awt/Choice.java:1.5
--- kaffe/libraries/javalib/java/awt/Choice.java:1.4Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Choice.javaWed Jan 5 20:16:25 2005
@@ -45,6 +45,7 @@
import java.util.EventListener;
import java.util.Vector;
+import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -54,7 +55,8 @@
*
* @author Aaron M. Renn ([EMAIL PROTECTED])
*/
-public class Choice extends Component implements ItemSelectable, Serializable
+public class Choice extends Component
+ implements ItemSelectable, Serializable, Accessible
{
/*
Index: kaffe/libraries/javalib/java/awt/Dialog.java
diff -u
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: accessibility fixes
PatchSet 5772
Date: 2005/01/05 20:16:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: accessibility fixes
Members:
ChangeLog:1.3316-1.3317
libraries/javalib/java/awt/CheckboxMenuItem.java:1.13-1.14
libraries/javalib/java/awt/Choice.java:1.4-1.5
libraries/javalib/java/awt/Dialog.java:1.11-1.12
libraries/javalib/java/awt/Frame.java:1.21-1.22
libraries/javalib/java/awt/List.java:1.4-1.5
libraries/javalib/java/awt/MenuComponent.java:1.14-1.15
libraries/javalib/java/awt/MenuItem.java:1.16-1.17
libraries/javalib/java/awt/ScrollPane.java:1.17-1.18
libraries/javalib/java/awt/Scrollbar.java:1.6-1.7
libraries/javalib/java/awt/Window.java:1.25-1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3316 kaffe/ChangeLog:1.3317
--- kaffe/ChangeLog:1.3316 Wed Jan 5 20:12:37 2005
+++ kaffe/ChangeLog Wed Jan 5 20:16:24 2005
@@ -2,6 +2,29 @@
Resynced with GNU Classpath.
+ 2004-12-29 Jerry Quinn [EMAIL PROTECTED]
+
+ * java/awt/CheckboxMenuItem.java (getAccessibleContext,
+ AccessibleAWTCheckboxMenuItem): Implement.
+ * java/awt/Choice.java: Add implements declaration for Accessible.
+ * java/awt/Dialog.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/Frame.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/List.java: Implement AccessibleAWTList,
AccessibleAWTListChild.
+ * java/awt/MenuComponent.java (accessibleContext): Make package visible.
+ * java/awt/MenuItem.java (getAccessibleContext): Implement.
+ * java/awt/Scrollbar.java (AccessibleAWTScrollbar,
getAccessibleContext):
+ Implement.
+ * java/awt/ScrollPane.java (AccessibleAWTScrollPane,
getAccessibleContext):
+ Implement.
+ * java/awt/Window.java (AccessibleAWTWindow): Implement.
+ (isActive, isFocused, getAccessibleContext): Implement.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Michael Koch [EMAIL PROTECTED]
* javax/swing/text/TextAction.java
Index: kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java
diff -u kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13
kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.14
--- kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13 Wed Nov 24
21:49:17 2004
+++ kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java Wed Jan 5
20:16:25 2005
@@ -43,6 +43,11 @@
import java.awt.peer.CheckboxMenuItemPeer;
import java.util.EventListener;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleValue;
+
/**
* This class implements a menu item that has a checkbox on it indicating
* the selected state of some option.
@@ -50,7 +55,8 @@
* @author Aaron M. Renn ([EMAIL PROTECTED])
* @author Tom Tromey [EMAIL PROTECTED]
*/
-public class CheckboxMenuItem extends MenuItem implements ItemSelectable
+public class CheckboxMenuItem extends MenuItem
+ implements ItemSelectable, Accessible
{
/*
@@ -315,5 +321,30 @@
{
return (ItemListener[]) getListeners (ItemListener.class);
}
+
+
+ protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
+implements AccessibleAction, AccessibleValue
+ {
+// I think the base class provides the necessary implementation
+ }
+
+ /**
+ * Gets the AccessibleContext associated with this codeList/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+/* Create the context if this is the first request */
+if (accessibleContext == null)
+ {
+/* Create the context */
+accessibleContext = new AccessibleAWTCheckboxMenuItem();
+ }
+return accessibleContext;
+ }
+
} // class CheckboxMenuItem
Index: kaffe/libraries/javalib/java/awt/Choice.java
diff -u kaffe/libraries/javalib/java/awt/Choice.java:1.4
kaffe/libraries/javalib/java/awt/Choice.java:1.5
--- kaffe/libraries/javalib/java/awt/Choice.java:1.4Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Choice.javaWed Jan 5 20:16:25 2005
@@ -45,6 +45,7 @@
import java.util.EventListener;
import java.util.Vector;
+import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -54,7 +55,8 @@
*
* @author Aaron M. Renn ([EMAIL PROTECTED])
*/
-public class Choice extends Component implements ItemSelectable, Serializable
+public class Choice extends Component
+ implements ItemSelectable, Serializable, Accessible
{
/*
Index: kaffe/libraries/javalib/java/awt/Dialog.java
diff -u
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: accessibility fixes
PatchSet 5772
Date: 2005/01/05 20:16:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: accessibility fixes
Members:
ChangeLog:1.3316-1.3317
libraries/javalib/java/awt/CheckboxMenuItem.java:1.13-1.14
libraries/javalib/java/awt/Choice.java:1.4-1.5
libraries/javalib/java/awt/Dialog.java:1.11-1.12
libraries/javalib/java/awt/Frame.java:1.21-1.22
libraries/javalib/java/awt/List.java:1.4-1.5
libraries/javalib/java/awt/MenuComponent.java:1.14-1.15
libraries/javalib/java/awt/MenuItem.java:1.16-1.17
libraries/javalib/java/awt/ScrollPane.java:1.17-1.18
libraries/javalib/java/awt/Scrollbar.java:1.6-1.7
libraries/javalib/java/awt/Window.java:1.25-1.26
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3316 kaffe/ChangeLog:1.3317
--- kaffe/ChangeLog:1.3316 Wed Jan 5 20:12:37 2005
+++ kaffe/ChangeLog Wed Jan 5 20:16:24 2005
@@ -2,6 +2,29 @@
Resynced with GNU Classpath.
+ 2004-12-29 Jerry Quinn [EMAIL PROTECTED]
+
+ * java/awt/CheckboxMenuItem.java (getAccessibleContext,
+ AccessibleAWTCheckboxMenuItem): Implement.
+ * java/awt/Choice.java: Add implements declaration for Accessible.
+ * java/awt/Dialog.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/Frame.java (AccessibleAWTFrame, getAccessibleContext):
+ Implement.
+ * java/awt/List.java: Implement AccessibleAWTList,
AccessibleAWTListChild.
+ * java/awt/MenuComponent.java (accessibleContext): Make package visible.
+ * java/awt/MenuItem.java (getAccessibleContext): Implement.
+ * java/awt/Scrollbar.java (AccessibleAWTScrollbar,
getAccessibleContext):
+ Implement.
+ * java/awt/ScrollPane.java (AccessibleAWTScrollPane,
getAccessibleContext):
+ Implement.
+ * java/awt/Window.java (AccessibleAWTWindow): Implement.
+ (isActive, isFocused, getAccessibleContext): Implement.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Michael Koch [EMAIL PROTECTED]
* javax/swing/text/TextAction.java
Index: kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java
diff -u kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13
kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.14
--- kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.13 Wed Nov 24
21:49:17 2004
+++ kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java Wed Jan 5
20:16:25 2005
@@ -43,6 +43,11 @@
import java.awt.peer.CheckboxMenuItemPeer;
import java.util.EventListener;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleValue;
+
/**
* This class implements a menu item that has a checkbox on it indicating
* the selected state of some option.
@@ -50,7 +55,8 @@
* @author Aaron M. Renn ([EMAIL PROTECTED])
* @author Tom Tromey [EMAIL PROTECTED]
*/
-public class CheckboxMenuItem extends MenuItem implements ItemSelectable
+public class CheckboxMenuItem extends MenuItem
+ implements ItemSelectable, Accessible
{
/*
@@ -315,5 +321,30 @@
{
return (ItemListener[]) getListeners (ItemListener.class);
}
+
+
+ protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
+implements AccessibleAction, AccessibleValue
+ {
+// I think the base class provides the necessary implementation
+ }
+
+ /**
+ * Gets the AccessibleContext associated with this codeList/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
+ public AccessibleContext getAccessibleContext()
+ {
+/* Create the context if this is the first request */
+if (accessibleContext == null)
+ {
+/* Create the context */
+accessibleContext = new AccessibleAWTCheckboxMenuItem();
+ }
+return accessibleContext;
+ }
+
} // class CheckboxMenuItem
Index: kaffe/libraries/javalib/java/awt/Choice.java
diff -u kaffe/libraries/javalib/java/awt/Choice.java:1.4
kaffe/libraries/javalib/java/awt/Choice.java:1.5
--- kaffe/libraries/javalib/java/awt/Choice.java:1.4Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Choice.javaWed Jan 5 20:16:25 2005
@@ -45,6 +45,7 @@
import java.util.EventListener;
import java.util.Vector;
+import javax.accessibility.Accessible;
import javax.accessibility.AccessibleAction;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
@@ -54,7 +55,8 @@
*
* @author Aaron M. Renn ([EMAIL PROTECTED])
*/
-public class Choice extends Component implements ItemSelectable, Serializable
+public class Choice extends Component
+ implements ItemSelectable, Serializable, Accessible
{
/*
Index: kaffe/libraries/javalib/java/awt/Dialog.java
diff -u
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: import cleanups
PatchSet 5768 Date: 2005/01/05 20:06:41 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: import cleanups Members: ChangeLog:1.3312-1.3313 libraries/javalib/java/awt/Button.java:1.7-1.8 libraries/javalib/java/lang/System.java:1.44-1.45 libraries/javalib/java/security/cert/X509CRLSelector.java:1.4-1.5 libraries/javalib/java/security/cert/X509CertSelector.java:1.3-1.4 libraries/javalib/java/util/ResourceBundle.java:1.23-1.24 libraries/javalib/java/util/jar/JarFile.java:1.8-1.9 libraries/javalib/javax/swing/JApplet.java:1.4-1.5 libraries/javalib/javax/swing/JFormattedTextField.java:1.6-1.7 libraries/javalib/javax/swing/JTree.java:1.10-1.11 libraries/javalib/javax/swing/JWindow.java:1.5-1.6 libraries/javalib/javax/swing/TransferHandler.java:1.4-1.5 libraries/javalib/javax/swing/plaf/basic/BasicEditorPaneUI.java:1.1-1.2 libraries/javalib/javax/swing/plaf/basic/BasicTextPaneUI.java:1.2-1.3 libraries/javalib/javax/swing/plaf/basic/BasicTreeUI.java:1.3-1.4 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3312 kaffe/ChangeLog:1.3313 --- kaffe/ChangeLog:1.3312 Wed Jan 5 19:45:25 2005 +++ kaffe/ChangeLog Wed Jan 5 20:06:41 2005 @@ -2,6 +2,29 @@ Resynced with GNU Classpath. + 2004-12-29 Michael Koch [EMAIL PROTECTED] + + * java/awt/Button.java, + java/lang/Runtime.java, + java/lang/System.java, + java/security/cert/X509CRLSelector.java, + java/security/cert/X509CertSelector.java, + java/util/ResourceBundle.java, + java/util/jar/JarFile.java, + javax/swing/JApplet.java, + javax/swing/JFormattedTextField.java, + javax/swing/JTree.java, + javax/swing/JWindow.java, + javax/swing/TransferHandler.java, + javax/swing/plaf/basic/BasicEditorPaneUI.java, + javax/swing/plaf/basic/BasicTextPaneUI.java + javax/swing/plaf/basic/BasicTreeUI.java: + Imports reworked. + +2005-01-05 Dalibor Topic [EMAIL PROTECTED] + + Resynced with GNU Classpath. + 2004-12-27 Jeroen Frijters [EMAIL PROTECTED] * java/nio/ByteBufferImpl.java, Index: kaffe/libraries/javalib/java/awt/Button.java diff -u kaffe/libraries/javalib/java/awt/Button.java:1.7 kaffe/libraries/javalib/java/awt/Button.java:1.8 --- kaffe/libraries/javalib/java/awt/Button.java:1.7Fri Dec 3 01:56:21 2004 +++ kaffe/libraries/javalib/java/awt/Button.javaWed Jan 5 20:06:43 2005 @@ -47,7 +47,6 @@ import javax.accessibility.Accessible; import javax.accessibility.AccessibleAction; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRelation; import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleValue; Index: kaffe/libraries/javalib/java/lang/System.java diff -u kaffe/libraries/javalib/java/lang/System.java:1.44 kaffe/libraries/javalib/java/lang/System.java:1.45 --- kaffe/libraries/javalib/java/lang/System.java:1.44 Mon Jan 3 06:44:22 2005 +++ kaffe/libraries/javalib/java/lang/System.java Wed Jan 5 20:06:43 2005 @@ -10,7 +10,6 @@ package java.lang; -import gnu.classpath.Configuration; import gnu.classpath.SystemProperties; import java.io.BufferedInputStream; Index: kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java diff -u kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.4 kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.5 --- kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java:1.4 Wed Dec 8 07:22:35 2004 +++ kaffe/libraries/javalib/java/security/cert/X509CRLSelector.java Wed Jan 5 20:06:44 2005 @@ -45,7 +45,6 @@ import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; -import java.security.AccessController; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Index: kaffe/libraries/javalib/java/security/cert/X509CertSelector.java diff -u kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.3 kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.4 --- kaffe/libraries/javalib/java/security/cert/X509CertSelector.java:1.3 Wed Dec 8 07:22:35 2004 +++ kaffe/libraries/javalib/java/security/cert/X509CertSelector.javaWed Jan 5 20:06:44 2005 @@ -43,7 +43,6 @@ import java.io.IOException; import java.math.BigInteger; -import java.security.AccessController; import java.security.KeyFactory; import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; Index: kaffe/libraries/javalib/java/util/ResourceBundle.java diff -u kaffe/libraries/javalib/java/util/ResourceBundle.java:1.23 kaffe/libraries/javalib/java/util/ResourceBundle.java:1.24 --- kaffe/libraries/javalib/java/util/ResourceBundle.java:1.23 Sat Nov 27 20:21:45 2004 +++
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fixes for JFormattedTextField
PatchSet 5775
Date: 2005/01/05 23:02:34
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: fixes for JFormattedTextField
Members:
ChangeLog:1.3319-1.3320
libraries/javalib/javax/swing/JFormattedTextField.java:1.7-1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3319 kaffe/ChangeLog:1.3320
--- kaffe/ChangeLog:1.3319 Wed Jan 5 22:56:08 2005
+++ kaffe/ChangeLog Wed Jan 5 23:02:34 2005
@@ -1,6 +1,16 @@
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
Resynced with GNU Classpath.
+
+ 2004-12-30 Michael Koch [EMAIL PROTECTED]
+
+ * javax/swing/JFormattedTextField.java
+ (getFocusLostBehavior): Fixed typo in method name.
+ (setFocusLostBehavior): Likewise.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
2004-12-29 Mark Wielaard [EMAIL PROTECTED]
Index: kaffe/libraries/javalib/javax/swing/JFormattedTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.7
kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.8
--- kaffe/libraries/javalib/javax/swing/JFormattedTextField.java:1.7Wed Jan
5 20:06:46 2005
+++ kaffe/libraries/javalib/javax/swing/JFormattedTextField.javaWed Jan
5 23:02:37 2005
@@ -199,7 +199,7 @@
throw new InternalError (not implemented);
}
- public int getFocusLostBehaviour ()
+ public int getFocusLostBehavior()
{
return focusLostBehavior;
}
@@ -252,7 +252,7 @@
super.setDocument(newDocument);
}
- public void setLostFocusBehavior (int behavior)
+ public void setFocusLostBehavior(int behavior)
{
if (behavior != COMMIT
behavior != COMMIT_OR_REVERT
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Fixed synchronization problems when opening ZipFiles
PatchSet 5773
Date: 2005/01/05 22:40:55
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed synchronization problems when opening ZipFiles
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
* libraries/javalib/java/util/zip/ZipFile.java (ZipFile):
Synchronize on file name before calling native method, in order to
avoid races between threads trying to load the same file and
getting confused in the jar file cache.
Reported by: Davanum Srinivas [EMAIL PROTECTED]
* kaffe/kaffevm/jar.c (findCachedJarFile): Renamed from findJarFile.
(openJarFile): Use findCachedJarFile.
(closeJarFile, findCachedJarFile, cacheJarFile): Added debug output.
Members:
ChangeLog:1.3317-1.3318
kaffe/kaffevm/jar.c:1.34-1.35
libraries/javalib/java/util/zip/ZipFile.java:1.15-1.16
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3317 kaffe/ChangeLog:1.3318
--- kaffe/ChangeLog:1.3317 Wed Jan 5 20:16:24 2005
+++ kaffe/ChangeLog Wed Jan 5 22:40:55 2005
@@ -1,5 +1,18 @@
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+ * libraries/javalib/java/util/zip/ZipFile.java (ZipFile):
+ Synchronize on file name before calling native method, in order to
+ avoid races between threads trying to load the same file and
+ getting confused in the jar file cache.
+
+ Reported by: Davanum Srinivas [EMAIL PROTECTED]
+
+ * kaffe/kaffevm/jar.c (findCachedJarFile): Renamed from findJarFile.
+ (openJarFile): Use findCachedJarFile.
+ (closeJarFile, findCachedJarFile, cacheJarFile): Added debug output.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
Resynced with GNU Classpath.
2004-12-29 Jerry Quinn [EMAIL PROTECTED]
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.34 kaffe/kaffe/kaffevm/jar.c:1.35
--- kaffe/kaffe/kaffevm/jar.c:1.34 Tue Dec 21 08:06:37 2004
+++ kaffe/kaffe/kaffevm/jar.c Wed Jan 5 22:40:58 2005
@@ -101,9 +101,8 @@
* Find a cached jarFile object. If the file is found, it is returned and its
* user count is incremented.
*
- * XXX rename findCachedJarFile()
*/
-static jarFile *findJarFile(char *name)
+static jarFile *findCachedJarFile(char *name)
{
jarFile *curr, **prev, *retval = NULL;
#if !defined(KAFFEH)
@@ -131,6 +130,8 @@
retval = curr;
retval-users++;
+DBG(JARFILES, dprintf(Found cached jar file %s, %d users\n,
retval-fileName, retval-users); );
+
assert(retval-users = 1);
}
prev = curr-next;
@@ -232,6 +233,9 @@
*prev = curr-next;
retval = curr;
retval-users++;
+
+DBG(JARFILES, dprintf(Found cached jar file %s, %d users\n,
retval-fileName, retval-users); );
+
}
else
{
@@ -249,6 +253,9 @@
*prev = curr-next;
curr-flags = ~JFF_CACHED;
dead_jar = curr;
+
+DBG(JARFILES, dprintf(Cached jar file %s purged\n, curr-fileName); );
+
}
/*
* `jf' is redundant so the number of cached files
@@ -1054,7 +1061,7 @@
assert(name != NULL);
/* Look for it in the cache first */
- if( (retval = findJarFile(name)) )
+ if( (retval = findCachedJarFile(name)) )
{
/* Check if we need to reopen the file */
if( (retval-fd == -1)
@@ -1191,6 +1198,8 @@
lockStaticMutex(jarCache.lock);
jf-users--;
+DBG(JARFILES, dprintf(Closing jar file %s, users %d\n, jf-fileName,
jf-users); );
+
if( jf-users == 0 )
{
if( jarCache.count = JAR_FILE_CACHE_MAX )
Index: kaffe/libraries/javalib/java/util/zip/ZipFile.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.15
kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.16
--- kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.15 Fri Dec 24
21:04:27 2004
+++ kaffe/libraries/javalib/java/util/zip/ZipFile.java Wed Jan 5 22:40:58 2005
@@ -44,7 +44,10 @@
public ZipFile(String fname) throws IOException
{
name = fname;
- zip = openZipFile0(fname);
+ /* only have one thread at a time attempt to open the zip file */
+ synchronized(fname) {
+ zip = openZipFile0(fname);
+ }
if (zip == null) {
throw new IOException(No such zip file + fname);
}
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] CVS kaffe (robilad): Fixed synchronization problems when opening ZipFiles
Hi,
On Wed, 2005-01-05 at 14:49 -0800, Kaffe CVS wrote:
public ZipFile(String fname) throws IOException
{
name = fname;
- zip = openZipFile0(fname);
+ /* only have one thread at a time attempt to open the zip file */
+ synchronized(fname) {
+ zip = openZipFile0(fname);
+ }
Note that strings don't have to be unique objects. You might want to do
a fname = fname.intern() first to be sure. And depending on how
openZipFile0 works (I haven't actually checked) you might want to make
sure that it recognizes different paths to the same file correctly.
The safest would be to just synchronize on ZipFile.class
Cheers,
Mark
signature.asc
Description: This is a digitally signed message part
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: metal plaf and awt fixes
PatchSet 5780
Date: 2005/01/06 00:15:31
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: metal plaf and awt fixes
Members:
ChangeLog:1.3324-1.3325
libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.7-1.8
libraries/javalib/java/awt/Window.java:1.26-1.27
libraries/javalib/javax/swing/plaf/metal/DefaultMetalTheme.java:1.1-1.2
libraries/javalib/javax/swing/plaf/metal/MetalTheme.java:1.2-1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3324 kaffe/ChangeLog:1.3325
--- kaffe/ChangeLog:1.3324 Thu Jan 6 00:09:03 2005
+++ kaffe/ChangeLog Thu Jan 6 00:15:31 2005
@@ -4,6 +4,49 @@
2004-12-30 Michael Koch [EMAIL PROTECTED]
+ * gnu/java/awt/peer/gtk/GtkToolkit.java:
+ Explicitely import used classes.
+ (getLocalGraphicsEnvironment): Simplify.
+ * java/awt/Window.java (Window):
+ Enable code to get the default GraphicsConfiguration.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
+ 2004-12-30 Michael Koch [EMAIL PROTECTED]
+
+ * javax/swing/plaf/metal/DefaultMetalTheme.java
+ (CONTROL_TEXT_FONT): New static field.
+ (MENU_TEXT_FONT): Likewise.
+ (SUB_TEXT_FONT): Likewise.
+ (SYSTEM_TEXT_FONT): Likewise.
+ (USER_TEXT_FONT): Likewise.
+ (WINDOW_TITLE_FONT): Likewise.
+ (getControlTextFont): New method.
+ (getMenuTextFont): Likewise.
+ (getSubTextFont): Likewise.
+ (getSystemTextFont): Likewise.
+ (getUserTextFont): Likewise.
+ (getWindowTitleFont): Likewise.
+ * javax/swing/plaf/metal/MetalTheme.java
+ (BLACK): Initialize with Color.BLACK.
+ (WHITE): Initialize with Color.WHITE.
+ (getInactiveControlTextColor): Return getControlDisabled().
+ (getMenuDisabledForeground): Return getSecondary3().
+ (getControlTextFont): New abstract method.
+ (getMenuTextFont): Likewise.
+ (getSubTextFont): Likewise.
+ (getSystemTextFont): Likewise.
+ (getUserTextFont): Likewise.
+ (getWindowTitleFont): Likewise.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
+ 2004-12-30 Michael Koch [EMAIL PROTECTED]
+
* java/text/DateFormat.java
(getAvailableLocales): Implemented.
* java/util/Locale.java
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.7
kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.8
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.7 Sun Nov
14 22:14:41 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java Thu Jan
6 00:15:32 2005
@@ -59,12 +59,14 @@
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
import java.awt.peer.*;
+import java.io.InputStream;
import java.net.URL;
import java.text.AttributedString;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.Properties;
@@ -313,7 +315,7 @@
SansSerif });
}
- private class LRUCache extends java.util.LinkedHashMap
+ private class LRUCache extends LinkedHashMap
{
int max_entries;
public LRUCache(int max)
@@ -613,15 +615,11 @@
public GraphicsEnvironment getLocalGraphicsEnvironment()
{
-GraphicsEnvironment ge;
-ge = new GdkGraphicsEnvironment ();
-return ge;
+return new GdkGraphicsEnvironment();
}
- public Font createFont(int format, java.io.InputStream stream)
+ public Font createFont(int format, InputStream stream)
{
-throw new java.lang.UnsupportedOperationException ();
+throw new UnsupportedOperationException();
}
-
-
-} // class GtkToolkit
+}
Index: kaffe/libraries/javalib/java/awt/Window.java
diff -u kaffe/libraries/javalib/java/awt/Window.java:1.26
kaffe/libraries/javalib/java/awt/Window.java:1.27
--- kaffe/libraries/javalib/java/awt/Window.java:1.26 Wed Jan 5 20:16:27 2005
+++ kaffe/libraries/javalib/java/awt/Window.javaThu Jan 6 00:15:32 2005
@@ -218,12 +218,11 @@
gc.getDevice().getType() != GraphicsDevice.TYPE_RASTER_SCREEN)
throw new IllegalArgumentException (gc must be from a screen device);
-// FIXME: until we implement this, it just causes AWT to crash.
-// if (gc == null)
-// graphicsConfiguration =
GraphicsEnvironment.getLocalGraphicsEnvironment()
-// .getDefaultScreenDevice()
-// .getDefaultConfiguration();
-// else
+if (gc == null)
+ graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment()
+ .getDefaultScreenDevice()
+
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: accesibility fixes
PatchSet 5782
Date: 2005/01/06 00:22:45
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: accesibility fixes
Members:
ChangeLog:1.3326-1.3327
libraries/javalib/java/awt/Button.java:1.8-1.9
libraries/javalib/java/awt/Canvas.java:1.16-1.17
libraries/javalib/java/awt/Checkbox.java:1.3-1.4
libraries/javalib/java/awt/CheckboxMenuItem.java:1.14-1.15
libraries/javalib/java/awt/Choice.java:1.5-1.6
libraries/javalib/java/awt/Dialog.java:1.12-1.13
libraries/javalib/java/awt/Frame.java:1.22-1.23
libraries/javalib/java/awt/Label.java:1.6-1.7
libraries/javalib/java/awt/List.java:1.5-1.6
libraries/javalib/java/awt/Menu.java:1.13-1.14
libraries/javalib/java/awt/MenuBar.java:1.10-1.11
libraries/javalib/java/awt/MenuItem.java:1.17-1.18
libraries/javalib/java/awt/PopupMenu.java:1.11-1.12
libraries/javalib/java/awt/ScrollPane.java:1.18-1.19
libraries/javalib/java/awt/Scrollbar.java:1.7-1.8
libraries/javalib/java/awt/TextArea.java:1.6-1.7
libraries/javalib/java/awt/TextComponent.java:1.4-1.5
libraries/javalib/java/awt/Window.java:1.27-1.28
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3326 kaffe/ChangeLog:1.3327
--- kaffe/ChangeLog:1.3326 Thu Jan 6 00:20:15 2005
+++ kaffe/ChangeLog Thu Jan 6 00:22:45 2005
@@ -2,6 +2,39 @@
Resynced with GNU Classpath.
+ 2004-12-29 Jerry Quinn [EMAIL PROTECTED]
+
+ * java/awt/Button.java,
+ java/awt/Canvas.java,
+ java/awt/Checkbox.java,
+ java/awt/CheckboxMenuItem.java,
+ java/awt/Choice.java,
+ java/awt/Dialog.java,
+ java/awt/Frame.java,
+ java/awt/Label.java,
+ java/awt/List.java,
+ java/awt/Menu.java,
+ java/awt/MenuBar.java,
+ java/awt/MenuItem.java,
+ java/awt/PopupMenu.java,
+ java/awt/ScrollPane.java,
+ java/awt/Scrollbar.java,
+ java/awt/TextArea.java,
+ java/awt/Window.java (getAccessibleContext): Clean up comments.
+ Reformat.
+ * java/awt/Button.java,
+ java/awt/Checkbox.java,
+ java/awt/Choice.java,
+ java/awt/Menu.java,
+ java/awt/PopupMenu.java,
+ java/awt/TextArea.java (getAccessibleContext): Only create new
+ accessible once.
+ * java/awt/TextComponent.java (getAccessibleContext): Implement.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-30 Michael Koch [EMAIL PROTECTED]
* javax/imageio/metadata/IIOInvalidTreeException.java
Index: kaffe/libraries/javalib/java/awt/Button.java
diff -u kaffe/libraries/javalib/java/awt/Button.java:1.8
kaffe/libraries/javalib/java/awt/Button.java:1.9
--- kaffe/libraries/javalib/java/awt/Button.java:1.8Wed Jan 5 20:06:43 2005
+++ kaffe/libraries/javalib/java/awt/Button.javaThu Jan 6 00:22:46 2005
@@ -428,9 +428,18 @@
+ getWidth () + x + getHeight () + ,label= + getLabel ();
}
+/**
+ * Gets the AccessibleContext associated with this codeButton/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- return new AccessibleAWTButton();
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+accessibleContext = new AccessibleAWTButton();
+ return accessibleContext;
}
/**
Index: kaffe/libraries/javalib/java/awt/Canvas.java
diff -u kaffe/libraries/javalib/java/awt/Canvas.java:1.16
kaffe/libraries/javalib/java/awt/Canvas.java:1.17
--- kaffe/libraries/javalib/java/awt/Canvas.java:1.16 Wed Nov 24 21:49:17 2004
+++ kaffe/libraries/javalib/java/awt/Canvas.javaThu Jan 6 00:22:46 2005
@@ -174,10 +174,7 @@
{
/* Create the context if this is the first request */
if (accessibleContext == null)
- {
-/* Create the context */
-accessibleContext = new AccessibleAWTCanvas();
- }
+ accessibleContext = new AccessibleAWTCanvas();
return accessibleContext;
}
Index: kaffe/libraries/javalib/java/awt/Checkbox.java
diff -u kaffe/libraries/javalib/java/awt/Checkbox.java:1.3
kaffe/libraries/javalib/java/awt/Checkbox.java:1.4
--- kaffe/libraries/javalib/java/awt/Checkbox.java:1.3 Fri Dec 3 01:56:21 2004
+++ kaffe/libraries/javalib/java/awt/Checkbox.java Thu Jan 6 00:22:46 2005
@@ -490,11 +490,22 @@
+ , + super.paramString());
}
+/**
+ * Gets the AccessibleContext associated with this codeCheckBox/code.
+ * The context is created, if necessary.
+ *
+ * @return the associated context
+ */
public AccessibleContext getAccessibleContext()
{
- AccessibleAWTCheckBox ac = new AccessibleAWTCheckBox();
- addItemListener(ac);
- return ac;
+ /* Create the context if this is the first request */
+ if (accessibleContext == null)
+ {
+AccessibleAWTCheckBox ac = new
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: olga's swing fixes
PatchSet 5783
Date: 2005/01/06 00:53:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: olga's swing fixes
Members:
ChangeLog:1.3327-1.3328
libraries/javalib/javax/swing/JTable.java:1.12-1.13
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7-1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3327 kaffe/ChangeLog:1.3328
--- kaffe/ChangeLog:1.3327 Thu Jan 6 00:22:45 2005
+++ kaffe/ChangeLog Thu Jan 6 00:53:04 2005
@@ -2,6 +2,37 @@
Resynced with GNU Classpath.
+ 2004-12-30 Olga Rodimina [EMAIL PROTECTED]
+
+ (prepareRenderer): Get column's index in dataModel instead
+ of column's view index.
+ (getColumnCount): return count of the columns in ColumnModel,
+ not in dataModel.
+ (removeColumn): Implemented.
+ (moveColumm): Likewise.
+ (setRowHeight): throw IllegalArgumentException if height is
+ less then 1.
+ * javax/swing/table/DefaultTableColumnModel.java: Add javadocs.
+ (DefaultTableColumnModel):Add call to createSelectionModel().
+ (addColumn): Fire columnAdded event to registered listeners.
+ (removeColumn): Fire columnRemoved event to registered listeners.
+ (moveColumn): Fire columnMoved event to registered listeners.
+ (setColumnMargin): Fire ColumnMarginChanged event to registered
listeners.
+ (getColumnIndex): Changed parameter name.
+ (setColumnSelectionAllowed): Likewise.
+ (fireColumnAdded): Implemented.
+ (fireColumnRemoved): Likewise.
+ (fireColumnMoved): Likewise.
+ (fireColumnMarginChanged): Likewise.
+ (getListeners): Changed parameter name.
+ (propertyChange): Implemented.
+ (valueChanged): Changed parameter name.
+ (createSelectionModel): Implemented.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Jerry Quinn [EMAIL PROTECTED]
* java/awt/Button.java,
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.12
kaffe/libraries/javalib/javax/swing/JTable.java:1.13
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.12Thu Dec 23
02:53:50 2004
+++ kaffe/libraries/javalib/javax/swing/JTable.java Thu Jan 6 00:53:05 2005
@@ -42,7 +42,6 @@
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
-import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
@@ -788,7 +787,7 @@
return renderer.getTableCellRendererComponent(this,
dataModel.getValueAt(row,
-
convertColumnIndexToView(column)),
+
convertColumnIndexToModel(column)),
isSelected,
false, // hasFocus
row, column);
@@ -867,13 +866,13 @@
/**
* Get the value of the [EMAIL PROTECTED] #columnCount} property by
- * delegation to the @{link #dataModel} field.
+ * delegation to the @{link #columnModel} field.
*
* @return The current value of the columnCount property
*/
public int getColumnCount()
{
-return dataModel.getColumnCount();
+return columnModel.getColumnCount();
}
/**
@@ -1131,10 +1130,25 @@
return tableHeader;
}
+ /**
+ * Removes specified column from displayable columns of this table.
+ *
+ * @param column column to removed
+ */
public void removeColumn(TableColumn column)
+ {
+columnModel.removeColumn(column);
+ }
+
+ /**
+ * Moves column at the specified index to new given location.
+ *
+ * @param column index of the column to move
+ * @param targetColumn index specifying new location of the column
+ */
+ public void moveColumn(int column,int targetColumn)
{
-// FIXME: Implement me.
-throw new Error(not implemented);
+columnModel.moveColumn(column, targetColumn);
}
/**
@@ -1166,6 +1180,9 @@
*/
public void setRowHeight(int r)
{
+if (rowHeight 1)
+ throw new IllegalArgumentException();
+
rowHeight = r;
revalidate();
repaint();
Index: kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
diff -u
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.8
--- kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
Sun Oct 24 13:39:21 2004
+++ kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
Thu Jan 6 00:53:06 2005
@@ -66,37 +66,37 @@
private static final long serialVersionUID = 6580012493508960512L;
/**
- * tableColumns
+
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: olga's swing fixes
PatchSet 5783
Date: 2005/01/06 00:53:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: olga's swing fixes
Members:
ChangeLog:1.3327-1.3328
libraries/javalib/javax/swing/JTable.java:1.12-1.13
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7-1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3327 kaffe/ChangeLog:1.3328
--- kaffe/ChangeLog:1.3327 Thu Jan 6 00:22:45 2005
+++ kaffe/ChangeLog Thu Jan 6 00:53:04 2005
@@ -2,6 +2,37 @@
Resynced with GNU Classpath.
+ 2004-12-30 Olga Rodimina [EMAIL PROTECTED]
+
+ (prepareRenderer): Get column's index in dataModel instead
+ of column's view index.
+ (getColumnCount): return count of the columns in ColumnModel,
+ not in dataModel.
+ (removeColumn): Implemented.
+ (moveColumm): Likewise.
+ (setRowHeight): throw IllegalArgumentException if height is
+ less then 1.
+ * javax/swing/table/DefaultTableColumnModel.java: Add javadocs.
+ (DefaultTableColumnModel):Add call to createSelectionModel().
+ (addColumn): Fire columnAdded event to registered listeners.
+ (removeColumn): Fire columnRemoved event to registered listeners.
+ (moveColumn): Fire columnMoved event to registered listeners.
+ (setColumnMargin): Fire ColumnMarginChanged event to registered
listeners.
+ (getColumnIndex): Changed parameter name.
+ (setColumnSelectionAllowed): Likewise.
+ (fireColumnAdded): Implemented.
+ (fireColumnRemoved): Likewise.
+ (fireColumnMoved): Likewise.
+ (fireColumnMarginChanged): Likewise.
+ (getListeners): Changed parameter name.
+ (propertyChange): Implemented.
+ (valueChanged): Changed parameter name.
+ (createSelectionModel): Implemented.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Jerry Quinn [EMAIL PROTECTED]
* java/awt/Button.java,
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.12
kaffe/libraries/javalib/javax/swing/JTable.java:1.13
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.12Thu Dec 23
02:53:50 2004
+++ kaffe/libraries/javalib/javax/swing/JTable.java Thu Jan 6 00:53:05 2005
@@ -42,7 +42,6 @@
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
-import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
@@ -788,7 +787,7 @@
return renderer.getTableCellRendererComponent(this,
dataModel.getValueAt(row,
-
convertColumnIndexToView(column)),
+
convertColumnIndexToModel(column)),
isSelected,
false, // hasFocus
row, column);
@@ -867,13 +866,13 @@
/**
* Get the value of the [EMAIL PROTECTED] #columnCount} property by
- * delegation to the @{link #dataModel} field.
+ * delegation to the @{link #columnModel} field.
*
* @return The current value of the columnCount property
*/
public int getColumnCount()
{
-return dataModel.getColumnCount();
+return columnModel.getColumnCount();
}
/**
@@ -1131,10 +1130,25 @@
return tableHeader;
}
+ /**
+ * Removes specified column from displayable columns of this table.
+ *
+ * @param column column to removed
+ */
public void removeColumn(TableColumn column)
+ {
+columnModel.removeColumn(column);
+ }
+
+ /**
+ * Moves column at the specified index to new given location.
+ *
+ * @param column index of the column to move
+ * @param targetColumn index specifying new location of the column
+ */
+ public void moveColumn(int column,int targetColumn)
{
-// FIXME: Implement me.
-throw new Error(not implemented);
+columnModel.moveColumn(column, targetColumn);
}
/**
@@ -1166,6 +1180,9 @@
*/
public void setRowHeight(int r)
{
+if (rowHeight 1)
+ throw new IllegalArgumentException();
+
rowHeight = r;
revalidate();
repaint();
Index: kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
diff -u
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.8
--- kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
Sun Oct 24 13:39:21 2004
+++ kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
Thu Jan 6 00:53:06 2005
@@ -66,37 +66,37 @@
private static final long serialVersionUID = 6580012493508960512L;
/**
- * tableColumns
+
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: olga's swing fixes
PatchSet 5783
Date: 2005/01/06 00:53:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: olga's swing fixes
Members:
ChangeLog:1.3327-1.3328
libraries/javalib/javax/swing/JTable.java:1.12-1.13
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7-1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3327 kaffe/ChangeLog:1.3328
--- kaffe/ChangeLog:1.3327 Thu Jan 6 00:22:45 2005
+++ kaffe/ChangeLog Thu Jan 6 00:53:04 2005
@@ -2,6 +2,37 @@
Resynced with GNU Classpath.
+ 2004-12-30 Olga Rodimina [EMAIL PROTECTED]
+
+ (prepareRenderer): Get column's index in dataModel instead
+ of column's view index.
+ (getColumnCount): return count of the columns in ColumnModel,
+ not in dataModel.
+ (removeColumn): Implemented.
+ (moveColumm): Likewise.
+ (setRowHeight): throw IllegalArgumentException if height is
+ less then 1.
+ * javax/swing/table/DefaultTableColumnModel.java: Add javadocs.
+ (DefaultTableColumnModel):Add call to createSelectionModel().
+ (addColumn): Fire columnAdded event to registered listeners.
+ (removeColumn): Fire columnRemoved event to registered listeners.
+ (moveColumn): Fire columnMoved event to registered listeners.
+ (setColumnMargin): Fire ColumnMarginChanged event to registered
listeners.
+ (getColumnIndex): Changed parameter name.
+ (setColumnSelectionAllowed): Likewise.
+ (fireColumnAdded): Implemented.
+ (fireColumnRemoved): Likewise.
+ (fireColumnMoved): Likewise.
+ (fireColumnMarginChanged): Likewise.
+ (getListeners): Changed parameter name.
+ (propertyChange): Implemented.
+ (valueChanged): Changed parameter name.
+ (createSelectionModel): Implemented.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Jerry Quinn [EMAIL PROTECTED]
* java/awt/Button.java,
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.12
kaffe/libraries/javalib/javax/swing/JTable.java:1.13
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.12Thu Dec 23
02:53:50 2004
+++ kaffe/libraries/javalib/javax/swing/JTable.java Thu Jan 6 00:53:05 2005
@@ -42,7 +42,6 @@
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
-import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
@@ -788,7 +787,7 @@
return renderer.getTableCellRendererComponent(this,
dataModel.getValueAt(row,
-
convertColumnIndexToView(column)),
+
convertColumnIndexToModel(column)),
isSelected,
false, // hasFocus
row, column);
@@ -867,13 +866,13 @@
/**
* Get the value of the [EMAIL PROTECTED] #columnCount} property by
- * delegation to the @{link #dataModel} field.
+ * delegation to the @{link #columnModel} field.
*
* @return The current value of the columnCount property
*/
public int getColumnCount()
{
-return dataModel.getColumnCount();
+return columnModel.getColumnCount();
}
/**
@@ -1131,10 +1130,25 @@
return tableHeader;
}
+ /**
+ * Removes specified column from displayable columns of this table.
+ *
+ * @param column column to removed
+ */
public void removeColumn(TableColumn column)
+ {
+columnModel.removeColumn(column);
+ }
+
+ /**
+ * Moves column at the specified index to new given location.
+ *
+ * @param column index of the column to move
+ * @param targetColumn index specifying new location of the column
+ */
+ public void moveColumn(int column,int targetColumn)
{
-// FIXME: Implement me.
-throw new Error(not implemented);
+columnModel.moveColumn(column, targetColumn);
}
/**
@@ -1166,6 +1180,9 @@
*/
public void setRowHeight(int r)
{
+if (rowHeight 1)
+ throw new IllegalArgumentException();
+
rowHeight = r;
revalidate();
repaint();
Index: kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
diff -u
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.8
--- kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
Sun Oct 24 13:39:21 2004
+++ kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
Thu Jan 6 00:53:06 2005
@@ -66,37 +66,37 @@
private static final long serialVersionUID = 6580012493508960512L;
/**
- * tableColumns
+
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: merged in sleep patch
PatchSet 5778
Date: 2005/01/06 00:04:25
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: merged in sleep patch
Members:
ChangeLog:1.3322-1.3323
libraries/clib/native/Thread.c:1.22-1.23
libraries/javalib/java/lang/Thread.java:1.51-1.52
libraries/javalib/java/lang/VMThread.java:1.2-1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3322 kaffe/ChangeLog:1.3323
--- kaffe/ChangeLog:1.3322 Wed Jan 5 23:43:09 2005
+++ kaffe/ChangeLog Thu Jan 6 00:04:25 2005
@@ -1,3 +1,19 @@
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ * libraries/clib/native/Thread.c (java_lang_VMThread_sleep):
+ Removed Guilhem's hack since the sleep patch has been merged in
+ from GNU Classpath.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
+ 2004-12-30 Mark Wielaard [EMAIL PROTECTED]
+
+ * java/lang/Thread.java (sleep): Update documentation. Make sure
+ VMThread.sleep() is never called with zero arguments.
+ * vm/reference/java/lang/VMThread.java (sleep): Update documentation.
+
2005-01-05 Dalibor Topic [EMAIL PROTECTED]
Resynced with GNU Classpath.
Index: kaffe/libraries/clib/native/Thread.c
diff -u kaffe/libraries/clib/native/Thread.c:1.22
kaffe/libraries/clib/native/Thread.c:1.23
--- kaffe/libraries/clib/native/Thread.c:1.22 Sun Jan 2 19:03:34 2005
+++ kaffe/libraries/clib/native/Thread.cThu Jan 6 00:04:26 2005
@@ -82,10 +82,6 @@
{
jthread_tcur = KTHREAD(current)();
- /* Temporary hack waiting for the Classpath merge. */
- if (timeout == 0)
-return;
-
if(KTHREAD(interrupted)(cur))
{
throwException(InterruptedException);
Index: kaffe/libraries/javalib/java/lang/Thread.java
diff -u kaffe/libraries/javalib/java/lang/Thread.java:1.51
kaffe/libraries/javalib/java/lang/Thread.java:1.52
--- kaffe/libraries/javalib/java/lang/Thread.java:1.51 Wed Dec 8 07:22:33 2004
+++ kaffe/libraries/javalib/java/lang/Thread.java Thu Jan 6 00:04:27 2005
@@ -769,11 +769,11 @@
* are no guarantees which thread will be next to run, but most VMs will
* choose the highest priority thread that has been waiting longest.
*
- * @param ms the number of milliseconds to sleep, or 0 for forever
- * @throws InterruptedException if the Thread is interrupted; it's
- * iinterrupted status/i will be cleared
- * @see #notify()
- * @see #wait(long)
+ * @param ms the number of milliseconds to sleep.
+ * @throws InterruptedException if the Thread is (or was) interrupted;
+ * it's iinterrupted status/i will be cleared
+ * @throws IllegalArgumentException if ms is negative
+ * @see #interrupt()
*/
public static void sleep(long ms) throws InterruptedException
{
@@ -785,27 +785,37 @@
* time. The Thread will not lose any locks it has during this time. There
* are no guarantees which thread will be next to run, but most VMs will
* choose the highest priority thread that has been waiting longest.
+ * p
+ * Note that 1,000,000 nanoseconds == 1 millisecond, but most VMs
+ * do not offer that fine a grain of timing resolution. When ms is
+ * zero and ns is non-zero the Thread will sleep for at least one
+ * milli second. There is no guarantee that this thread can start up
+ * immediately when time expires, because some other thread may be
+ * active. So don't expect real-time performance.
*
- * pNote that 1,000,000 nanoseconds == 1 millisecond, but most VMs do
- * not offer that fine a grain of timing resolution. Besides, there is
- * no guarantee that this thread can start up immediately when time expires,
- * because some other thread may be active. So don't expect real-time
- * performance.
- *
- * @param ms the number of milliseconds to sleep, or 0 for forever
+ * @param ms the number of milliseconds to sleep
* @param ns the number of extra nanoseconds to sleep (0-99)
- * @throws InterruptedException if the Thread is interrupted; it's
- * iinterrupted status/i will be cleared
- * @throws IllegalArgumentException if ns is invalid
- * @see #notify()
- * @see #wait(long, int)
+ * @throws InterruptedException if the Thread is (or was) interrupted;
+ * it's iinterrupted status/i will be cleared
+ * @throws IllegalArgumentException if ms or ns is negative
+ * or ns is larger than 99.
+ * @see #interrupt()
*/
public static void sleep(long ms, int ns) throws InterruptedException
{
-if(ms 0 || ns 0 || ns 99)
- throw new IllegalArgumentException();
+if (ms 0 || ns 0 || ns 99)
+ throw new IllegalArgumentException();
+
+if (ns 0 ms == 0)
+ {
+ ms = 1;
+ ns = 0;
+ }
-VMThread.sleep(ms, ns);
+if (ms 0)
+ VMThread.sleep(ms, ns);
+else if (interrupted())
+ throw new InterruptedException();
}
/**
Index:
Re: [kaffe] [gump] recreating do_lockUTF Assertion
Guilhem, Please see latest zip (http://brutus.apache.org/~dims/utf.zip). one run i got this: kaffe-bin: utf8const.c:58: do_lockUTF: Assertion `utfLockRoot == ((void *)0)' failed. another run i got this: kaffe-bin: machine.c:251: translate: Assertion `reinvoke == false' failed. sometimes it crashes: [1]+ Segmentation fault nohup java -cp . TraverseJAR /opt/__versions__/kaffe-dev/jre/lib/rt.jar out.txt 21 there are some assorted java.lang.ClassNotFoundException's etc but lets first make it stable and not hang before looking at them. thanks, dims PS: I should probably rename the class to VMBreaker as per dalibor on IRC :) --- Davanum Srinivas [EMAIL PROTECTED] wrote: Guilhem, After browsing the kaffe sources i hit on a way to recrate the the problem. Please run java -cp . TraverseJAR /opt/__versions__/kaffe-dev/jre/lib/rt.jar with the classes here: http://brutus.apache.org/~dims/utf.zip. Here's the sample assertion i got: (also in out.txt in utf.zip) LOADED (Thread-33): java/awt/image/ImagingOpException LOADED (Thread-33): gnu/crypto/jce/key/KhazadKeyGeneratorImpl LOADED (Thread-33): gnu/crypto/jce/key/AnubisKeyGeneratorImpl kaffe-bin: utf8const.c:58: do_lockUTF: Assertion `utfLockRoot == ((void *)0)' failed. Please note that this does not happen all the time. I also got some segmentation faults on some runs. thanks, dims = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do you Yahoo!? The all-new My Yahoo! - Get yours free! http://my.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
Re: [kaffe] [gump] recreating do_lockUTF Assertion
Here's one more for the record: (:15992): Gtk-WARNING **: cannot open display: -- dims --- Davanum Srinivas [EMAIL PROTECTED] wrote: Guilhem, Please see latest zip (http://brutus.apache.org/~dims/utf.zip). one run i got this: kaffe-bin: utf8const.c:58: do_lockUTF: Assertion `utfLockRoot == ((void *)0)' failed. another run i got this: kaffe-bin: machine.c:251: translate: Assertion `reinvoke == false' failed. sometimes it crashes: [1]+ Segmentation fault nohup java -cp . TraverseJAR /opt/__versions__/kaffe-dev/jre/lib/rt.jar out.txt 21 there are some assorted java.lang.ClassNotFoundException's etc but lets first make it stable and not hang before looking at them. thanks, dims PS: I should probably rename the class to VMBreaker as per dalibor on IRC :) --- Davanum Srinivas [EMAIL PROTECTED] wrote: Guilhem, After browsing the kaffe sources i hit on a way to recrate the the problem. Please run java -cp . TraverseJAR /opt/__versions__/kaffe-dev/jre/lib/rt.jar with the classes here: http://brutus.apache.org/~dims/utf.zip. Here's the sample assertion i got: (also in out.txt in utf.zip) LOADED (Thread-33): java/awt/image/ImagingOpException LOADED (Thread-33): gnu/crypto/jce/key/KhazadKeyGeneratorImpl LOADED (Thread-33): gnu/crypto/jce/key/AnubisKeyGeneratorImpl kaffe-bin: utf8const.c:58: do_lockUTF: Assertion `utfLockRoot == ((void *)0)' failed. Please note that this does not happen all the time. I also got some segmentation faults on some runs. thanks, dims = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do you Yahoo!? The all-new My Yahoo! - Get yours free! http://my.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe = Davanum Srinivas - http://webservices.apache.org/~dims/ __ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fixes for nio from ito and michael koch
PatchSet 5776
Date: 2005/01/05 23:09:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: fixes for nio from ito and michael koch
Members:
ChangeLog:1.3320-1.3321
libraries/javalib/java/nio/ByteBufferImpl.java:1.9-1.10
libraries/javalib/java/nio/CharBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/CharViewBufferImpl.java:1.3-1.4
libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12-1.13
libraries/javalib/java/nio/DoubleBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/DoubleViewBufferImpl.java:1.4-1.5
libraries/javalib/java/nio/FloatBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/FloatViewBufferImpl.java:1.4-1.5
libraries/javalib/java/nio/IntBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/IntViewBufferImpl.java:1.4-1.5
libraries/javalib/java/nio/LongBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/LongViewBufferImpl.java:1.4-1.5
libraries/javalib/java/nio/MappedByteBufferImpl.java:1.10-1.11
libraries/javalib/java/nio/ShortBufferImpl.java:1.7-1.8
libraries/javalib/java/nio/ShortViewBufferImpl.java:1.4-1.5
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3320 kaffe/ChangeLog:1.3321
--- kaffe/ChangeLog:1.3320 Wed Jan 5 23:02:34 2005
+++ kaffe/ChangeLog Wed Jan 5 23:09:49 2005
@@ -2,6 +2,32 @@
Resynced with GNU Classpath.
+ 2004-12-30 Ito Kazumitsu [EMAIL PROTECTED]
+
+ * java/nio/ByteBufferImpl.java (compact):
+ Set position and limit even if no bytes were moved.
+
+ 2004-12-30 Michael Koch [EMAIL PROTECTED]
+
+ * java/nio/CharViewBufferImpl.java (compact): Likewise.
+ * java/nio/DirectByteBufferImpl.java (compact): Likewise.
+ * java/nio/DoubleViewBufferImpl.java (compact): Likewise.
+ * java/nio/FloatViewBufferImpl.java (compact): Likewise.
+ * java/nio/IntViewBufferImpl.java (compact): Likewise.
+ * java/nio/LongViewBufferImpl.java (compact): Likewise.
+ * java/nio/MappedByteBufferImpl.java (compact): Likewise.
+ * java/nio/ShortViewBufferImpl.java (compact): Likewise.
+ * java/nio/FloatBufferImpl.java (compact): Set position.
+ * java/nio/CharBufferImpl.java (compact): Likewise.
+ * java/nio/DoubleBufferImpl.java (compact): Likewise.
+ * java/nio/IntBufferImpl.java (compact): Likewise.
+ * java/nio/LongBufferImpl.java (compact): Likewise.
+ * java/nio/ShortBufferImpl.java (compact): Likewise.
+
+2005-01-05 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-30 Michael Koch [EMAIL PROTECTED]
* javax/swing/JFormattedTextField.java
Index: kaffe/libraries/javalib/java/nio/ByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9
kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.10
--- kaffe/libraries/javalib/java/nio/ByteBufferImpl.java:1.9Wed Jan 5
19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/ByteBufferImpl.javaWed Jan 5
23:09:52 2005
@@ -122,6 +122,11 @@
position(count);
limit(capacity());
}
+else
+ {
+ position(limit());
+ limit(capacity());
+ }
return this;
}
Index: kaffe/libraries/javalib/java/nio/CharBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7
kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.8
--- kaffe/libraries/javalib/java/nio/CharBufferImpl.java:1.7Wed Jan 5
19:45:27 2005
+++ kaffe/libraries/javalib/java/nio/CharBufferImpl.javaWed Jan 5
23:09:53 2005
@@ -98,6 +98,7 @@
}
position (copied);
+limit(capacity());
return this;
}
Index: kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.3
kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.4
--- kaffe/libraries/javalib/java/nio/CharViewBufferImpl.java:1.3Tue Jun
15 17:39:09 2004
+++ kaffe/libraries/javalib/java/nio/CharViewBufferImpl.javaWed Jan 5
23:09:53 2005
@@ -118,6 +118,11 @@
position (count);
limit (capacity ());
}
+else
+ {
+ position(limit());
+ limit(capacity());
+ }
return this;
}
Index: kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java
diff -u kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12
kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.13
--- kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java:1.12 Wed Jan
5 20:08:56 2005
+++ kaffe/libraries/javalib/java/nio/DirectByteBufferImpl.java Wed Jan 5
23:09:53 2005
@@ -198,6 +198,11 @@
position(count);
limit(capacity());
}
+else
+ {
+ position(limit());
+ limit(capacity());
+ }
return this;
}
Index: kaffe/libraries/javalib/java/nio/DoubleBufferImpl.java
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: olga's swing fixes
PatchSet 5783
Date: 2005/01/06 00:53:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: olga's swing fixes
Members:
ChangeLog:1.3327-1.3328
libraries/javalib/javax/swing/JTable.java:1.12-1.13
libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7-1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3327 kaffe/ChangeLog:1.3328
--- kaffe/ChangeLog:1.3327 Thu Jan 6 00:22:45 2005
+++ kaffe/ChangeLog Thu Jan 6 00:53:04 2005
@@ -2,6 +2,37 @@
Resynced with GNU Classpath.
+ 2004-12-30 Olga Rodimina [EMAIL PROTECTED]
+
+ (prepareRenderer): Get column's index in dataModel instead
+ of column's view index.
+ (getColumnCount): return count of the columns in ColumnModel,
+ not in dataModel.
+ (removeColumn): Implemented.
+ (moveColumm): Likewise.
+ (setRowHeight): throw IllegalArgumentException if height is
+ less then 1.
+ * javax/swing/table/DefaultTableColumnModel.java: Add javadocs.
+ (DefaultTableColumnModel):Add call to createSelectionModel().
+ (addColumn): Fire columnAdded event to registered listeners.
+ (removeColumn): Fire columnRemoved event to registered listeners.
+ (moveColumn): Fire columnMoved event to registered listeners.
+ (setColumnMargin): Fire ColumnMarginChanged event to registered
listeners.
+ (getColumnIndex): Changed parameter name.
+ (setColumnSelectionAllowed): Likewise.
+ (fireColumnAdded): Implemented.
+ (fireColumnRemoved): Likewise.
+ (fireColumnMoved): Likewise.
+ (fireColumnMarginChanged): Likewise.
+ (getListeners): Changed parameter name.
+ (propertyChange): Implemented.
+ (valueChanged): Changed parameter name.
+ (createSelectionModel): Implemented.
+
+2005-01-06 Dalibor Topic [EMAIL PROTECTED]
+
+ Resynced with GNU Classpath.
+
2004-12-29 Jerry Quinn [EMAIL PROTECTED]
* java/awt/Button.java,
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.12
kaffe/libraries/javalib/javax/swing/JTable.java:1.13
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.12Thu Dec 23
02:53:50 2004
+++ kaffe/libraries/javalib/javax/swing/JTable.java Thu Jan 6 00:53:05 2005
@@ -42,7 +42,6 @@
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Rectangle;
-import java.util.Date;
import java.util.Hashtable;
import java.util.Vector;
@@ -788,7 +787,7 @@
return renderer.getTableCellRendererComponent(this,
dataModel.getValueAt(row,
-
convertColumnIndexToView(column)),
+
convertColumnIndexToModel(column)),
isSelected,
false, // hasFocus
row, column);
@@ -867,13 +866,13 @@
/**
* Get the value of the [EMAIL PROTECTED] #columnCount} property by
- * delegation to the @{link #dataModel} field.
+ * delegation to the @{link #columnModel} field.
*
* @return The current value of the columnCount property
*/
public int getColumnCount()
{
-return dataModel.getColumnCount();
+return columnModel.getColumnCount();
}
/**
@@ -1131,10 +1130,25 @@
return tableHeader;
}
+ /**
+ * Removes specified column from displayable columns of this table.
+ *
+ * @param column column to removed
+ */
public void removeColumn(TableColumn column)
+ {
+columnModel.removeColumn(column);
+ }
+
+ /**
+ * Moves column at the specified index to new given location.
+ *
+ * @param column index of the column to move
+ * @param targetColumn index specifying new location of the column
+ */
+ public void moveColumn(int column,int targetColumn)
{
-// FIXME: Implement me.
-throw new Error(not implemented);
+columnModel.moveColumn(column, targetColumn);
}
/**
@@ -1166,6 +1180,9 @@
*/
public void setRowHeight(int r)
{
+if (rowHeight 1)
+ throw new IllegalArgumentException();
+
rowHeight = r;
revalidate();
repaint();
Index: kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
diff -u
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.8
--- kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java:1.7
Sun Oct 24 13:39:21 2004
+++ kaffe/libraries/javalib/javax/swing/table/DefaultTableColumnModel.java
Thu Jan 6 00:53:06 2005
@@ -66,37 +66,37 @@
private static final long serialVersionUID = 6580012493508960512L;
/**
- * tableColumns
+
[kaffe] [PATCH] m68k compilation failure
Happy new year all, (or Akemashite Omedetou, in Japanese)
After the modification of JIT compiler symbol done by Guilhem last week,
kaffe can not be compiled on m68k. Attached patch should be needed for
this cpu.
Similar patch should be needed for all types of cpu (except i386, of course)
including alpha or powerpc, because Guilhem just modified 'newlabel' part
of symbol change and not modified 'setEpilogueLabel' part.
Oh, I forget to write ChangeLog engry, how about this?
2005-1-6 Kiyo Inaba [EMAIL PROTECTED]
* config/m68k/jit-m68k.def,
config/m68k/jit3-m68k.def: Adjusted calls to the new name of
some JIT compiler symbols (for m68k).
Kiyo
diff -Naur kaffe-snap-041230.orig/config/m68k/jit3-m68k.def
kaffe-snap-041230/config/m68k/jit3-m68k.def
--- kaffe-snap-041230.orig/config/m68k/jit3-m68k.def2004-09-02
17:10:09.0 +0900
+++ kaffe-snap-041230/config/m68k/jit3-m68k.def 2005-01-06 14:54:43.0
+0900
@@ -1273,7 +1273,7 @@
define_insn(epilogue, epilogue_xxx)
{
- setEpilogueLabel ((uintp)CODEPC);
+ KaffeJIT3_setEpilogueLabel ((uintp)CODEPC);
/* Restore the callee saved registers */
#if defined(HAVE_NO_MOVEM)
diff -Naur kaffe-snap-041230.orig/config/m68k/jit-m68k.def
kaffe-snap-041230/config/m68k/jit-m68k.def
--- kaffe-snap-041230.orig/config/m68k/jit-m68k.def 2004-09-02
17:10:09.0 +0900
+++ kaffe-snap-041230/config/m68k/jit-m68k.def 2005-01-06 14:54:28.0
+0900
@@ -1253,7 +1253,7 @@
define_insn(epilogue, epilogue_xxx)
{
- setEpilogueLabel ((uintp)CODEPC);
+ KaffeJIT_setEpilogueLabel ((uintp)CODEPC);
op_unlk_a(REG_fp);
op_rts();
___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: locale data updated
PatchSet 5763 Date: 2005/01/05 18:43:21 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: locale data updated Members: ChangeLog:1.3307-1.3308 libraries/javalib/all.files:1.65-1.66 libraries/javalib/gnu/java/locale/LocaleInformation.java:1.2-1.3 libraries/javalib/gnu/java/locale/LocaleInformation_aa.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_aa_DJ.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_aa_ER.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_aa_ET.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_af.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_af_ZA.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_am.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_am_ET.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_ar.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_ar_DZ.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_IN.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_IQ.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_JO.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_KW.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_LB.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_LY.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_MA.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_QA.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_SA.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_ar_SY.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_TN.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ar_YE.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_as.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_as_IN.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_az.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_be.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_be_BY.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_bg.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_bg_BG.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_bn.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_bn_IN.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_ca.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_ca_ES.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_cs.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_cs_CZ.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_cy.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_cy_GB.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_da.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_da_DK.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_de.java:1.6-1.7 libraries/javalib/gnu/java/locale/LocaleInformation_de_AT.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_de_BE.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_de_CH.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_de_DE.java:1.4-1.5 libraries/javalib/gnu/java/locale/LocaleInformation_de_LI.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_de_LU.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_dv.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_dv_MV.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_dz.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_dz_BT.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_el.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_el_GR.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_en.java:1.6-1.7 libraries/javalib/gnu/java/locale/LocaleInformation_en_AS.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_en_AU.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_en_BE.java:1.1-1.2 libraries/javalib/gnu/java/locale/LocaleInformation_en_BW.java:1.3-1.4 libraries/javalib/gnu/java/locale/LocaleInformation_en_BZ.java:1.1-1.2
