[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6503 
Date: 2005/05/15 17:03:03
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-25  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/metal/MetalBorders.java:
Added inner class ScrollPaneBorder.
* javax/swing/plaf/metal/MetalLookAndFeel.java
(initComponentDefaults): Added default for ScrollPane.border
to use the new ScrollPaneBorder.

Members: 
ChangeLog:1.4028->1.4029 
libraries/javalib/javax/swing/plaf/metal/MetalBorders.java:1.2->1.3 

libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.9->1.10 

libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4028 kaffe/ChangeLog:1.4029
--- kaffe/ChangeLog:1.4028  Sun May 15 16:53:48 2005
+++ kaffe/ChangeLog Sun May 15 17:03:03 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-04-25  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/plaf/metal/MetalBorders.java:
+Added inner class ScrollPaneBorder.
+* javax/swing/plaf/metal/MetalLookAndFeel.java
+(initComponentDefaults): Added default for "ScrollPane.border"
+to use the new ScrollPaneBorder.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-01  Mark Wielaard  <[EMAIL PROTECTED]>
 
 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalBorders.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/metal/MetalBorders.java:1.2 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalBorders.java:1.3
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalBorders.java:1.2
Sat Apr 23 11:10:52 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalBorders.javaSun May 
15 17:03:07 2005
@@ -184,6 +184,82 @@
   }
 
   /**
+   * A border for JScrollPanes.
+   */
+  public static class ScrollPaneBorder
+extends AbstractBorder
+implements UIResource
+  {
+/** The border insets. */
+private static Insets insets = new Insets(1, 1, 2, 2);
+
+/**
+ * Constructs a new ScrollPaneBorder.
+ */
+public ScrollPaneBorder()
+{
+}
+
+/**
+ * Returns the insets of the border for the Component c.
+ *
+ * @param c the Component for which we return the border insets
+ */
+public Insets getBorderInsets(Component c)
+{
+  return insets;
+}
+
+/**
+ * Paints the border.
+ *
+ * @param c the Component for which the border is painted
+ * @param g the Graphics context
+ * @param x the X coordinate of the upper left corner of the border
+ * @param y the Y coordinate of the upper left corner of the border
+ * @param w the width of the border
+ * @param h the height of the border
+ */
+public void paintBorder(Component c, Graphics g, int x, int y,
+int w, int h)
+{
+  Color darkShadow = MetalLookAndFeel.getControlDarkShadow();
+  Color shadow = MetalLookAndFeel.getControlShadow();
+  Color light = MetalLookAndFeel.getWhite();
+  Color middle = MetalLookAndFeel.getControl();
+
+  // paint top border line
+  g.setColor(darkShadow);
+  g.drawLine(x, y, x + w - 2, y);
+
+  // paint left border line
+  g.drawLine(x, y, x, y + h - 2);
+ 
+  // paint right inner border line
+  g.drawLine(x + w - 2, y, x + w - 2, y + h + 1);
+
+  // paint bottom inner border line
+  g.drawLine(x + 2, y + h - 2, x + w - 2, y + h - 2);
+
+  // draw right outer border line
+  g.setColor(light);
+  g.drawLine(x + w - 1, y, x + w - 1, y + h - 1);
+
+  // draw bottom outer border line
+  g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
+
+  // paint the lighter points
+  g.setColor(middle);
+  g.drawLine(x + w - 1, y, x + w - 1, y);
+  g.drawLine(x + w - 2, y + 2, x + w - 2, y + 2);
+  g.drawLine(x, y + h - 1, x, y + h - 1);
+  g.drawLine(x + 1, y + h - 2, x + 1, y + h - 2);
+
+}
+
+  }
+  
+  /**
* This border is used in Toolbar buttons as inner border.
*/
   static class RolloverMarginBorder extends AbstractBorder
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.9 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.10
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.9
Sun May 15 11:20:50 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
Sun May 15 17:03:07 2005
@@ -482,6 +482,7 @@
   "Slider.background", new ColorUIResource(getControl()),
   "OptionPane.background", new ColorUIResource(getContr

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6516 
Date: 2005/05/15 17:30:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-06  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/text/PlainView.java
(getPreferredSpan): Corrected the calculation of the span of
the view.

Members: 
ChangeLog:1.4042->1.4043 
libraries/javalib/javax/swing/text/PlainView.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4042 kaffe/ChangeLog:1.4043
--- kaffe/ChangeLog:1.4042  Sun May 15 17:25:03 2005
+++ kaffe/ChangeLog Sun May 15 17:30:08 2005
@@ -2,6 +2,16 @@
 
Resynced with GNU Classpath.
 
+   2005-05-06  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/text/PlainView.java
+(getPreferredSpan): Corrected the calculation of the span of
+the view.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-04  Mark Wielaard  <[EMAIL PROTECTED]>
 
 * java/awt/BufferCapabilities.java (BufferCapabilities): Make
Index: kaffe/libraries/javalib/javax/swing/text/PlainView.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.6 
kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.7
--- kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.6 Sun May 15 
17:16:05 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainView.java Sun May 15 
17:30:12 2005
@@ -200,7 +200,42 @@
 if (axis != X_AXIS && axis != Y_AXIS)
   throw new IllegalArgumentException();
 
-return 10;
+// make sure we have the metrics
+updateMetrics();
+
+float span = 0;
+Element el = getElement();
+Document doc = el.getDocument();
+Segment seg = new Segment();
+
+switch (axis)
+  {
+  case X_AXIS:
+// calculate the maximum of the line's widths
+for (int i = 0; i < el.getElementCount(); i++)
+  {
+Element child = el.getElement(i);
+int start = child.getStartOffset();
+int end = child.getEndOffset();
+try {
+  doc.getText(start, start + end, seg);
+}
+catch (BadLocationException ex)
+  {
+// throw new ClasspathAssertionError
+// ("no BadLocationException should be thrown here");
+  }
+int width = metrics.charsWidth(seg.array, seg.offset, seg.count);
+span = Math.max(span, width);
+  }
+break;
+  case Y_AXIS:
+  default:
+span = metrics.getHeight() * el.getElementCount();
+break;
+  }
+
+return span;
   }
 }
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: text fix

[Kaffe CVS]

PatchSet 6504 
Date: 2005/05/15 17:05:16
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: text fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-02  David Gilbert  <[EMAIL PROTECTED]>

* java/text/DecimalFormat.java
(hashCode): Reimplemented and added API docs.

Members: 
ChangeLog:1.4029->1.4030 
libraries/javalib/java/text/DecimalFormat.java:INITIAL->1.35 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4029 kaffe/ChangeLog:1.4030
--- kaffe/ChangeLog:1.4029  Sun May 15 17:03:03 2005
+++ kaffe/ChangeLog Sun May 15 17:05:16 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-05-02  David Gilbert  <[EMAIL PROTECTED]>
+
+* java/text/DecimalFormat.java
+(hashCode): Reimplemented and added API docs.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-25  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/metal/MetalBorders.java:
===
Checking out kaffe/libraries/javalib/java/text/DecimalFormat.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/text/DecimalFormat.java,v
VERS: 1.35
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/text/DecimalFormat.javaSun May 15 
17:17:25 2005
@@ -0,0 +1,1410 @@
+/* DecimalFormat.java -- Formats and parses numbers
+   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005  Free Software Foundation, 
Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.text;
+
+import gnu.java.text.AttributedFormatBuffer;
+import gnu.java.text.FormatBuffer;
+import gnu.java.text.FormatCharacterIterator;
+import gnu.java.text.StringFormatBuffer;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.util.Currency;
+import java.util.HashMap;
+import java.util.Locale;
+
+/**
+ * @author Tom Tromey ([EMAIL PROTECTED])
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @date March 4, 1999
+ */
+/* Written using "Java Class Libraries", 2nd edition, plus online
+ * API docs for JDK 1.2 from http://www.javasoft.com.
+ * Status:  Believed complete and correct to 1.2.
+ * Note however that the docs are very unclear about how format parsing
+ * should work.  No doubt there are problems here.
+ */
+public class DecimalFormat extends NumberFormat
+{
+  // This is a helper for applyPatternWithSymbols.  It reads a prefix
+  // or a suffix.  It can cause some side-effects.
+  private int scanFix (String pattern, int index, FormatBuffer buf,
+   String patChars, DecimalFormatSymbols syms,
+   boolean is_suffix)
+{
+int len = pattern.length();
+boolean quoteStarted = false;
+buf.clear();
+
+boolean multiplierSet = false;
+while (index < len)
+  {
+   char c = pattern.charAt(index);
+
+   if (quoteStarted)
+ {
+   if (c == '\'')
+ quoteStarted = false;
+   else
+ buf.append(c);
+   index++;
+   continue;
+ }
+
+   if (c == '\'' && index + 1 < len
+   && pattern.charAt(index + 1) == '\'')
+ {
+   buf.append(c);
+   index++;
+ }
+  

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6520 
Date: 2005/05/15 17:50:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/JTextField.java
(createDefaultModel): Create and return a subclass of PlainDocument
to allow newlines to be swallowed.

Members: 
ChangeLog:1.4046->1.4047 
libraries/javalib/javax/swing/JTextField.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4046 kaffe/ChangeLog:1.4047
--- kaffe/ChangeLog:1.4046  Sun May 15 17:48:25 2005
+++ kaffe/ChangeLog Sun May 15 17:50:06 2005
@@ -2,6 +2,16 @@
 
Resynced with GNU Classpath.
 
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/JTextField.java
+(createDefaultModel): Create and return a subclass of PlainDocument
+to allow newlines to be swallowed.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-10  David Daney  <[EMAIL PROTECTED]>
 
 * java/util/BitSet.java (get(int, int)): Fix breakage when
Index: kaffe/libraries/javalib/javax/swing/JTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JTextField.java:1.9 
kaffe/libraries/javalib/javax/swing/JTextField.java:1.10
--- kaffe/libraries/javalib/javax/swing/JTextField.java:1.9 Fri Feb 18 
11:26:36 2005
+++ kaffe/libraries/javalib/javax/swing/JTextField.java Sun May 15 17:50:06 2005
@@ -47,6 +47,8 @@
 import java.beans.PropertyChangeListener;
 
 import javax.accessibility.AccessibleStateSet;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
@@ -187,7 +189,15 @@
*/
   protected Document createDefaultModel()
   {
-return new PlainDocument();
+// subclassed to swallow newlines
+return new PlainDocument() {
+public void insertString(int offset, String str, AttributeSet a)
+  throws BadLocationException
+{
+  if (str.indexOf('\n') == -1)
+super.insertString(offset, str, a);
+}
+  };
   }
 
   /**

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6524 
Date: 2005/05/15 18:11:20
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/AbstractCellEditor.java
(constructor): Implemented.
(isCellEditable): Implemented.
(shouldSelectCell): Implemented.
(stopCellEditing): Implemented.
(cancelCellEditing): Implemented.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/AbstractCellEditor.java:
Documented this class.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/AbstractCellEditor.java:
Reformatted this file to our coding style.

Members: 
ChangeLog:1.4050->1.4051 
libraries/javalib/javax/swing/AbstractCellEditor.java:1.3->1.4 

cvs rdiff: [18:23:09] waiting for robilad's lock in /home/cvs/kaffe/kaffe
cvs rdiff: [18:23:39] obtained lock in /home/cvs/kaffe/kaffe
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4050 kaffe/ChangeLog:1.4051
--- kaffe/ChangeLog:1.4050  Sun May 15 18:07:48 2005
+++ kaffe/ChangeLog Sun May 15 18:11:20 2005
@@ -4,6 +4,29 @@
 
2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
 
+* javax/swing/AbstractCellEditor.java
+(constructor): Implemented.
+(isCellEditable): Implemented.
+(shouldSelectCell): Implemented.
+(stopCellEditing): Implemented.
+(cancelCellEditing): Implemented.
+
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/AbstractCellEditor.java:
+Documented this class.
+
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/AbstractCellEditor.java:
+Reformatted this file to our coding style.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
 (createSeparator): Implemented. Returns a vertical separator with
 a height of 17 pixels as recommended in the book Java Look & Feel
Index: kaffe/libraries/javalib/javax/swing/AbstractCellEditor.java
diff -u kaffe/libraries/javalib/javax/swing/AbstractCellEditor.java:1.3 
kaffe/libraries/javalib/javax/swing/AbstractCellEditor.java:1.4
--- kaffe/libraries/javalib/javax/swing/AbstractCellEditor.java:1.3 Wed Jan 
 5 19:37:12 2005
+++ kaffe/libraries/javalib/javax/swing/AbstractCellEditor.java Sun May 15 
18:11:26 2005
@@ -1,5 +1,5 @@
 /* AbstractCellEditor.java --
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,9 @@
 import javax.swing.event.EventListenerList;
 
 /**
- * AbstractCellEditor
+ * The abstract superclass for table and tree cells. This provides some
+ * common shared functionality.
+ *
  * @author Andrew Selkirk
  * @version1.0
  */
@@ -56,59 +58,77 @@
   private static final long serialVersionUID = -1048006551406220959L;
 
   /**
-   * listenerList
+   * Our Swing event listeners.
*/
   protected EventListenerList listenerList;
 
   /**
-   * changeEvent
+   * The cached ChangeEvent.
*/
   protected transient ChangeEvent changeEvent;
 
-   /**
-* Constructor AbstractCellEditor
-*/
-   public AbstractCellEditor() {
-   // TODO
-   } // AbstractCellEditor()
-
-   /**
-* isCellEditable
-* @param event TODO
-* @returns boolean
-*/
-   public boolean isCellEditable(EventObject event) {
-   return false; // TODO
-   } // isCellEditable()
-
-   /**
-* shouldSelectCell
-* @param event TODO
-* @returns boolean
-*/
-   public boolean shouldSelectCell(EventObject event) {
-   return false; // TODO
-   } // shouldSelectCell()
-
-   /**
-* stopCellEditing
-* @returns boolean
-*/
-   public boolean stopCellEditing() {
-   return false; // TODO
-   } // stopCellEditing()
-
-   /**
-* cancelCellEditing
-*/
-   public void cancelCellEditing() {
-   // TODO
-   } // cancelCellEditing()
+  /**
+   * Creates a new instance of AbstractCellEditor.
+   */
+  public AbstractCellEditor() {
+listenerList = new EventListenerList();
+changeEvent = new ChangeEvent(this);
+  } // AbstractCellEditor()
+
+  /**
+   * Returns true if the cell is editable using
+   * event, false
+   * if it's not. The default behaviour is to return true.
+   *
+   * @param event an event
+   *
+   * @return true if the cell is editable using
+   * event, false if it's not
+   */
+  public boolean isCellEditable(EventObject event) {
+return true;
+  } // isCellEditable()
+
+  /**
+   * Returns true if the ed

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6520 
Date: 2005/05/15 17:50:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/JTextField.java
(createDefaultModel): Create and return a subclass of PlainDocument
to allow newlines to be swallowed.

Members: 
ChangeLog:1.4046->1.4047 
libraries/javalib/javax/swing/JTextField.java:1.9->1.10 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4046 kaffe/ChangeLog:1.4047
--- kaffe/ChangeLog:1.4046  Sun May 15 17:48:25 2005
+++ kaffe/ChangeLog Sun May 15 17:50:06 2005
@@ -2,6 +2,16 @@
 
Resynced with GNU Classpath.
 
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/JTextField.java
+(createDefaultModel): Create and return a subclass of PlainDocument
+to allow newlines to be swallowed.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-10  David Daney  <[EMAIL PROTECTED]>
 
 * java/util/BitSet.java (get(int, int)): Fix breakage when
Index: kaffe/libraries/javalib/javax/swing/JTextField.java
diff -u kaffe/libraries/javalib/javax/swing/JTextField.java:1.9 
kaffe/libraries/javalib/javax/swing/JTextField.java:1.10
--- kaffe/libraries/javalib/javax/swing/JTextField.java:1.9 Fri Feb 18 
11:26:36 2005
+++ kaffe/libraries/javalib/javax/swing/JTextField.java Sun May 15 17:50:06 2005
@@ -47,6 +47,8 @@
 import java.beans.PropertyChangeListener;
 
 import javax.accessibility.AccessibleStateSet;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
@@ -187,7 +189,15 @@
*/
   protected Document createDefaultModel()
   {
-return new PlainDocument();
+// subclassed to swallow newlines
+return new PlainDocument() {
+public void insertString(int offset, String str, AttributeSet a)
+  throws BadLocationException
+{
+  if (str.indexOf('\n') == -1)
+super.insertString(offset, str, a);
+}
+  };
   }
 
   /**

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6522 
Date: 2005/05/15 18:06:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/text/View.java
(insertUpdate) Removed a debug println statement.

Members: 
libraries/javalib/javax/swing/text/View.java:1.8->1.9 

Index: kaffe/libraries/javalib/javax/swing/text/View.java
diff -u kaffe/libraries/javalib/javax/swing/text/View.java:1.8 
kaffe/libraries/javalib/javax/swing/text/View.java:1.9
--- kaffe/libraries/javalib/javax/swing/text/View.java:1.8  Sun May 15 
18:03:47 2005
+++ kaffe/libraries/javalib/javax/swing/text/View.java  Sun May 15 18:06:55 2005
@@ -292,7 +292,6 @@
*/
   public void insertUpdate(DocumentEvent ev, Shape shape, ViewFactory vf)
   {
-System.err.println("entering insertUpdate in class: " + 
getClass().getName());
 Element el = getElement();
 DocumentEvent.ElementChange ec = ev.getChange(el);
 if (ec != null)

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6537 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6525 
Date: 2005/05/15 18:17:09
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/DefaultMenuLayout.java:
Added this class.
* javax/swing/plaf/basic/BasicPopupMenuUI.java
(installUI): Use the new DefaultMenuLayout instead of GridBagLayout.

Members: 
ChangeLog:1.4051->1.4052 
libraries/javalib/all.files:1.122->1.123 
libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.6->1.7 

libraries/javalib/javax/swing/plaf/basic/DefaultMenuLayout.java:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4051 kaffe/ChangeLog:1.4052
--- kaffe/ChangeLog:1.4051  Sun May 15 18:11:20 2005
+++ kaffe/ChangeLog Sun May 15 18:17:09 2005
@@ -4,6 +4,17 @@
 
2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
 
+* javax/swing/plaf/basic/DefaultMenuLayout.java:
+Added this class.
+* javax/swing/plaf/basic/BasicPopupMenuUI.java
+(installUI): Use the new DefaultMenuLayout instead of GridBagLayout.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-05-11  Roman Kennke  <[EMAIL PROTECTED]>
+
 * javax/swing/AbstractCellEditor.java
 (constructor): Implemented.
 (isCellEditable): Implemented.
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.122 
kaffe/libraries/javalib/all.files:1.123
--- kaffe/libraries/javalib/all.files:1.122 Sun May 15 16:50:05 2005
+++ kaffe/libraries/javalib/all.files   Sun May 15 18:17:15 2005
@@ -3356,6 +3356,7 @@
 javax/swing/plaf/basic/BasicTreeUI.java
 javax/swing/plaf/basic/BasicViewportUI.java
 javax/swing/plaf/basic/ComboPopup.java
+javax/swing/plaf/basic/DefaultMenuLayout.java
 javax/swing/plaf/BorderUIResource.java
 javax/swing/plaf/ButtonUI.java
 javax/swing/plaf/ColorChooserUI.java
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.6 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.7
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.6
Sun May 15 09:46:23 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java
Sun May 15 18:17:16 2005
@@ -40,11 +40,11 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.GridBagLayout;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.awt.event.MouseEvent;
 
+import javax.swing.BoxLayout;
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
 import javax.swing.MenuElement;
@@ -111,7 +111,7 @@
   {
 super.installUI(c);
 popupMenu = (JPopupMenu) c;
-popupMenu.setLayout(new GridBagLayout());
+popupMenu.setLayout(new DefaultMenuLayout(popupMenu, BoxLayout.Y_AXIS));
 popupMenu.setBorderPainted(true);
 JPopupMenu.setDefaultLightWeightPopupEnabled(true);
 
===
Checking out 
kaffe/libraries/javalib/javax/swing/plaf/basic/DefaultMenuLayout.java
RCS:  
/home/cvs/kaffe/kaffe/libraries/javalib/javax/swing/plaf/basic/DefaultMenuLayout.java,v
VERS: 1.1
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/DefaultMenuLayout.java   
Sun May 15 18:31:21 2005
@@ -0,0 +1,78 @@
+/* DefaultMenuLayout.java
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you 

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: xml fixes

[Kaffe CVS]

PatchSet 6536 
Date: 2005/05/16 02:32:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: xml fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/xml/dom/DomDocumentBuilder.java,
  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
relative URLs.
* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
end entity callbacks.

Members: 
ChangeLog:1.4060->1.4061 
libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3->1.4 
libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4->1.5 
libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4060 kaffe/ChangeLog:1.4061
--- kaffe/ChangeLog:1.4060  Sun May 15 18:29:20 2005
+++ kaffe/ChangeLog Sun May 15 18:32:35 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-14  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/xml/dom/DomDocumentBuilder.java,
+  gnu/xml/dom/transform/XSLUriResolver.java: Handle unqualified
+relative URLs.
+* gnu/xml/dom/ls/SAXEventSink.java: Ignore XML entities in start/
+end entity callbacks.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-13  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicOptionPaneUI.java
Index: kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 
kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.4
--- kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java:1.3 Mon Feb 
14 02:54:30 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/DomDocumentBuilder.java Sun May 15 
18:32:42 2005
@@ -39,6 +39,8 @@
 
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.Reader;
+import java.net.URL;
 import javax.xml.parsers.DocumentBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.DOMConfiguration;
@@ -140,6 +142,7 @@
 throws SAXException, IOException
   {
 LSInput input = ls.createLSInput();
+String systemId = is.getSystemId();
 InputStream in = is.getByteStream();
 if (in != null)
   {
@@ -147,10 +150,19 @@
   }
 else
   {
-input.setCharacterStream(is.getCharacterStream());
+Reader reader = is.getCharacterStream();
+if (reader != null)
+  {
+input.setCharacterStream(reader);
+  }
+else
+  {
+URL url = new URL(systemId);
+input.setByteStream(url.openStream());
+  }
   }
 input.setPublicId(is.getPublicId());
-input.setSystemId(is.getSystemId());
+input.setSystemId(systemId);
 input.setEncoding(is.getEncoding());
 return parser.parse(input);
   }
Index: kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java
diff -u kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4 
kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.5
--- kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.java:1.4Fri Mar 
11 20:12:32 2005
+++ kaffe/libraries/javalib/gnu/xml/dom/ls/SAXEventSink.javaSun May 15 
18:32:44 2005
@@ -366,6 +366,14 @@
 ctx = doctype;
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
 // Get entity
 NamedNodeMap entities = doctype.getEntities();
 Entity entity = (Entity) entities.getNamedItem(name);
@@ -385,6 +393,15 @@
 // Ignore DTD and parameter entities
 return;
   }
+if ("lt".equals(name) ||
+"gt".equals(name) ||
+"amp".equals(name) ||
+"apos".equals(name) ||
+"quot".equals(name))
+  {
+return;
+  }
+// Get entity
 Entity entity = popEntity();
 // TODO resolve external entities to ensure that entity has content
 if (expandEntityReferences)
Index: kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java
diff -u kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5 
kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.6
--- kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java:1.5   Mon Feb 
14 20:49:36 2005
+++ kaffe/libraries/javalib/gnu/xml/transform/XSLURIResolver.java   Sun May 
15 18:32:44 2005
@@ -134,33 +134,41 @@
   }
   }
   }
-if (in == null && url != null)
+if (in == null)
   {
-systemId = url.toString();
-node = (Node) nodeCache.get(systemId);
-// Is the resource up to date?
-URLConnection conn = url.openConnection();
-Long llm = (Long) lastModifiedCache.get(systemId

[kaffe] CVS kaffe (robilad): No comment

[Kaffe CVS]

invalid rev format 1938

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): No comment

[Kaffe CVS]

invalid rev format 1938

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: awt fix

[Kaffe CVS]

PatchSet 6517 
Date: 2005/05/15 17:31:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: awt fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-06  Robert Schuster  <[EMAIL PROTECTED]>

* java/awt/Frame.java:
(setUndecorated): Toggled boolean expression.

Members: 
ChangeLog:1.4043->1.4044 
libraries/javalib/java/awt/Frame.java:1.26->1.27 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4043 kaffe/ChangeLog:1.4044
--- kaffe/ChangeLog:1.4043  Sun May 15 17:30:08 2005
+++ kaffe/ChangeLog Sun May 15 17:31:10 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-05-06  Robert Schuster  <[EMAIL PROTECTED]>
+
+* java/awt/Frame.java:
+(setUndecorated): Toggled boolean expression.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-06  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/text/PlainView.java
Index: kaffe/libraries/javalib/java/awt/Frame.java
diff -u kaffe/libraries/javalib/java/awt/Frame.java:1.26 
kaffe/libraries/javalib/java/awt/Frame.java:1.27
--- kaffe/libraries/javalib/java/awt/Frame.java:1.26Sun May 15 09:46:16 2005
+++ kaffe/libraries/javalib/java/awt/Frame.java Sun May 15 17:31:13 2005
@@ -593,7 +593,7 @@
*/
   public void setUndecorated (boolean undecorated)
   {
-if (!isDisplayable ())
+if (isDisplayable ())
   throw new IllegalComponentStateException ();
 
 this.undecorated = undecorated;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: awt fix

[Kaffe CVS]

PatchSet 6514 
Date: 2005/05/15 17:21:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: awt fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-04  Mark Wielaard  <[EMAIL PROTECTED]>

* java/awt/BufferCapabilities.java (BufferCapabilities): Make
documentation of arguments match code.

Members: 
ChangeLog:1.4039->1.4040 
libraries/javalib/java/awt/BufferCapabilities.java:1.4->1.5 
libraries/javalib/java/awt/BufferCapabilities.java:INITIAL->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4039 kaffe/ChangeLog:1.4040
--- kaffe/ChangeLog:1.4039  Sun May 15 17:20:15 2005
+++ kaffe/ChangeLog Sun May 15 17:21:50 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-05-04  Mark Wielaard  <[EMAIL PROTECTED]>
+
+* java/awt/BufferCapabilities.java (BufferCapabilities): Make
+documentation of arguments match code.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-04  Tom Tromey  <[EMAIL PROTECTED]>
 
 * java/nio/channels/FileLock.java (toString): Entirely avoid
Index: kaffe/libraries/javalib/java/awt/BufferCapabilities.java
diff -u kaffe/libraries/javalib/java/awt/BufferCapabilities.java:1.4 
kaffe/libraries/javalib/java/awt/BufferCapabilities.java:1.5
--- kaffe/libraries/javalib/java/awt/BufferCapabilities.java:1.4Sun May 
15 17:21:52 2005
+++ kaffe/libraries/javalib/java/awt/BufferCapabilities.javaSun May 15 
17:25:11 2005
@@ -132,17 +132,17 @@
   /**
* Creates a buffer capabilities object.
*
-   * @param frontCaps front buffer capabilities descriptor
-   * @param backCaps back buffer capabilities descriptor
-   * @param flipContents the results of a flip operation or null if
+   * @param front front buffer capabilities descriptor
+   * @param back back buffer capabilities descriptor
+   * @param flip the results of a flip operation or null if
* flipping is not supported
*
-   * @exception IllegalArgumentException if frontCaps or backCaps is
+   * @exception IllegalArgumentException if front or back is
* null
*/
-  public BufferCapabilities(ImageCapabilities frontCaps,
-   ImageCapabilities backCaps,
-FlipContents flipContents)
+  public BufferCapabilities(ImageCapabilities front,
+   ImageCapabilities back,
+FlipContents flip)
   {
 if (front ==  null || back == null)
   throw new IllegalArgumentException();
===
Checking out kaffe/libraries/javalib/java/awt/BufferCapabilities.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/awt/BufferCapabilities.java,v
VERS: 1.4
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/awt/BufferCapabilities.javaSun May 15 
17:29:05 2005
@@ -0,0 +1,251 @@
+/* BufferCapabilities.java -- double-buffering capabilities descriptor
+   Copyright (C) 2002, 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.awt;
+
+/**
+ * A double-buffering capability descriptor.  This class exposes
+ * details about the double-buffering algorithms used by image

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6509 
Date: 2005/05/15 17:15:59
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-04  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/text/PlainView.java
(drawUnselectedText): Call Utilities.drawTabbedText() with correct
offset parameter.
* javax/swing/text/Utilities.java
(drawTabbedText): Initilialize local variable pos correctly.

Members: 
ChangeLog:1.4034->1.4035 
libraries/javalib/javax/swing/text/PlainView.java:1.5->1.6 
libraries/javalib/javax/swing/text/Utilities.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4034 kaffe/ChangeLog:1.4035
--- kaffe/ChangeLog:1.4034  Sun May 15 17:14:45 2005
+++ kaffe/ChangeLog Sun May 15 17:15:59 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-05-04  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/text/PlainView.java
+(drawUnselectedText): Call Utilities.drawTabbedText() with correct
+offset parameter.
+* javax/swing/text/Utilities.java
+(drawTabbedText): Initilialize local variable pos correctly.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-03  Thomas Fitzsimmons  <[EMAIL PROTECTED]>
 
 * java/awt/image/VolatileImage.java: Document.
Index: kaffe/libraries/javalib/javax/swing/text/PlainView.java
diff -u kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.5 
kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.6
--- kaffe/libraries/javalib/javax/swing/text/PlainView.java:1.5 Wed Jan 26 
13:40:06 2005
+++ kaffe/libraries/javalib/javax/swing/text/PlainView.java Sun May 15 
17:16:05 2005
@@ -148,7 +148,7 @@
 g.setColor(unselectedColor);
 Segment segment = new Segment();
 getDocument().getText(p0, p1 - p0, segment);
-return Utilities.drawTabbedText(segment, x, y, g, this, 0);
+return Utilities.drawTabbedText(segment, x, y, g, this, segment.offset);
   }
 
   public void paint(Graphics g, Shape s)
Index: kaffe/libraries/javalib/javax/swing/text/Utilities.java
diff -u kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.4 
kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.5
--- kaffe/libraries/javalib/javax/swing/text/Utilities.java:1.4 Sat Feb 19 
15:14:19 2005
+++ kaffe/libraries/javalib/javax/swing/text/Utilities.java Sun May 15 
17:16:05 2005
@@ -92,7 +92,7 @@
 int ascent = metrics.getAscent();
 
 int pixelWidth = 0;
-int pos = 0;
+int pos = s.offset;
 int len = 0;
 
 for (int offset = s.offset; offset < (s.offset + s.count); ++offset)

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6505 
Date: 2005/05/15 17:10:47
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-03  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/text/GapContent.java:
Removed debugging output stuff, which I accidentally left in.

2005-05-03  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/text/GapContent.java:
Implemented a real GapContent. Only the public methods have
been implemented so far and still no UndoableEdit support.

Members: 
ChangeLog:1.4030->1.4031 
libraries/javalib/javax/swing/text/GapContent.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4030 kaffe/ChangeLog:1.4031
--- kaffe/ChangeLog:1.4030  Sun May 15 17:05:16 2005
+++ kaffe/ChangeLog Sun May 15 17:10:47 2005
@@ -2,6 +2,21 @@
 
Resynced with GNU Classpath.
 
+   2005-05-03  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/text/GapContent.java:
+Removed debugging output stuff, which I accidentally left in.
+
+   2005-05-03  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/text/GapContent.java:
+Implemented a real GapContent. Only the public methods have
+been implemented so far and still no UndoableEdit support.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-05-02  David Gilbert  <[EMAIL PROTECTED]>
 
 * java/text/DecimalFormat.java
Index: kaffe/libraries/javalib/javax/swing/text/GapContent.java
diff -u kaffe/libraries/javalib/javax/swing/text/GapContent.java:1.5 
kaffe/libraries/javalib/javax/swing/text/GapContent.java:1.6
--- kaffe/libraries/javalib/javax/swing/text/GapContent.java:1.5Sun May 
15 10:13:31 2005
+++ kaffe/libraries/javalib/javax/swing/text/GapContent.javaSun May 15 
17:10:54 2005
@@ -40,8 +40,6 @@
 
 import java.io.Serializable;
 
-// too lazy to make a real gapcontent.
-// lets just use a stringbuffer instead.
 import javax.swing.undo.UndoableEdit;
 
 /**
@@ -53,20 +51,41 @@
  * has to be shifted around when the insertion point moves (then the gap also
  * moves and one array copy is necessary) or when the gap is filled up and
  * the buffer has to be enlarged.
+ *
+ * TODO: Implement UndoableEdit support stuff
  */
 public class GapContent
   implements AbstractDocument.Content, Serializable
 {
   private static final long serialVersionUID = 8374645204155842629L;
-
-  StringBuffer buf = new StringBuffer();
+
+  /**
+   * This is the default buffer size and the amount of bytes that
+   * a buffer is extended if it is full.
+   */
+  static final int DEFAULT_BUFSIZE = 64;
+
+  /**
+   * The text buffer.
+   */
+  char[] buffer;
+
+  /**
+   * The index of the first character of the gap.
+   */
+  int gapStart;
+
+  /**
+   * The index of the character after the last character of the gap.
+   */
+  int gapEnd;
 
   /**
* Creates a new GapContent object.
*/
   public GapContent()
   {
-this(10);
+this(DEFAULT_BUFSIZE);
   }
 
   /**
@@ -76,30 +95,33 @@
*/
   public GapContent(int size)
   {
-buf.append("\n");
+buffer = (char[]) allocateArray(size);
+gapStart = 0;
+gapEnd = size - 1;
+buffer[size - 1] = '\n';
   }
 
   /**
-   * Creates and returns a mark at the specified position.
-   *
-   * @param offset the position at which to create the mark
+   * Allocates an array of the specified length that can then be used as
+   * buffer.
*
-   * @return the create Position object for the mark
+   * @param size the size of the array to be allocated
*
-   * @throws BadLocationException if the offset is not a valid position in
-   * the buffer
+   * @return the allocated array
*/
-  public Position createPosition(final int offset) throws BadLocationException
+  protected Object allocateArray(int size)
   {
-return new Position()
-  {
-   int off = offset;
+return new char[size];
+  }
 
-   public int getOffset()
-   {
- return off;
-   }
-  };
+  /**
+   * Returns the length of the allocated buffer array.
+   *
+   * @return the length of the allocated buffer array
+   */
+  protected int getArrayLength()
+  {
+return buffer.length;
   }
 
   /**
@@ -109,7 +131,7 @@
*/
   public int length()
   {
-return buf.length();
+return buffer.length - (gapEnd - gapStart);
   }
 
   /**
@@ -127,7 +149,27 @@
   public UndoableEdit insertString(int where, String str)
 throws BadLocationException
   {
-buf.insert(where, str);
+// check arguments
+int length = length();
+int strLen = str.length();
+
+if (where >= length)
+  throw new BadLocationException("the where argument cannot be greater"
+ + " than the content length", where);
+
+// check if the gap is big enough to hold the string
+if ((gapE

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6502 
Date: 2005/05/15 16:53:48
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: cleanup

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-05-01  Mark Wielaard  <[EMAIL PROTECTED]>

* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
(window_delete_cb): Don't use C++ style comments.

Members: 
ChangeLog:1.4027->1.4028 

libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.17->1.18
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4027 kaffe/ChangeLog:1.4028
--- kaffe/ChangeLog:1.4027  Sun May 15 16:49:55 2005
+++ kaffe/ChangeLog Sun May 15 16:53:48 2005
@@ -1,5 +1,14 @@
 2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   Resynced with GNU Classpath.
+
+   2005-05-01  Mark Wielaard  <[EMAIL PROTECTED]>
+
+* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+(window_delete_cb): Don't use C++ style comments.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
* include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS):
Added gnu_classpath_VMStackWalker.h.
 
Index: 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.17
 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.18
--- 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.17
  Sun May 15 13:06:46 2005
+++ 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
   Sun May 15 16:53:53 2005
@@ -477,10 +477,10 @@
  (jobject) NULL, (jint) 0);
   gdk_threads_enter ();
 
-  // Prevents that the Window dissappears ("destroy"
-  // not being signalled). This is necessary because it
-  // should be up to a WindowListener implementation
-  // how the AWT Frame responds to close requests.
+  /* Prevents that the Window dissappears ("destroy"
+ not being signalled). This is necessary because it
+ should be up to a WindowListener implementation
+ how the AWT Frame responds to close requests. */
   return TRUE;
 }
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: serialization and vmstackwalker

[Kaffe CVS]

PatchSet 6501 
Date: 2005/05/15 16:49:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: serialization and vmstackwalker

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

* include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS):
Added gnu_classpath_VMStackWalker.h.

* libraries/clib/native/gnu_classpath_VMStackWalker.c:
New file.

Resynced with GNU Classpath.

2005-04-30  Mark Wielaard  <[EMAIL PROTECTED]>

* java/io/ObjectInputStream.java
(currentLoader): Don't create SecurityManager, directly call
VMObjectInputStream.currentClassLoader().
(resolveProxyClass): Use currentLoader().
* vm/reference/java/io/VMObjectInputStream.java
(currentClassLoader(SecurityManager)): Removed.
(currentClassLoader): New method.
* native/jni/java-io/java_io_VMObjectInputStream.c
(Java_java_io_VMObjectInputStream_currentClassLoader): Removed.

2005-01-29  Steven Augart  <[EMAIL PROTECTED]>

* vm/reference/gnu/classpath/VMStackWalker.java: Doc fix.

2005-01-07  Archie Cobbs  <[EMAIL PROTECTED]>

* vm/reference/gnu/classpath/VMStackWalker.java: New class.

Members: 
ChangeLog:1.4026->1.4027 
include/Makefile.am:1.100->1.101 
include/Makefile.in:1.229->1.230 
libraries/clib/io/java_io_VMObjectInputStream.c:1.1->1.2 
libraries/clib/native/Makefile.am:1.43->1.44 
libraries/clib/native/Makefile.in:1.182->1.183 
libraries/clib/native/gnu_classpath_VMStackWalker.c:INITIAL->1.1 
libraries/javalib/Makefile.am:1.347->1.348 
libraries/javalib/Makefile.in:1.437->1.438 
libraries/javalib/all.files:1.121->1.122 
libraries/javalib/gnu/classpath/VMStackWalker.java:INITIAL->1.1 
libraries/javalib/java/io/ObjectInputStream.java:1.52->1.53 
libraries/javalib/java/io/VMObjectInputStream.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4026 kaffe/ChangeLog:1.4027
--- kaffe/ChangeLog:1.4026  Sun May 15 13:08:55 2005
+++ kaffe/ChangeLog Sun May 15 16:49:55 2005
@@ -1,5 +1,35 @@
 2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * include/Makefile.am (NOINSTALL_JNI_DERIVED_HDRS):
+   Added gnu_classpath_VMStackWalker.h.
+
+   * libraries/clib/native/gnu_classpath_VMStackWalker.c:
+   New file.
+
+   Resynced with GNU Classpath.
+
+   2005-04-30  Mark Wielaard  <[EMAIL PROTECTED]>
+
+* java/io/ObjectInputStream.java
+(currentLoader): Don't create SecurityManager, directly call
+VMObjectInputStream.currentClassLoader().
+(resolveProxyClass): Use currentLoader().
+* vm/reference/java/io/VMObjectInputStream.java
+(currentClassLoader(SecurityManager)): Removed.
+(currentClassLoader): New method.
+* native/jni/java-io/java_io_VMObjectInputStream.c
+(Java_java_io_VMObjectInputStream_currentClassLoader): Removed.
+
+   2005-01-29  Steven Augart  <[EMAIL PROTECTED]>
+
+* vm/reference/gnu/classpath/VMStackWalker.java: Doc fix.
+
+   2005-01-07  Archie Cobbs  <[EMAIL PROTECTED]>
+
+* vm/reference/gnu/classpath/VMStackWalker.java: New class.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
Resynced with GNU Classpath.
 
2005-04-30  Mark Wielaard  <[EMAIL PROTECTED]>
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.100 kaffe/include/Makefile.am:1.101
--- kaffe/include/Makefile.am:1.100 Sat May 14 21:46:26 2005
+++ kaffe/include/Makefile.am   Sun May 15 16:50:00 2005
@@ -219,6 +219,7 @@
java_lang_VMDouble.h \
java_lang_VMFloat.h \
java_lang_ref_Reference.h \
+   gnu_classpath_VMStackWalker.h \
gnu_classpath_VMSystemProperties.h \
gnu_java_nio_charset_iconv_IconvDecoder.h \
gnu_java_nio_charset_iconv_IconvEncoder.h \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.229 kaffe/include/Makefile.in:1.230
--- kaffe/include/Makefile.in:1.229 Sat May 14 21:46:26 2005
+++ kaffe/include/Makefile.in   Sun May 15 16:50:00 2005
@@ -561,6 +561,7 @@
java_lang_VMDouble.h \
java_lang_VMFloat.h \
java_lang_ref_Reference.h \
+   gnu_classpath_VMStackWalker.h \
gnu_classpath_VMSystemProperties.h \
gnu_java_nio_charset_iconv_IconvDecoder.h \
gnu_java_nio_charset_iconv_IconvEncoder.h \
Index: kaffe/libraries/clib/io/java_io_VMObjectInputStream.c
diff -u kaffe/libraries/clib/io/java_io_VMObjectInputStream.c:1.1 
kaffe/libraries/clib/io/java_io_VMObjectInputStream.c:1.2
--- kaffe/libraries/clib/io/java_io_VMObjectInputStream.c:1.1   Fri Apr 22 
22:29:45 2005
+++ kaffe/libraries/clib/io/java_io_VMObjectInputStream.c   Sun May 15 
16:50:00 2005
@@ -49,28 +49,6 @@
 
 /*
  * Class: java_io_VMObjectInputStream
- * Method:currentClassLoader
- * Signature: (Ljava/lang/SecurityManager;)Ljava/lang/Clas

[kaffe] CVS kaffe (robilad): resyncd with gnu classpath: awt fix

[Kaffe CVS]

PatchSet 6500 
Date: 2005/05/15 13:09:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resyncd with gnu classpath: awt fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-30  Mark Wielaard  <[EMAIL PROTECTED]>

* gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare
GtkImages.

Members: 
libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15->1.16 
ChangeLog:1.4025->1.4026 

Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15 
kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.16
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java:1.15  Sat Feb 
19 15:30:27 2005
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GtkToolkit.java   Sun May 
15 13:09:00 2005
@@ -403,32 +403,41 @@
 return systemClipboard;
   }
 
+  /**
+   * Prepares a GtkImage. For every other kind of Image it just
+   * assumes the image is already prepared for rendering.
+   */
   public boolean prepareImage (Image image, int width, int height, 
   ImageObserver observer) 
   {
-GtkImage i = (GtkImage) image;
-
-if (i.isLoaded ()) return true;
-
-class PrepareImage extends Thread
-{
-  GtkImage image;
-  ImageObserver observer;
-
-  PrepareImage (GtkImage image, ImageObserver observer)
+if (image instanceof GtkImage)
   {
-   this.image = image;
-   image.setObserver (observer);
+   GtkImage i = (GtkImage) image;
+   
+   if (i.isLoaded ()) return true;
+   
+   class PrepareImage extends Thread
+   {
+ GtkImage image;
+ ImageObserver observer;
+ 
+ PrepareImage (GtkImage image, ImageObserver observer)
+ {
+   this.image = image;
+   image.setObserver (observer);
+ }
+ 
+ public void run ()
+ {
+   image.source.startProduction (image);
+ }
+   }
+   
+   new PrepareImage (i, observer).start ();
+   return false;
   }
-  
-  public void run ()
-  {
-   image.source.startProduction (image);
-  }
-}
-
-new PrepareImage (i, observer).start ();
-return false;
+else
+  return true;
   }
 
   public native void sync();
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4025 kaffe/ChangeLog:1.4026
--- kaffe/ChangeLog:1.4025  Sun May 15 13:06:43 2005
+++ kaffe/ChangeLog Sun May 15 13:08:55 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-30  Mark Wielaard  <[EMAIL PROTECTED]>
+
+* gnu/java/awt/peer/gtk/GtkToolkit.java (prepareImage): Only prepare
+GtkImages.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>
 
 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: awt fix

[Kaffe CVS]

PatchSet 6499 
Date: 2005/05/15 13:06:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: awt fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>

* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
(window_delete_cb): Made the function return TRUE.

Members: 
ChangeLog:1.4024->1.4025 

libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16->1.17
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4024 kaffe/ChangeLog:1.4025
--- kaffe/ChangeLog:1.4024  Sun May 15 13:04:52 2005
+++ kaffe/ChangeLog Sun May 15 13:06:43 2005
@@ -4,6 +4,15 @@
 
2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>
 
+* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+(window_delete_cb): Made the function return TRUE.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>
+
 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
 copyright header.
 
Index: 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16
 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.17
--- 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16
  Sun May 15 13:04:54 2005
+++ 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
   Sun May 15 13:06:46 2005
@@ -56,7 +56,7 @@
XEvent  *xevent,
XPointer arg);
 
-static void window_delete_cb (GtkWidget *widget, GdkEvent *event,
+static gboolean window_delete_cb (GtkWidget *widget, GdkEvent *event,
  jobject peer);
 static void window_destroy_cb (GtkWidget *widget, GdkEvent *event,
   jobject peer);
@@ -465,7 +465,7 @@
 return False;
 }
 
-static void
+static gboolean
 window_delete_cb (GtkWidget *widget __attribute__((unused)),
  GdkEvent *event __attribute__((unused)),
  jobject peer)
@@ -476,6 +476,12 @@
  (jint) AWT_WINDOW_CLOSING,
  (jobject) NULL, (jint) 0);
   gdk_threads_enter ();
+
+  // Prevents that the Window dissappears ("destroy"
+  // not being signalled). This is necessary because it
+  // should be up to a WindowListener implementation
+  // how the AWT Frame responds to close requests.
+  return TRUE;
 }
 
 static void

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): reynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6498 
Date: 2005/05/15 13:04:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
reynced with gnu classpath: cleanup

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>

* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
copyright header.

Members: 
ChangeLog:1.4023->1.4024 

libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.15->1.16
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4023 kaffe/ChangeLog:1.4024
--- kaffe/ChangeLog:1.4023  Sun May 15 12:57:10 2005
+++ kaffe/ChangeLog Sun May 15 13:04:52 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-30  Robert Schuster  <[EMAIL PROTECTED]>
+
+* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c: Fixed
+copyright header.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-29  Audrius Meskauskas  <[EMAIL PROTECTED]>
 
 * org/omg/CORBA/WStringSeqHelper.java,
Index: 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
diff -u 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.15
 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.16
--- 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.15
  Sat Apr 23 12:48:23 2005
+++ 
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
   Sun May 15 13:04:54 2005
@@ -1,5 +1,5 @@
 /* gtkwindowpeer.c -- Native implementation of GtkWindowPeer
-   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: iconv fix

[Kaffe CVS]

PatchSet 6496 
Date: 2005/05/15 12:46:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: iconv fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-29  Sven de Marothy  <[EMAIL PROTECTED]>
Mark Wielaard  <[EMAIL PROTECTED]>

* java/nio/charset/Charset.java (defaultCharset): Use
SystemProperties.
(provider): Check gnu.classpath.nio.charset.provider.iconv system
property and return the IconvProvider when set.

Members: 
ChangeLog:1.4021->1.4022 
libraries/javalib/java/nio/charset/Charset.java:1.13->1.14 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4021 kaffe/ChangeLog:1.4022
--- kaffe/ChangeLog:1.4021  Sun May 15 12:31:35 2005
+++ kaffe/ChangeLog Sun May 15 12:46:14 2005
@@ -2,6 +2,18 @@
 
Resynced with GNU Classpath.
 
+   2005-04-29  Sven de Marothy  <[EMAIL PROTECTED]>
+Mark Wielaard  <[EMAIL PROTECTED]>
+
+* java/nio/charset/Charset.java (defaultCharset): Use
+SystemProperties.
+(provider): Check gnu.classpath.nio.charset.provider.iconv system
+property and return the IconvProvider when set.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
 
 * java/nio/charset/Charset.java
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13 
kaffe/libraries/javalib/java/nio/charset/Charset.java:1.14
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13  Sun May 15 
12:31:49 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java   Sun May 15 
12:46:20 2005
@@ -38,7 +38,10 @@
 
 package java.nio.charset;
 
+import gnu.classpath.SystemProperties;
+
 import gnu.java.nio.charset.Provider;
+import gnu.java.nio.charset.iconv.IconvProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -129,7 +132,7 @@
 
 try 
   {
-   encoding = System.getProperty("file.encoding");
+   encoding = SystemProperties.getProperty("file.encoding");
   }
 catch(SecurityException e)
   {
@@ -231,6 +234,12 @@
 
   private static CharsetProvider provider()
   {
+String useIconv = SystemProperties.getProperty
+  ("gnu.classpath.nio.charset.provider.iconv");
+
+if (useIconv != null)
+  return IconvProvider.provider();
+
 return Provider.provider();
   }
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: corba fixes

[Kaffe CVS]

PatchSet 6497 
Date: 2005/05/15 12:57:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: corba fixes

Members: 
ChangeLog:1.4022->1.4023 
libraries/javalib/org/omg/CORBA/AnySeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/CharSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/DoubleSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/FloatSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/LongLongSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/LongSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/OctetSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/ShortSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/StringSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/ULongLongSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/ULongSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/UShortSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/WCharSeqHelper.java:1.1->1.2 
libraries/javalib/org/omg/CORBA/WStringSeqHelper.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4022 kaffe/ChangeLog:1.4023
--- kaffe/ChangeLog:1.4022  Sun May 15 12:46:14 2005
+++ kaffe/ChangeLog Sun May 15 12:57:10 2005
@@ -2,6 +2,29 @@
 
Resynced with GNU Classpath.
 
+   2005-04-29  Audrius Meskauskas  <[EMAIL PROTECTED]>
+
+* org/omg/CORBA/WStringSeqHelper.java,
+org/omg/CORBA/AnySeqHelper.java,
+org/omg/CORBA/BooleanSeqHelper.java,
+org/omg/CORBA/CharSeqHelper.java,
+org/omg/CORBA/DoubleSeqHelper.java,
+org/omg/CORBA/FloatSeqHelper.java,
+org/omg/CORBA/LongLongSeqHelper.java,
+org/omg/CORBA/LongSeqHelper.java,
+org/omg/CORBA/OctetSeqHelper.java,
+org/omg/CORBA/ShortSeqHelper.java,
+org/omg/CORBA/StringSeqHelper.java,
+org/omg/CORBA/ULongLongSeqHelper.java,
+org/omg/CORBA/ULongSeqHelper.java,
+org/omg/CORBA/UShortSeqHelper.java,
+org/omg/CORBA/WCharSeqHelper.java:
+Removing redundant object instantiation.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-29  Sven de Marothy  <[EMAIL PROTECTED]>
 Mark Wielaard  <[EMAIL PROTECTED]>
 
Index: kaffe/libraries/javalib/org/omg/CORBA/AnySeqHelper.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/AnySeqHelper.java:1.1 
kaffe/libraries/javalib/org/omg/CORBA/AnySeqHelper.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/AnySeqHelper.java:1.1 Mon Mar 21 
19:16:21 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/AnySeqHelper.java Sun May 15 
12:57:14 2005
@@ -114,9 +114,12 @@
*/
   public static Any[] read(InputStream input)
   {
-AnySeqHolder h = new AnySeqHolder();
-h._read(input);
-return h.value;
+Any[] value = new Any[ input.read_long() ];
+for (int i = 0; i < value.length; i++)
+  {
+value [ i ] = input.read_any();
+  }
+return value;
   }
 
   /**
@@ -132,16 +135,17 @@
 
   /**
* Writes the array of [EMAIL PROTECTED] Any}'s into the given stream.
-   * This implementation first creates an instance of
-   * [EMAIL PROTECTED] AnySeqHolder} and then delegates functionality
-   * to its _write() method.
*
* @param output the CORBA (not java.io) output stream to write.
* @param value the value that must be written.
*/
   public static void write(OutputStream output, Any[] value)
   {
-AnySeqHolder h = new AnySeqHolder(value);
-h._write(output);
+output.write_long(value.length);
+
+for (int i = 0; i < value.length; i++)
+  {
+output.write_any(value [ i ]);
+  }
   }
 }
Index: kaffe/libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java
diff -u kaffe/libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java:1.1 
kaffe/libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java:1.2
--- kaffe/libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java:1.1 Tue Mar 
15 01:36:13 2005
+++ kaffe/libraries/javalib/org/omg/CORBA/BooleanSeqHelper.java Sun May 15 
12:57:14 2005
@@ -106,18 +106,15 @@
 
   /**
* Reads the boolean[] from the CORBA input stream.
-   * This implementation first creates an instance of
-   * [EMAIL PROTECTED] BooleanSeqHolder} and then delegates functionality
-   * to its _read() method.
*
* @param input the CORBA (not java.io) stream to read from.
* @return the value from the stream.
*/
   public static boolean[] read(InputStream input)
   {
-BooleanSeqHolder h = new BooleanSeqHolder();
-h._read(input);
-return h.value;
+boolean [] value = new boolean[ input.read_long() ];
+input.read_boolean_array(value, 0, value.length);
+return value;
   }
 
   /**
@@ -133,16 +130,13 @@
 
   /**
* Writes the boolean[] into the given stream.
- 

[kaffe] CVS kaffe (robilad): Resynced with GNU classpath: swing fix

[Kaffe CVS]

PatchSet 6489 
Date: 2005/05/15 12:06:42
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-28  Michael Koch  <[EMAIL PROTECTED]>

* javax/swing/JTextArea.java
(replaceRange): Removed error throwing.

Members: 
ChangeLog:1.4014->1.4015 
libraries/javalib/javax/swing/JTextArea.java:1.8->1.9 

cvs rdiff: [12:17:37] waiting for robilad's lock in /home/cvs/kaffe/kaffe
cvs rdiff: [12:18:07] obtained lock in /home/cvs/kaffe/kaffe
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4014 kaffe/ChangeLog:1.4015
--- kaffe/ChangeLog:1.4014  Sun May 15 11:48:51 2005
+++ kaffe/ChangeLog Sun May 15 12:06:42 2005
@@ -4,6 +4,15 @@
 
2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
 
+* javax/swing/JTextArea.java
+(replaceRange): Removed error throwing.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
+
 * java/nio/charset/Charset.java
 (providers2): Renamed from 'providers'.
 
Index: kaffe/libraries/javalib/javax/swing/JTextArea.java
diff -u kaffe/libraries/javalib/javax/swing/JTextArea.java:1.8 
kaffe/libraries/javalib/javax/swing/JTextArea.java:1.9
--- kaffe/libraries/javalib/javax/swing/JTextArea.java:1.8  Wed Mar  2 
22:26:43 2005
+++ kaffe/libraries/javalib/javax/swing/JTextArea.java  Sun May 15 12:06:48 2005
@@ -474,8 +474,7 @@
   }
 catch (BadLocationException e)
   {
-// This cannot happen as we check offset above.
-throw new Error("Please report a bug", e);
+   // This cannot happen as we check offset above.
   }
   }
 }

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: beans fix

[Kaffe CVS]

PatchSet 6491 
Date: 2005/05/15 12:17:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: beans fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-28  Robert Schuster  <[EMAIL PROTECTED]>

* java/beans/FeatureDescriptor.java:
(getShortDescription): Implemented fallback mechanism and fixed
documentation (fixes bug #12637).
(getDisplayName): Dito.

Members: 
ChangeLog:1.4016->1.4017 
libraries/javalib/java/beans/FeatureDescriptor.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4016 kaffe/ChangeLog:1.4017
--- kaffe/ChangeLog:1.4016  Sun May 15 12:12:28 2005
+++ kaffe/ChangeLog Sun May 15 12:17:50 2005
@@ -4,6 +4,17 @@
 
2005-04-28  Robert Schuster  <[EMAIL PROTECTED]>
 
+* java/beans/FeatureDescriptor.java:
+(getShortDescription): Implemented fallback mechanism and fixed
+documentation (fixes bug #12637).
+(getDisplayName): Dito.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-28  Robert Schuster  <[EMAIL PROTECTED]>
+
 * java/beans/Introspector.java: Fixed bug #12624, BeanDescriptors
 will now be set correctly.
 (flushCaches): Now flushes all cached intermediate data.
Index: kaffe/libraries/javalib/java/beans/FeatureDescriptor.java
diff -u kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.6 
kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.7
--- kaffe/libraries/javalib/java/beans/FeatureDescriptor.java:1.6   Sat Jan 
 3 02:32:51 2004
+++ kaffe/libraries/javalib/java/beans/FeatureDescriptor.java   Sun May 15 
12:17:56 2005
@@ -1,5 +1,5 @@
 /* java.beans.FeatureDescriptor
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -57,7 +57,6 @@
  *
  * @author John Keiser
  * @since 1.1
- * @version 1.1.0, 31 May 1998
  */
 
 public class FeatureDescriptor
@@ -99,10 +98,13 @@
 
   /**
* Get the localized (display) name of this feature.
+   *
+   * @returns The localized display name of this feature or falls
+   * back to the programmatic name.
*/
   public String getDisplayName()
   {
-return displayName;
+return (displayName == null) ? name : displayName;
   }
 
   /**
@@ -117,10 +119,14 @@
 
   /**
* Get the localized short description for this feature.
+   *
+   * @returns A short localized description of this feature or
+   * what getDisplayName returns in case, that no short 
description
+   * is available.
*/
   public String getShortDescription()
   {
-return shortDescription;
+return (shortDescription == null) ? getDisplayName() : shortDescription;
   }
 
   /**

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath:

[Kaffe CVS]

PatchSet 6495 
Date: 2005/05/15 12:31:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath:

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-29  Michael Koch  <[EMAIL PROTECTED]>

* java/nio/charset/Charset.java
(defaultCharset): Reformatted.

Members: 
libraries/javalib/java/nio/charset/Charset.java:1.12->1.13 
ChangeLog:1.4020->1.4021 

Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12 
kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12  Sun May 15 
11:48:52 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java   Sun May 15 
12:31:49 2005
@@ -1,5 +1,5 @@
 /* Charset.java -- 
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -126,22 +126,39 @@
   public static Charset defaultCharset()
   {
 String encoding;
+
 try 
   {
encoding = System.getProperty("file.encoding");
-  } catch(SecurityException e) {
+  }
+catch(SecurityException e)
+  {
+   // Use fallback.
encoding = "ISO-8859-1";
-  } catch(IllegalArgumentException e) {
+  }
+catch(IllegalArgumentException e)
+  {
+   // Use fallback.
encoding = "ISO-8859-1";
   }
 
 try
   {
return forName(encoding);
-  } catch(UnsupportedCharsetException e) {
-  } catch(IllegalCharsetNameException e) {
-  } catch(IllegalArgumentException e) {
   }
+catch(UnsupportedCharsetException e)
+  {
+   // Ignore.
+  }
+catch(IllegalCharsetNameException e)
+  {
+   // Ignore.
+  }
+catch(IllegalArgumentException e)
+  {
+   // Ignore.
+  }
+
 throw new IllegalStateException("Can't get default charset!");
   }
 
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4020 kaffe/ChangeLog:1.4021
--- kaffe/ChangeLog:1.4020  Sun May 15 12:27:23 2005
+++ kaffe/ChangeLog Sun May 15 12:31:35 2005
@@ -4,6 +4,15 @@
 
2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
 
+* java/nio/charset/Charset.java
+(defaultCharset): Reformatted.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
+
 * gnu/java/net/protocol/http/HTTPConnection.java:
 (userAgent): Initialize from system properties.
 (initUserAgent): Removed.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath:

[Kaffe CVS]

PatchSet 6495 
Date: 2005/05/15 12:31:49
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath:

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-29  Michael Koch  <[EMAIL PROTECTED]>

* java/nio/charset/Charset.java
(defaultCharset): Reformatted.

Members: 
libraries/javalib/java/nio/charset/Charset.java:1.12->1.13 
ChangeLog:1.4020->1.4021 

Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12 
kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12  Sun May 15 
11:48:52 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java   Sun May 15 
12:31:49 2005
@@ -1,5 +1,5 @@
 /* Charset.java -- 
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -126,22 +126,39 @@
   public static Charset defaultCharset()
   {
 String encoding;
+
 try 
   {
encoding = System.getProperty("file.encoding");
-  } catch(SecurityException e) {
+  }
+catch(SecurityException e)
+  {
+   // Use fallback.
encoding = "ISO-8859-1";
-  } catch(IllegalArgumentException e) {
+  }
+catch(IllegalArgumentException e)
+  {
+   // Use fallback.
encoding = "ISO-8859-1";
   }
 
 try
   {
return forName(encoding);
-  } catch(UnsupportedCharsetException e) {
-  } catch(IllegalCharsetNameException e) {
-  } catch(IllegalArgumentException e) {
   }
+catch(UnsupportedCharsetException e)
+  {
+   // Ignore.
+  }
+catch(IllegalCharsetNameException e)
+  {
+   // Ignore.
+  }
+catch(IllegalArgumentException e)
+  {
+   // Ignore.
+  }
+
 throw new IllegalStateException("Can't get default charset!");
   }
 
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4020 kaffe/ChangeLog:1.4021
--- kaffe/ChangeLog:1.4020  Sun May 15 12:27:23 2005
+++ kaffe/ChangeLog Sun May 15 12:31:35 2005
@@ -4,6 +4,15 @@
 
2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
 
+* java/nio/charset/Charset.java
+(defaultCharset): Reformatted.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
+
 * gnu/java/net/protocol/http/HTTPConnection.java:
 (userAgent): Initialize from system properties.
 (initUserAgent): Removed.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: http fix

[Kaffe CVS]

PatchSet 6494 
Date: 2005/05/15 12:27:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: http fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-29  Michael Koch  <[EMAIL PROTECTED]>

* gnu/java/net/protocol/http/HTTPConnection.java:
(userAgent): Initialize from system properties.
(initUserAgent): Removed.

Members: 
ChangeLog:1.4019->1.4020 

libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4019 kaffe/ChangeLog:1.4020
--- kaffe/ChangeLog:1.4019  Sun May 15 12:25:35 2005
+++ kaffe/ChangeLog Sun May 15 12:27:23 2005
@@ -4,6 +4,16 @@
 
2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
 
+* gnu/java/net/protocol/http/HTTPConnection.java:
+(userAgent): Initialize from system properties.
+(initUserAgent): Removed.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-29  Michael Koch  <[EMAIL PROTECTED]>
+
 * java/lang/ClassLoader.java:
 Fixed formatting.
 
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java
diff -u 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.7
--- kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java:1.6  
Tue Mar  8 21:03:51 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPConnection.java  
Sun May 15 12:27:23 2005
@@ -1,5 +1,5 @@
 /* HTTPConnection.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,6 +39,7 @@
 package gnu.java.net.protocol.http;
 
 import gnu.classpath.Configuration;
+import gnu.classpath.SystemProperties;
 import gnu.java.net.EmptyX509TrustManager;
 import gnu.java.net.protocol.http.event.ConnectionEvent;
 import gnu.java.net.protocol.http.event.ConnectionListener;
@@ -83,28 +84,7 @@
*/
   public static final int HTTPS_PORT = 443;
 
-  private static final String userAgent = initUserAgent();
-
-  private static String initUserAgent()
-  {
-try
-  {
-StringBuffer buf = new StringBuffer("classpath/");
-buf.append(Configuration.CLASSPATH_VERSION);
-buf.append(" (");
-buf.append(System.getProperty("os.name"));
-buf.append("; ");
-buf.append(System.getProperty("os.arch"));
-buf.append("; ");
-buf.append(System.getProperty("user.language"));
-buf.append(")");
-return buf.toString();
-  }
-catch (SecurityException e)
-  {
-return "inetlib/1.1";
-  }
-  }
+  private static final String userAgent = 
SystemProperties.getProperty("http.agent");
 
   /**
* The host name of the server to connect to.

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpat: beans fix

[Kaffe CVS]

PatchSet 6490 
Date: 2005/05/15 12:12:28
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpat: beans fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-28  Robert Schuster  <[EMAIL PROTECTED]>

* java/beans/Introspector.java: Fixed bug #12624, BeanDescriptors
will now be set correctly.
(flushCaches): Now flushes all cached intermediate data.

Members: 
ChangeLog:1.4015->1.4016 
libraries/javalib/java/beans/Introspector.java:INITIAL->1.19 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4015 kaffe/ChangeLog:1.4016
--- kaffe/ChangeLog:1.4015  Sun May 15 12:06:42 2005
+++ kaffe/ChangeLog Sun May 15 12:12:28 2005
@@ -2,6 +2,16 @@
 
Resynced with GNU Classpath.
 
+   2005-04-28  Robert Schuster  <[EMAIL PROTECTED]>
+
+* java/beans/Introspector.java: Fixed bug #12624, BeanDescriptors
+will now be set correctly.
+(flushCaches): Now flushes all cached intermediate data.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
 
 * javax/swing/JTextArea.java
===
Checking out kaffe/libraries/javalib/java/beans/Introspector.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/beans/Introspector.java,v
VERS: 1.19
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/beans/Introspector.javaSun May 15 
12:22:34 2005
@@ -0,0 +1,608 @@
+/* java.beans.Introspector
+   Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.beans;
+
+import gnu.java.beans.BeanInfoEmbryo;
+import gnu.java.beans.ExplicitBeanInfo;
+import gnu.java.beans.IntrospectionIncubator;
+import gnu.java.lang.ClassHelper;
+
+import java.util.Hashtable;
+import java.util.Vector;
+
+/**
+ * Introspector is the class that does the bulk of the
+ * design-time work in Java Beans.  Every class must have
+ * a BeanInfo in order for an RAD tool to use it; but, as
+ * promised, you don't have to write the BeanInfo class
+ * yourself if you don't want to.  All you have to do is
+ * call getBeanInfo() in the Introspector and it will use
+ * standard JavaBeans-defined method signatures to
+ * determine the information about your class.
+ *
+ * Don't worry about it too much, though: you can provide
+ * JavaBeans with as much customized information as you
+ * want, or as little as you want, using the BeanInfo
+ * interface (see BeanInfo for details).
+ *
+ * Order of Operations
+ *
+ * When you call getBeanInfo(class c), the Introspector
+ * first searches for BeanInfo class to see if you
+ * provided any explicit information.  It searches for a
+ * class named BeanInfo in different
+ * packages, first searching the bean class's package
+ * and then moving on to search the beanInfoSearchPath.
+ *
+ * If it does not find a BeanInfo class, it acts as though
+ * it had found a BeanInfo class returning null from all
+ * methods (meaning it should discover everything through
+ * Introspection).  If it does, then it takes the
+ * information it finds in the BeanInfo class to be
+ * canonical (that is, the information 

[kaffe] CVS kaffe (robilad): reverted bogus Security commit

[Kaffe CVS]

PatchSet 6488 
Date: 2005/05/15 12:04:05
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
reverted bogus Security commit

Members: 
libraries/javalib/java/security/Security.java:1.20->1.21 

Index: kaffe/libraries/javalib/java/security/Security.java
diff -u kaffe/libraries/javalib/java/security/Security.java:1.20 
kaffe/libraries/javalib/java/security/Security.java:1.21
--- kaffe/libraries/javalib/java/security/Security.java:1.20Sun May 15 
11:48:53 2005
+++ kaffe/libraries/javalib/java/security/Security.java Sun May 15 12:04:05 2005
@@ -40,8 +40,6 @@
 
 import gnu.classpath.SystemProperties;
 
-import gnu.classpath.Configuration;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: nio fix

[Kaffe CVS]

PatchSet 6487 
Date: 2005/05/15 11:48:51
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: nio fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-28  Michael Koch  <[EMAIL PROTECTED]>

* java/nio/charset/Charset.java
(providers2): Renamed from 'providers'.

Members: 
ChangeLog:1.4013->1.4014 
libraries/javalib/java/nio/charset/Charset.java:1.11->1.12 
libraries/javalib/java/security/Security.java:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4013 kaffe/ChangeLog:1.4014
--- kaffe/ChangeLog:1.4013  Sun May 15 11:44:03 2005
+++ kaffe/ChangeLog Sun May 15 11:48:51 2005
@@ -4,6 +4,15 @@
 
2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
 
+* java/nio/charset/Charset.java
+(providers2): Renamed from 'providers'.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
+
 * java/security/AccessControlContext.java:
 Reformatted.
 
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.11 
kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.11  Sat Apr 23 
11:53:13 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java   Sun May 15 
11:48:52 2005
@@ -185,7 +185,7 @@
   {
 checkName (charsetName);
 Charset cs = null;
-CharsetProvider[] providers = providers();
+CharsetProvider[] providers = providers2();
 for (int i = 0; i < providers.length; i++)
   {
 cs = providers[i].charsetForName(charsetName);
@@ -199,7 +199,7 @@
   {
 TreeMap charsets = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 
-CharsetProvider[] providers = providers();
+CharsetProvider[] providers = providers2();
 for (int j = 0; j < providers.length; j++)
   {
 for (Iterator i = providers[j].charsets(); i.hasNext(); )
@@ -222,7 +222,7 @@
* java.nio.charset.spi.CharsetProvider in the resource directory
* META-INF/services.
*/
-  private static CharsetProvider[] providers()
+  private static CharsetProvider[] providers2()
   {
 if (providers == null)
   {
Index: kaffe/libraries/javalib/java/security/Security.java
diff -u kaffe/libraries/javalib/java/security/Security.java:1.19 
kaffe/libraries/javalib/java/security/Security.java:1.20
--- kaffe/libraries/javalib/java/security/Security.java:1.19Sun May 15 
11:44:06 2005
+++ kaffe/libraries/javalib/java/security/Security.java Sun May 15 11:48:53 2005
@@ -40,6 +40,8 @@
 
 import gnu.classpath.SystemProperties;
 
+import gnu.classpath.Configuration;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6486 
Date: 2005/05/15 11:44:03
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: cleanup

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-28  Michael Koch  <[EMAIL PROTECTED]>

* java/security/AccessControlContext.java:
Reformatted.

2005-04-28  Andreas Tobler  <[EMAIL PROTECTED]>

* java/security/Security.java (Security): Silence the warning about no
providers found in the no debug case.

Members: 
ChangeLog:1.4012->1.4013 
libraries/javalib/java/security/AccessControlContext.java:1.6->1.7 
libraries/javalib/java/security/Security.java:INITIAL->1.19 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4012 kaffe/ChangeLog:1.4013
--- kaffe/ChangeLog:1.4012  Sun May 15 11:20:45 2005
+++ kaffe/ChangeLog Sun May 15 11:44:03 2005
@@ -2,6 +2,20 @@
 
Resynced with GNU Classpath.
 
+   2005-04-28  Michael Koch  <[EMAIL PROTECTED]>
+
+* java/security/AccessControlContext.java:
+Reformatted.
+
+   2005-04-28  Andreas Tobler  <[EMAIL PROTECTED]>
+
+* java/security/Security.java (Security): Silence the warning about no
+providers found in the no debug case.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicScrollBarUI
Index: kaffe/libraries/javalib/java/security/AccessControlContext.java
diff -u kaffe/libraries/javalib/java/security/AccessControlContext.java:1.6 
kaffe/libraries/javalib/java/security/AccessControlContext.java:1.7
--- kaffe/libraries/javalib/java/security/AccessControlContext.java:1.6 Tue May 
 3 20:43:07 2005
+++ kaffe/libraries/javalib/java/security/AccessControlContext.java Sun May 
15 11:44:06 2005
@@ -65,7 +65,7 @@
*
* @param context The ProtectionDomains to use
*/
-  public AccessControlContext(ProtectionDomain[]context)
+  public AccessControlContext(ProtectionDomain[] context)
   {
 HashSet domains = new HashSet (context.length);
 for (int i = 0; i < context.length; i++)
===
Checking out kaffe/libraries/javalib/java/security/Security.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/security/Security.java,v
VERS: 1.19
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/security/Security.java Sun May 15 11:48:16 2005
@@ -0,0 +1,747 @@
+/* Security.java --- Java base security class implementation
+   Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.security;
+
+import gnu.classpath.SystemProperties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Vector;
+
+/**
+ * This class centralizes all security properties and common security methods.
+ * One of its primary uses is to manage providers.
+ *
+ * @author Mark Benvenuto ([EMAIL PROTE

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6485 
Date: 2005/05/15 11:20:50
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/BasicScrollBarUI
(getThumbBounds): Do not make thumb smaller than
minimumThumbSize.
* javax/swing/plaf/metal/MetalLookAndFeel
(initComponentDefaults): Added color defaults for ScrollBar.
* javax/swing/plaf/metal/MetalScrollBarUI
(paintThumb): Added.
(getMinimumThumbSize): Added.

Members: 

libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13->1.14 
libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8->1.9 
libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1->1.2 

Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.14
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13   
Sun May 15 11:07:04 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
Sun May 15 11:20:50 2005
@@ -743,7 +743,8 @@
thumbRect.x += (value - min) * trackRect.width / (max - min);
thumbRect.y = trackRect.y;
 
-   thumbRect.width = extent * trackRect.width / (max - min);
+   thumbRect.width = Math.max(extent * trackRect.width / (max - min),
+   getMinimumThumbSize().width);
thumbRect.height = trackRect.height;
   }
 else
@@ -752,7 +753,8 @@
thumbRect.y = trackRect.y + value * trackRect.height / (max - min);
 
thumbRect.width = trackRect.width;
-   thumbRect.height = extent * trackRect.height / (max - min);
+   thumbRect.height = Math.max(extent * trackRect.height / (max - min),
+getMinimumThumbSize().height);
   }
 return thumbRect;
   }
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.9
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8
Sun May 15 11:15:55 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
Sun May 15 11:20:50 2005
@@ -494,6 +494,12 @@
   "MenuItem.background", new ColorUIResource(getControl()),
   "MenuItem.font", getControlTextFont(),
   "ScrollBar.background", new ColorUIResource(getControl()),
+  "ScrollBar.shadow", new ColorUIResource(getControlShadow()),
+  "ScrollBar.thumb", new ColorUIResource(getPrimaryControlShadow()),
+  "ScrollBar.thumbDarkShadow",
+  new ColorUIResource(getPrimaryControlDarkShadow()),
+  "ScrollBar.thumbHighlight",
+  new ColorUIResource(getPrimaryControl()),
   "PopupMenu.border", new MetalBorders.PopupMenuBorder()
 };
 defaults.putDefaults(myDefaults);
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.2
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1
Tue Apr 19 18:43:23 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java
Sun May 15 11:20:50 2005
@@ -38,9 +38,14 @@
 
 package javax.swing.plaf.metal;
 
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.util.HashMap;
 
 import javax.swing.JComponent;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
 
@@ -48,6 +53,9 @@
   extends BasicScrollBarUI
 {
 
+  /** The minimum thumb size */
+  private static final Dimension MIN_THUMB_SIZE = new Dimension(18, 18);
+
   // FIXME: maybe replace by a Map of instances when this becomes stateful
   /** The shared UI instance for JScrollBars. */
   private static HashMap instances = null;
@@ -83,5 +91,75 @@
   instance = (MetalScrollBarUI) o;
 
 return instance;
+  }
+
+  /**
+   * Paints the slider button of the ScrollBar.
+   *
+   * @param g the Graphics context to use
+   * @param c the JComponent on which we paint
+   * @param thumbBounds the rectangle that is the slider button
+   */
+  protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds)
+  {
+// first we fill the background
+g.setColor(thumbColor);
+g.fillRect(thumbBounds.x, thumbBounds.y, thumbBounds.width,
+   thumbBounds.height);
+
+// draw the outer dark line
+g.setColor(thumbDarkShadowColor);
+g.drawRect(thumbBounds.

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fixes

[Kaffe CVS]

PatchSet 6485 
Date: 2005/05/15 11:20:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/BasicScrollBarUI
(getThumbBounds): Do not make thumb smaller than
minimumThumbSize.
* javax/swing/plaf/metal/MetalLookAndFeel
(initComponentDefaults): Added color defaults for ScrollBar.
* javax/swing/plaf/metal/MetalScrollBarUI
(paintThumb): Added.
(getMinimumThumbSize): Added.

Members: 
ChangeLog:1.4011->1.4012 

libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13->1.14 
libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8->1.9 
libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4011 kaffe/ChangeLog:1.4012
--- kaffe/ChangeLog:1.4011  Sun May 15 11:15:49 2005
+++ kaffe/ChangeLog Sun May 15 11:20:45 2005
@@ -4,6 +4,21 @@
 
2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
 
+* javax/swing/plaf/basic/BasicScrollBarUI
+(getThumbBounds): Do not make thumb smaller than
+minimumThumbSize.
+* javax/swing/plaf/metal/MetalLookAndFeel
+(initComponentDefaults): Added color defaults for ScrollBar.
+* javax/swing/plaf/metal/MetalScrollBarUI
+(paintThumb): Added.
+(getMinimumThumbSize): Added.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
+
 * javax/swing/plaf/metal/MetalLookAndFeel
 (initComponentDefaults): Added some default colors.
 
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.14
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13   
Sun May 15 11:07:04 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
Sun May 15 11:20:50 2005
@@ -743,7 +743,8 @@
thumbRect.x += (value - min) * trackRect.width / (max - min);
thumbRect.y = trackRect.y;
 
-   thumbRect.width = extent * trackRect.width / (max - min);
+   thumbRect.width = Math.max(extent * trackRect.width / (max - min),
+   getMinimumThumbSize().width);
thumbRect.height = trackRect.height;
   }
 else
@@ -752,7 +753,8 @@
thumbRect.y = trackRect.y + value * trackRect.height / (max - min);
 
thumbRect.width = trackRect.width;
-   thumbRect.height = extent * trackRect.height / (max - min);
+   thumbRect.height = Math.max(extent * trackRect.height / (max - min),
+getMinimumThumbSize().height);
   }
 return thumbRect;
   }
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.9
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.8
Sun May 15 11:15:55 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java
Sun May 15 11:20:50 2005
@@ -494,6 +494,12 @@
   "MenuItem.background", new ColorUIResource(getControl()),
   "MenuItem.font", getControlTextFont(),
   "ScrollBar.background", new ColorUIResource(getControl()),
+  "ScrollBar.shadow", new ColorUIResource(getControlShadow()),
+  "ScrollBar.thumb", new ColorUIResource(getPrimaryControlShadow()),
+  "ScrollBar.thumbDarkShadow",
+  new ColorUIResource(getPrimaryControlDarkShadow()),
+  "ScrollBar.thumbHighlight",
+  new ColorUIResource(getPrimaryControl()),
   "PopupMenu.border", new MetalBorders.PopupMenuBorder()
 };
 defaults.putDefaults(myDefaults);
Index: kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1 
kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.2
--- kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java:1.1
Tue Apr 19 18:43:23 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/metal/MetalScrollBarUI.java
Sun May 15 11:20:50 2005
@@ -38,9 +38,14 @@
 
 package javax.swing.plaf.metal;
 
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.util.HashMap;
 
 import javax.swing.JComponent;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
 
@@ -48,6 +53,9 @@
   extends BasicScrollBarUI
 {
 
+  /** The minimu

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: url fix

[Kaffe CVS]

PatchSet 6483 
Date: 2005/05/15 11:10:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: url fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-27  Thomas Fitzsimmons  <[EMAIL PROTECTED]>

* java/net/URL.java: Remove org.metastatic.jessie from default
protocol search path.

Members: 
ChangeLog:1.4009->1.4010 
libraries/javalib/java/net/URL.java:1.56->1.57 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4009 kaffe/ChangeLog:1.4010
--- kaffe/ChangeLog:1.4009  Sun May 15 11:07:00 2005
+++ kaffe/ChangeLog Sun May 15 11:10:18 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-27  Thomas Fitzsimmons  <[EMAIL PROTECTED]>
+
+* java/net/URL.java: Remove org.metastatic.jessie from default
+protocol search path.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicScrollBarUI.java
Index: kaffe/libraries/javalib/java/net/URL.java
diff -u kaffe/libraries/javalib/java/net/URL.java:1.56 
kaffe/libraries/javalib/java/net/URL.java:1.57
--- kaffe/libraries/javalib/java/net/URL.java:1.56  Sun Apr 24 12:34:31 2005
+++ kaffe/libraries/javalib/java/net/URL.java   Sun May 15 11:10:24 2005
@@ -125,7 +125,7 @@
 public final class URL implements Serializable
 {
   private static final String DEFAULT_SEARCH_PATH =
-"org.metastatic.jessie|gnu.java.net.protocol|gnu.inet";
+"gnu.java.net.protocol|gnu.inet";
 
   // Cached System ClassLoader
   private static ClassLoader systemClassLoader;

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath : swing fix

[Kaffe CVS]

PatchSet 6482 
Date: 2005/05/15 11:07:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath : swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/BasicScrollBarUI.java
(configureScrollBarColors: Changed key 'ScrollBar.thumbLightShadow'
to 'ScrollBar.thumbShadow'. The formes does not exist.
(paintThumb): Use BasicGraphicsUtils for painting the thumb.

Members: 
ChangeLog:1.4008->1.4009 

libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12->1.13 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4008 kaffe/ChangeLog:1.4009
--- kaffe/ChangeLog:1.4008  Sun May 15 10:16:35 2005
+++ kaffe/ChangeLog Sun May 15 11:07:00 2005
@@ -2,6 +2,17 @@
 
Resynced with GNU Classpath.
 
+   2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/plaf/basic/BasicScrollBarUI.java
+(configureScrollBarColors: Changed key 'ScrollBar.thumbLightShadow'
+to 'ScrollBar.thumbShadow'. The formes does not exist.
+(paintThumb): Use BasicGraphicsUtils for painting the thumb.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-27  Chris Burdess  <[EMAIL PROTECTED]>
 
 * java/net/protocol/http/HTTPURLConnection.java (connect): Accept
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.13
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.12   
Sun May 15 09:46:23 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java
Sun May 15 11:07:04 2005
@@ -499,7 +499,7 @@
 thumbColor = defaults.getColor("ScrollBar.thumb");
 thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
 thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
-thumbLightShadowColor = defaults.getColor("ScrollBar.thumbLightShadow");
+thumbLightShadowColor = defaults.getColor("ScrollBar.thumbShadow");
   }
 
   /**
@@ -1034,53 +1034,15 @@
*/
   protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds)
   {
-Color saved = g.getColor();
-Point x;
-Point y;
-Point z;
-Polygon lines;
-
-g.setColor(thumbHighlightColor);
-x = new Point(thumbBounds.x + 1, thumbBounds.y + 1);
-y = new Point(x);
-y.translate(thumbBounds.width - 2, 0);
-z = new Point(x);
-z.translate(0, thumbBounds.height - 2);
-
-lines = new Polygon(new int[] { x.x, y.x, z.x },
-new int[] { x.y, y.y, z.y }, 3);
-
-g.drawPolygon(lines);
-
-g.setColor(thumbLightShadowColor);
-x = new Point(thumbBounds.x + thumbBounds.width - 1,
-  thumbBounds.y + thumbBounds.height - 1);
-y = new Point(x);
-y.translate(-(thumbBounds.width - 2), 0);
-z = new Point(x);
-z.translate(0, -(thumbBounds.height - 2));
-
-lines = new Polygon(new int[] { x.x, y.x, z.x },
-new int[] { x.y, y.y, z.y }, 3);
-g.drawPolygon(lines);
-
-g.setColor(thumbDarkShadowColor);
-x = new Point(thumbBounds.x + thumbBounds.width,
-  thumbBounds.y + thumbBounds.height);
-y = new Point(x);
-y.translate(-thumbBounds.width, 0);
-z = new Point(x);
-z.translate(0, -thumbBounds.height);
-
-lines = new Polygon(new int[] { x.x, y.x, z.x },
-new int[] { x.y, y.y, z.y }, 3);
-g.drawPolygon(lines);
-
 g.setColor(thumbColor);
 g.fillRect(thumbBounds.x, thumbBounds.y, thumbBounds.width,
thumbBounds.height);
 
-g.setColor(saved);
+BasicGraphicsUtils.drawBezel(g, thumbBounds.x, thumbBounds.y,
+ thumbBounds.width, thumbBounds.height,
+ false, false, thumbDarkShadowColor,
+ thumbDarkShadowColor, thumbHighlightColor,
+ thumbHighlightColor);
   }
 
   /**

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad):

[Kaffe CVS]

*** ERROR *** cvsps failed - lastCandidate was 0

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6480 
Date: 2005/05/15 10:13:23
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: cleanup

Members: 
ChangeLog:1.4006->1.4007 
libraries/javalib/java/awt/MediaTracker.java:1.18->1.19 
libraries/javalib/javax/swing/BoxLayout.java:1.5->1.6 
libraries/javalib/javax/swing/UIManager.java:1.6->1.7 

libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.6->1.7 

libraries/javalib/javax/swing/plaf/basic/BasicGraphicsUtils.java:1.4->1.5 

libraries/javalib/javax/swing/plaf/basic/BasicLookAndFeel.java:1.10->1.11 
libraries/javalib/javax/swing/plaf/basic/BasicMenuItemUI.java:1.6->1.7 

libraries/javalib/javax/swing/plaf/basic/BasicScrollPaneUI.java:1.4->1.5 
libraries/javalib/javax/swing/plaf/metal/MetalLookAndFeel.java:1.6->1.7 
libraries/javalib/javax/swing/text/Document.java:1.4->1.5 
libraries/javalib/javax/swing/text/GapContent.java:1.4->1.5 
libraries/javalib/javax/swing/text/SimpleAttributeSet.java:1.7->1.8 

libraries/javalib/javax/swing/tree/DefaultTreeSelectionModel.java:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4006 kaffe/ChangeLog:1.4007
--- kaffe/ChangeLog:1.4006  Sun May 15 09:56:31 2005
+++ kaffe/ChangeLog Sun May 15 10:13:23 2005
@@ -2,6 +2,26 @@
 
Resynced with GNU Classpath.
 
+   2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
+
+* java/awt/MediaTracker.java: Added 2005 to copyright statement.
+* javax/swing/BoxLayout.java: Likewise.
+* javax/swing/UIManager.java: Likewise.
+* javax/swing/plaf/basic/BasicButtonListener.java: Likewise.
+* javax/swing/plaf/basic/BasicGraphicsUtils.java: Likewise.
+* javax/swing/plaf/basic/BasicLookAndFeel.java: Likewise.
+* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise.
+* javax/swing/plaf/basic/BasicScrollPaneUI.java: Likewise.
+* javax/swing/plaf/metal/MetalLookAndFeel.java: Likewise.
+* javax/swing/text/Document.java: Likewise.
+* javax/swing/text/GapContent.java: Likewise.
+* javax/swing/text/SimpleAttributeSet.java: Likewise.
+* javax/swing/tree/DefaultTreeSelectionModel.java: Likewise.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-26  Luca Barbieri  <[EMAIL PROTECTED]>
 
 * gnu/java/nio/channels/FileChannelImpl.java (tryLock): Pass
Index: kaffe/libraries/javalib/java/awt/MediaTracker.java
diff -u kaffe/libraries/javalib/java/awt/MediaTracker.java:1.18 
kaffe/libraries/javalib/java/awt/MediaTracker.java:1.19
--- kaffe/libraries/javalib/java/awt/MediaTracker.java:1.18 Tue Apr 19 
18:12:04 2005
+++ kaffe/libraries/javalib/java/awt/MediaTracker.java  Sun May 15 10:13:27 2005
@@ -1,5 +1,5 @@
 /* MediaTracker.java -- Class used for keeping track of images
-   Copyright (C) 1999, 2002i, 2004  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/swing/BoxLayout.java
diff -u kaffe/libraries/javalib/javax/swing/BoxLayout.java:1.5 
kaffe/libraries/javalib/javax/swing/BoxLayout.java:1.6
--- kaffe/libraries/javalib/javax/swing/BoxLayout.java:1.5  Sat Apr 23 
12:40:16 2005
+++ kaffe/libraries/javalib/javax/swing/BoxLayout.java  Sun May 15 10:13:28 2005
@@ -1,5 +1,5 @@
 /* BoxLayout.java -- A layout for swing components.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/swing/UIManager.java
diff -u kaffe/libraries/javalib/javax/swing/UIManager.java:1.6 
kaffe/libraries/javalib/javax/swing/UIManager.java:1.7
--- kaffe/libraries/javalib/javax/swing/UIManager.java:1.6  Fri Apr 22 
23:25:00 2005
+++ kaffe/libraries/javalib/javax/swing/UIManager.java  Sun May 15 10:13:28 2005
@@ -1,5 +1,5 @@
 /* UIManager.java -- 
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.6 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.7
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java:1.6 
Sat Apr 23 11:58:29 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonListener.java 
Sun May 15 10:13:28 2005
@@ -1,5 +1,5 @@
 /* BasicButtonListener.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicGraphicsUtils.java
diff -u 

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: http fixes

[Kaffe CVS]

PatchSet 6481 
Date: 2005/05/15 10:16:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: http fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-27  Chris Burdess  <[EMAIL PROTECTED]>

* java/net/protocol/http/HTTPURLConnection.java (connect): Accept
absolute and relative paths in Location header.

Members: 
ChangeLog:1.4007->1.4008 

libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4007 kaffe/ChangeLog:1.4008
--- kaffe/ChangeLog:1.4007  Sun May 15 10:13:23 2005
+++ kaffe/ChangeLog Sun May 15 10:16:35 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-27  Chris Burdess  <[EMAIL PROTECTED]>
+
+* java/net/protocol/http/HTTPURLConnection.java (connect): Accept
+absolute and relative paths in Location header.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-27  Roman Kennke  <[EMAIL PROTECTED]>
 
 * java/awt/MediaTracker.java: Added 2005 to copyright statement.
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java
diff -u 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.7 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.8
--- 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.7   
Sun May 15 09:40:49 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java   
Sun May 15 10:16:37 2005
@@ -283,7 +283,23 @@
 file = location.substring(end);
 retry = true;
   }
-// Otherwise this is not an HTTP redirect, can't follow
+   else if (location.length() > 0)
+ {
+   // Malformed absolute URI, treat as file part of URI
+   if (location.charAt(0) == '/')
+ {
+   // Absolute path
+   file = location;
+ }
+   else
+ {
+   // Relative path
+   int lsi = file.lastIndexOf('/');
+   file = (lsi == -1) ? "/" : file.substring(0, lsi + 1);
+   file += location;
+ }
+   retry = true;
+ }
   }
 else
   {

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: nio fix

[Kaffe CVS]

PatchSet 6478 
Date: 2005/05/15 09:56:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: nio fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Luca Barbieri  <[EMAIL PROTECTED]>

* gnu/java/nio/channels/FileChannelImpl.java (tryLock): Pass
'false' to native lock().
(lock): Pass 'true' to native lock().

Members: 

libraries/javalib/gnu/java/nio/channels/FileChannelImpl.java:INITIAL->1.8 
ChangeLog:1.4005->1.4006 

===
Checking out kaffe/libraries/javalib/gnu/java/nio/channels/FileChannelImpl.java
RCS:  
/home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/nio/channels/FileChannelImpl.java,v
VERS: 1.8
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/nio/channels/FileChannelImpl.java  Sun May 
15 10:13:41 2005
@@ -0,0 +1,524 @@
+/* FileChannelImpl.java -- 
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.nio.channels;
+
+import gnu.classpath.Configuration;
+import gnu.java.nio.FileLockImpl;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.NonReadableChannelException;
+import java.nio.channels.NonWritableChannelException;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+
+/**
+ * This file is not user visible !
+ * But alas, Java does not have a concept of friendly packages
+ * so this class is public. 
+ * Instances of this class are created by invoking getChannel
+ * Upon a Input/Output/RandomAccessFile object.
+ */
+public final class FileChannelImpl extends FileChannel
+{
+  // These are mode values for open().
+  public static final int READ   = 1;
+  public static final int WRITE  = 2;
+  public static final int APPEND = 4;
+
+  // EXCL is used only when making a temp file.
+  public static final int EXCL   = 8;
+  public static final int SYNC   = 16;
+  public static final int DSYNC  = 32;
+
+  private static native void init();
+
+  static
+  {
+if (Configuration.INIT_LOAD_LIBRARY)
+  {
+System.loadLibrary("nio");
+  }
+
+init();
+  }
+
+  /**
+   * This is the actual native file descriptor value
+   */
+  // System's notion of file descriptor.  It might seem redundant to
+  // initialize this given that it is reassigned in the constructors.
+  // However, this is necessary because if open() throws an exception
+  // we want to make sure this has the value -1.  This is the most
+  // efficient way to accomplish that.
+  private int fd = -1;
+
+  private int mode;
+
+  public FileChannelImpl ()
+  {
+  }
+
+  /* Open a file.  MODE is a combination of the above mode flags. */
+  public FileChannelImpl (File file, int mode) throws FileNotFoundException
+  {
+final String path = file.getPath();
+fd = open (path, mode);
+this.mode = mode;
+
+// First open the file and then check if it is a a directory
+// to avoid race condition.
+if (f

[kaffe] CVS kaffe (robilad): Resynced with gnu classpath: http fix

[Kaffe CVS]

PatchSet 6475 
Date: 2005/05/15 09:40:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gnu classpath: http fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Chris Burdess  <[EMAIL PROTECTED]>

* gnu/java/net/protocol/http/HTTPURLConnection.java: Throw
FileNotFoundException and implement getErrorStream on 404.

Members: 
ChangeLog:1.4002->1.4003 

libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4002 kaffe/ChangeLog:1.4003
--- kaffe/ChangeLog:1.4002  Sun May 15 09:36:54 2005
+++ kaffe/ChangeLog Sun May 15 09:40:45 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-26  Chris Burdess  <[EMAIL PROTECTED]>
+
+* gnu/java/net/protocol/http/HTTPURLConnection.java: Throw
+FileNotFoundException and implement getErrorStream on 404.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
 
 * javax/swing/plaf/basic/BasicToggleButtonUI.java:
Index: kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java
diff -u 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.6 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.7
--- 
kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java:1.6   
Tue Mar  8 21:03:51 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/http/HTTPURLConnection.java   
Sun May 15 09:40:49 2005
@@ -40,6 +40,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -94,6 +95,7 @@
 
   private Response response;
   private ByteArrayInputStream responseSink;
+  private ByteArrayInputStream errorSink;
 
   private HandshakeCompletedEvent handshakeEvent;
 
@@ -286,6 +288,11 @@
 else
   {
 responseSink = new ByteArrayInputStream(reader.toByteArray ());
+if (response.getCode() == 404)
+  {
+errorSink = responseSink;
+throw new FileNotFoundException(url.toString());
+  }
   }
   }
 while (retry);
@@ -453,6 +460,11 @@
 throw new ProtocolException("doInput is false");
   }
 return responseSink;
+  }
+
+  public InputStream getErrorStream()
+  {
+return errorSink;
   }
 
   public Map getHeaderFields()

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): Resynced with classpath: awt cleanups

[Kaffe CVS]

PatchSet 6476 
Date: 2005/05/15 09:46:06
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with classpath: awt cleanups

Members: 
ChangeLog:1.4003->1.4004 
libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.17->1.18 

libraries/javalib/gnu/java/beans/decoder/PersistenceParser.java:1.1->1.2 

libraries/javalib/gnu/javax/swing/text/html/parser/support/Parser.java:1.1->1.2 
libraries/javalib/java/awt/Button.java:INITIAL->1.12 
libraries/javalib/java/awt/Checkbox.java:INITIAL->1.9 
libraries/javalib/java/awt/Choice.java:INITIAL->1.8 
libraries/javalib/java/awt/Frame.java:INITIAL->1.26 
libraries/javalib/java/awt/MenuComponent.java:INITIAL->1.17 
libraries/javalib/java/awt/MenuItem.java:INITIAL->1.20 
libraries/javalib/java/awt/TextComponent.java:INITIAL->1.6 
libraries/javalib/java/awt/Window.java:INITIAL->1.32 
libraries/javalib/java/awt/geom/Arc2D.java:INITIAL->1.9 
libraries/javalib/java/awt/geom/Area.java:INITIAL->1.6 
libraries/javalib/java/awt/geom/GeneralPath.java:INITIAL->1.8 
libraries/javalib/javax/swing/JColorChooser.java:1.3->1.4 
libraries/javalib/javax/swing/JFormattedTextField.java:1.8->1.9 
libraries/javalib/javax/swing/RepaintManager.java:1.6->1.7 
libraries/javalib/javax/swing/Timer.java:1.9->1.10 
libraries/javalib/javax/swing/ToolTipManager.java:1.7->1.8 
libraries/javalib/javax/swing/TransferHandler.java:1.6->1.7 

libraries/javalib/javax/swing/colorchooser/DefaultHSBChooserPanel.java:1.3->1.4 

libraries/javalib/javax/swing/colorchooser/DefaultRGBChooserPanel.java:1.4->1.5 

libraries/javalib/javax/swing/colorchooser/DefaultSwatchChooserPanel.java:1.3->1.4
 
libraries/javalib/javax/swing/plaf/basic/BasicArrowButton.java:1.7->1.8 

libraries/javalib/javax/swing/plaf/basic/BasicColorChooserUI.java:1.2->1.3 
libraries/javalib/javax/swing/plaf/basic/BasicComboBoxUI.java:1.5->1.6 

libraries/javalib/javax/swing/plaf/basic/BasicDesktopIconUI.java:1.2->1.3 

libraries/javalib/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java:1.4->1.5
 
libraries/javalib/javax/swing/plaf/basic/BasicListUI.java:1.9->1.10 

libraries/javalib/javax/swing/plaf/basic/BasicOptionPaneUI.java:1.6->1.7 
libraries/javalib/javax/swing/plaf/basic/BasicPopupMenuUI.java:1.5->1.6 

libraries/javalib/javax/swing/plaf/basic/BasicScrollBarUI.java:1.11->1.12 
libraries/javalib/javax/swing/plaf/basic/BasicSliderUI.java:1.8->1.9 

libraries/javalib/javax/swing/plaf/basic/BasicSplitPaneDivider.java:1.6->1.7 

libraries/javalib/javax/swing/plaf/basic/BasicTabbedPaneUI.java:1.9->1.10 
libraries/javalib/javax/swing/plaf/basic/BasicToolBarUI.java:1.8->1.9 
libraries/javalib/javax/swing/text/JTextComponent.java:1.13->1.14 
libraries/javalib/javax/swing/text/StringContent.java:1.2->1.3 

libraries/javalib/javax/swing/text/html/parser/DocumentParser.java:1.3->1.4 

libraries/javalib/javax/swing/text/html/parser/ParserDelegator.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4003 kaffe/ChangeLog:1.4004
--- kaffe/ChangeLog:1.4003  Sun May 15 09:40:45 2005
+++ kaffe/ChangeLog Sun May 15 09:46:06 2005
@@ -2,6 +2,102 @@
 
Resynced with GNU Classpath.
 
+   2005-04-26  Tom Tromey  <[EMAIL PROTECTED]>
+
+* javax/swing/text/html/parser/ParserDelegator.java (callBack,
+gnu): Now package-private.
+* javax/swing/text/html/parser/DocumentParser.java (parser,
+callBack, gnu): Now package-private.
+* javax/swing/text/StringContent.java (content, setOffset,
+checkLocation): Now package-private.
+* javax/swing/text/JTextComponent.java (doc): Now
+package-private.
+* javax/swing/plaf/basic/BasicToolBarUI.java (owner,
+lastGoodOrientation, origParent, borders, cachedBounds,
+cachedOrientation, DragWindow): Now package-private.
+* javax/swing/plaf/basic/BasicTabbedPaneUI.java (incrButton,
+decrButton, viewport, panel, currentScrollLocation, layoutManager,
+tabAreaRect, contentRect, createIncreaseButton,
+createDecreaseButton, findPointForIndex): Now package-private.
+* javax/swing/plaf/basic/BasicSplitPaneDivider.java
+(currentDividerLocation, moveDividerTo): Now package-private.
+* javax/swing/plaf/basic/BasicSliderUI.java (findClosestTick): Now
+package-private.
+* javax/swing/plaf/basic/BasicScrollBarUI.java
+(calculatePreferredSize, valueForYPosition, valueForXPosition):
+Now package-private.
+* javax/swing/plaf/basic/BasicPopupMenuUI.java
+(topWindowListener): Now package-private.
+* javax/swing/plaf/basic/BasicOptionPaneUI.java (iconSize,
+OK_STRING, YES_STRING, NO_STRI

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: iconv fix

[Kaffe CVS]

PatchSet 6477 
Date: 2005/05/15 09:49:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: iconv fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Tom Tromey  <[EMAIL PROTECTED]>

* gnu/java/nio/charset/iconv/IconvCharset.java (name):
Removed unused field.
(IconvCharset): Updated.

Members: 
ChangeLog:1.4004->1.4005 
libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4004 kaffe/ChangeLog:1.4005
--- kaffe/ChangeLog:1.4004  Sun May 15 09:46:06 2005
+++ kaffe/ChangeLog Sun May 15 09:49:30 2005
@@ -4,6 +4,16 @@
 
2005-04-26  Tom Tromey  <[EMAIL PROTECTED]>
 
+* gnu/java/nio/charset/iconv/IconvCharset.java (name):
+Removed unused field.
+(IconvCharset): Updated.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-26  Tom Tromey  <[EMAIL PROTECTED]>
+
 * javax/swing/text/html/parser/ParserDelegator.java (callBack,
 gnu): Now package-private.
 * javax/swing/text/html/parser/DocumentParser.java (parser,
Index: kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java
diff -u 
kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1 
kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.2
--- kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java:1.1
Sat Apr 23 09:54:27 2005
+++ kaffe/libraries/javalib/gnu/java/nio/charset/iconv/IconvCharset.java
Sun May 15 09:49:35 2005
@@ -38,22 +38,17 @@
 
 package gnu.java.nio.charset.iconv;
 
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 
 public final class IconvCharset extends Charset
 {
-  private String name;
   private IconvMetaData info;
 
   public IconvCharset(IconvMetaData info)
   {
 super(info.nioCanonical(), info.aliases());
-this.name = name;
 this.info = info;
 if (newEncoder() == null || newDecoder() == null)
   throw new IllegalArgumentException();

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swng fix

[Kaffe CVS]

PatchSet 6474 
Date: 2005/05/15 09:36:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swng fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/BasicToggleButtonUI.java:
(getPropertyPrefix): Added.

Members: 
ChangeLog:1.4001->1.4002 

libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4001 kaffe/ChangeLog:1.4002
--- kaffe/ChangeLog:1.4001  Sun May 15 09:29:26 2005
+++ kaffe/ChangeLog Sun May 15 09:36:54 2005
@@ -4,6 +4,15 @@
 
2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
 
+* javax/swing/plaf/basic/BasicToggleButtonUI.java:
+(getPropertyPrefix): Added.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
+
 * javax/swing/plaf/basic/BasicButtonUI.java
 (getPropertyPrefix): Added.
 (installDefaults): Use getPropertyPrefix instead of hard-coded
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java
diff -u 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java:1.2 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java:1.3
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java:1.2 
Sun Sep 12 15:11:09 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicToggleButtonUI.java 
Sun May 15 09:37:00 2005
@@ -1,5 +1,5 @@
 /* BasicToggleButtonUI.java
-   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,5 +48,15 @@
 return new BasicToggleButtonUI();
   }
 
+  /**
+   * Returns the prefix for the UI defaults property for this UI class.
+   * This is 'ToggleButton' for this class.
+   *
+   * @return the prefix for the UI defaults property
+   */
+  protected String getPropertyPrefix()
+  {
+return "ToggleButton";
+  }
 }
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6473 
Date: 2005/05/15 09:29:26
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/plaf/basic/BasicButtonUI.java
(getPropertyPrefix): Added.
(installDefaults): Use getPropertyPrefix instead of hard-coded
prefix.

Members: 
ChangeLog:1.4000->1.4001 
libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4000 kaffe/ChangeLog:1.4001
--- kaffe/ChangeLog:1.4000  Sun May 15 09:26:22 2005
+++ kaffe/ChangeLog Sun May 15 09:29:26 2005
@@ -4,6 +4,17 @@
 
2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
 
+* javax/swing/plaf/basic/BasicButtonUI.java
+(getPropertyPrefix): Added.
+(installDefaults): Use getPropertyPrefix instead of hard-coded
+prefix.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
+   2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
+
 * javax/swing/JToggleButton.java
 (JToggleButton): Removed horizontalAlignment setting, this
 was wrong. Added setting of an actionCommand, ToggleButtons
Index: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.7 
kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.8
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java:1.7   
Sat Apr 23 11:10:52 2005
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicButtonUI.java   Sun May 
15 09:29:33 2005
@@ -107,17 +107,29 @@
 textShiftOffset = defaultTextShiftOffset;
   }
 
+  /**
+   * Returns the prefix for the UI defaults property for this UI class.
+   * This is 'Button' for this class.
+   *
+   * @return the prefix for the UI defaults property
+   */
+  protected String getPropertyPrefix()
+  {
+return "Button";
+  }
+
   protected void installDefaults(AbstractButton b)
   {
 UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-focusColor = defaults.getColor("Button.focus");
-b.setForeground(defaults.getColor("Button.foreground"));
-b.setBackground(defaults.getColor("Button.background"));
-b.setMargin(defaults.getInsets("Button.margin"));
-b.setBorder(defaults.getBorder("Button.border"));
-b.setIconTextGap(defaults.getInt("Button.textIconGap"));
+String prefix = getPropertyPrefix();
+focusColor = defaults.getColor(prefix + ".focus");
+b.setForeground(defaults.getColor(prefix + ".foreground"));
+b.setBackground(defaults.getColor(prefix + ".background"));
+b.setMargin(defaults.getInsets(prefix + ".margin"));
+b.setBorder(defaults.getBorder(prefix + ".border"));
+b.setIconTextGap(defaults.getInt(prefix + ".textIconGap"));
 b.setInputMap(JComponent.WHEN_FOCUSED, 
-  (InputMap) defaults.get("Button.focusInputMap"));
+  (InputMap) defaults.get(prefix + ".focusInputMap"));
 b.setOpaque(true);
   }
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): resynced with gnu classpath: swing fix

[Kaffe CVS]

PatchSet 6472 
Date: 2005/05/15 09:26:22
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath: swing fix

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>

* javax/swing/JToggleButton.java
(JToggleButton): Removed horizontalAlignment setting, this
was wrong. Added setting of an actionCommand, ToggleButtons
have  as default actionCommand.

Members: 
ChangeLog:1.3999->1.4000 
libraries/javalib/javax/swing/JToggleButton.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3999 kaffe/ChangeLog:1.4000
--- kaffe/ChangeLog:1.3999  Sun May 15 09:21:31 2005
+++ kaffe/ChangeLog Sun May 15 09:26:22 2005
@@ -2,6 +2,17 @@
 
Resynced with GNU Classpath.
 
+   2005-04-26  Roman Kennke  <[EMAIL PROTECTED]>
+
+* javax/swing/JToggleButton.java
+(JToggleButton): Removed horizontalAlignment setting, this
+was wrong. Added setting of an actionCommand, ToggleButtons
+have "" as default actionCommand.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-26  David Daney  <[EMAIL PROTECTED]>
 
 * java/net/InetAddress.java (InetAddress): Make a private copy of
Index: kaffe/libraries/javalib/javax/swing/JToggleButton.java
diff -u kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.6 
kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.7
--- kaffe/libraries/javalib/javax/swing/JToggleButton.java:1.6  Sat Feb 19 
17:51:21 2005
+++ kaffe/libraries/javalib/javax/swing/JToggleButton.java  Sun May 15 
09:26:25 2005
@@ -243,9 +243,9 @@
   {
 super(text, icon);
 
-horizontalAlignment = LEADING;
 setModel(new ToggleButtonModel()); 
 model.setSelected(selected);
+model.setActionCommand("");
   }
 
   /**

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: inet address fixes

[Kaffe CVS]

PatchSet 6471 
Date: 2005/05/15 09:21:31
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: inet address fixes

2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  David Daney  <[EMAIL PROTECTED]>

* java/net/InetAddress.java (InetAddress): Make a private copy of
the address.
* java/net/Inet4Address.java (getAddress): Return a copy of the
address.
* java/net/Inet6Address.java (Inet6Address): Use private copy of
the address
(getAddress): Return a copy of the address.
(equals): Rewrote.

Members: 
ChangeLog:1.3998->1.3999 
libraries/javalib/java/net/Inet4Address.java:INITIAL->1.11 
libraries/javalib/java/net/Inet6Address.java:INITIAL->1.7 
libraries/javalib/java/net/InetAddress.java:1.30->1.31 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3998 kaffe/ChangeLog:1.3999
--- kaffe/ChangeLog:1.3998  Sun May 15 09:07:00 2005
+++ kaffe/ChangeLog Sun May 15 09:21:31 2005
@@ -2,6 +2,21 @@
 
Resynced with GNU Classpath.
 
+   2005-04-26  David Daney  <[EMAIL PROTECTED]>
+
+* java/net/InetAddress.java (InetAddress): Make a private copy of
+the address.
+* java/net/Inet4Address.java (getAddress): Return a copy of the
+address.
+* java/net/Inet6Address.java (Inet6Address): Use private copy of
+the address
+(getAddress): Return a copy of the address.
+(equals): Rewrote.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-26  Michael Koch  <[EMAIL PROTECTED]>
 
 * javax/swing/ImageIcon.java:
===
Checking out kaffe/libraries/javalib/java/net/Inet4Address.java
RCS:  /home/cvs/kaffe/kaffe/libraries/javalib/java/net/Inet4Address.java,v
VERS: 1.11
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/javalib/java/net/Inet4Address.java  Sun May 15 09:26:04 2005
@@ -0,0 +1,233 @@
+/* Inet4Address.java --
+   Copyright (C) 2002, 2003, 2004, 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.net;
+
+import java.io.ObjectStreamException;
+
+/*
+ * Written using on-line Java Platform 1.4 API Specification and
+ * RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt),
+ * RFC 1918 (http://www.ietf.org/rfc/rfc1918.txt),
+ * RFC 2365 (http://www.ietf.org/rfc/rfc2365.txt)
+ *
+ * @author Michael Koch
+ * @status Believed complete and correct.
+ */
+public final class Inet4Address extends InetAddress
+{
+  /**
+   * For compatability with Sun's JDK 1.4.2 rev. 5
+   */
+  static final long serialVersionUID = 3286316764910316507L;
+
+  /**
+   * needed for serialization
+   */
+  private Object writeReplace() throws ObjectStreamException
+  {
+return new InetAddress(addr, hostName);
+  }
+  
+  /**
+   * Initializes this object's addr instance variable from the passed in
+   * byte array.  Note that this constructor is protected and is called
+   * only by static methods in this class.
+   *
+   * @param addr The IP number of this address as an array of bytes
+   * @param hostname The hostname of this IP address.
+   */
+  Inet4Address(byte[] addr, String host)
+  {
+super(addr,

[kaffe] CVS kaffe (robilad): Resynced with gnu classpath: cleanup

[Kaffe CVS]

PatchSet 6470 
Date: 2005/05/15 09:07:00
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with gnu classpath: cleanup
2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>

Resynced with GNU Classpath.

2005-04-26  Michael Koch  <[EMAIL PROTECTED]>

* javax/swing/ImageIcon.java:
Merged copyright with GCJ.

Members: 
ChangeLog:1.3997->1.3998 
libraries/javalib/javax/swing/ImageIcon.java:1.5->1.6 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3997 kaffe/ChangeLog:1.3998
--- kaffe/ChangeLog:1.3997  Sat May 14 23:46:09 2005
+++ kaffe/ChangeLog Sun May 15 09:07:00 2005
@@ -2,6 +2,15 @@
 
Resynced with GNU Classpath.
 
+   2005-04-26  Michael Koch  <[EMAIL PROTECTED]>
+
+* javax/swing/ImageIcon.java:
+Merged copyright with GCJ.
+
+2005-05-15  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   Resynced with GNU Classpath.
+
2005-04-25  Mark Wielaard  <[EMAIL PROTECTED]>
 
 * native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c:
Index: kaffe/libraries/javalib/javax/swing/ImageIcon.java
diff -u kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.5 
kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.6
--- kaffe/libraries/javalib/javax/swing/ImageIcon.java:1.5  Tue Apr 19 
00:01:53 2005
+++ kaffe/libraries/javalib/javax/swing/ImageIcon.java  Sun May 15 09:07:04 2005
@@ -1,5 +1,5 @@
 /* ImageIcon.java --
-   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

[kaffe] port kaffe-1.1.5 on xscale --about awt

[huangtonglang]

Hi all!Have somebody port kaffe on xscale with awt successfuly? Please tell me how to do it.I was failed and could not find the problem.Thank you very much!







请勿随意丢弃废旧电池，一个5号电池可将5平方米土地重金属污染达50年！！


___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe