I'm committing the attached patch which merges some minor differences between files on HEAD and the generics branch.
Changelog:
2006-03-26 Andrew John Hughes <[EMAIL PROTECTED]>
* gnu/java/net/protocol/http/Headers.java:
Match layout of file on HEAD.
* gnu/javax/swing/text/html/parser/htmlValidator.java:
Likewise.
* java/awt/datatransfer/DataFlavor.java
Likewise.
--
Andrew :-)
Please avoid sending me Microsoft Office (e.g. Word, PowerPoint) attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
If you use Microsoft Office, support movement towards the end of vendor lock-in:
http://opendocumentfellowship.org/petition/
"Value your freedom, or you will lose it, teaches history.
`Don't bother us with politics' respond those who don't want to learn."
-- Richard Stallman
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: gnu/java/net/protocol/http/Headers.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/http/Headers.java,v
retrieving revision 1.1.2.8
diff -u -3 -p -u -r1.1.2.8 Headers.java
--- gnu/java/net/protocol/http/Headers.java 26 Mar 2006 20:08:12 -0000
1.1.2.8
+++ gnu/java/net/protocol/http/Headers.java 26 Mar 2006 22:26:46 -0000
@@ -243,8 +243,8 @@ class Headers
for (Iterator it = o.iterator(); it.hasNext(); )
{
HeaderElement e = (HeaderElement)it.next();
- remove(e.name);
- addValue(e.name, e.value);
+ remove(e.name);
+ addValue(e.name, e.value);
}
}
Index: gnu/javax/swing/text/html/parser/htmlValidator.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/javax/swing/text/html/parser/htmlValidator.java,v
retrieving revision 1.1.2.2
diff -u -3 -p -u -r1.1.2.2 htmlValidator.java
--- gnu/javax/swing/text/html/parser/htmlValidator.java 2 Aug 2005 20:12:13
-0000 1.1.2.2
+++ gnu/javax/swing/text/html/parser/htmlValidator.java 26 Mar 2006 22:26:51
-0000
@@ -446,8 +446,9 @@ public abstract class htmlValidator
if (a.getModifier() == DTDConstants.REQUIRED)
if (parameters.getAttribute(a.getName()) == null)
{
- s_error("Missing required attribute '" + a.getName() +
- "' for <" + tag.getHTMLTag() + ">");
+ s_error("Missing required attribute '" + a.getName() + "' for <"
+
+ tag.getHTMLTag() + ">"
+ );
}
a = a.next;
}
Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.20.2.8
diff -u -3 -p -u -r1.20.2.8 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java 2 Mar 2006 09:33:56 -0000
1.20.2.8
+++ java/awt/datatransfer/DataFlavor.java 26 Mar 2006 22:26:51 -0000
@@ -124,22 +124,18 @@ public class DataFlavor implements java.
public static final String javaRemoteObjectMimeType =
"application/x-java-remote-object";
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-// The MIME type for this flavor
-private final String mimeType;
-
-// The representation class for this flavor
-private final Class<?> representationClass;
-
-// The human readable name of this flavor
-private String humanPresentableName;
-
-/*************************************************************************/
+ /*
+ * Instance Variables
+ */
+
+ // The MIME type for this flavor
+ private final String mimeType;
+
+ // The representation class for this flavor
+ private final Class<?> representationClass;
+
+ // The human readable name of this flavor
+ private String humanPresentableName;
/*
* Static Methods
@@ -321,25 +317,20 @@ private String humanPresentableName;
humanPresentableName = null;
}
-/*************************************************************************/
-
-/**
- * Private constructor.
- */
- private
- DataFlavor(Class<?> representationClass,
- String mimeType,
- String humanPresentableName)
- {
- this.representationClass = representationClass;
- this.mimeType = mimeType;
- if (humanPresentableName != null)
- this.humanPresentableName = humanPresentableName;
- else
- this.humanPresentableName = mimeType;
- }
-
-/*************************************************************************/
+ /**
+ * Private constructor.
+ */
+ private DataFlavor(Class<?> representationClass,
+ String mimeType,
+ String humanPresentableName)
+ {
+ this.representationClass = representationClass;
+ this.mimeType = mimeType;
+ if (humanPresentableName != null)
+ this.humanPresentableName = humanPresentableName;
+ else
+ this.humanPresentableName = mimeType;
+ }
/**
* Initializes a new instance of <code>DataFlavor</code>. The class
@@ -351,15 +342,14 @@ private String humanPresentableName;
* @param representationClass The representation class for this object.
* @param humanPresentableName The display name of the object.
*/
- public
- DataFlavor(Class<?> representationClass, String humanPresentableName)
- {
- this(representationClass,
- "application/x-java-serialized-object"
- + "; class="
- + representationClass.getName(),
- humanPresentableName);
- }
+ public DataFlavor(Class<?> representationClass, String humanPresentableName)
+ {
+ this(representationClass,
+ "application/x-java-serialized-object"
+ + "; class="
+ + representationClass.getName(),
+ humanPresentableName);
+ }
/**
* Initializes a new instance of <code>DataFlavor</code> with the
@@ -428,8 +418,6 @@ private String humanPresentableName;
this(mimeType, null);
}
-/*************************************************************************/
-
/**
* Returns the MIME type of this flavor.
*
signature.asc
Description: Digital signature
