summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gnu/java/net/protocol/http/Headers.java4
-rw-r--r--gnu/javax/swing/text/html/parser/htmlValidator.java5
-rw-r--r--java/awt/datatransfer/DataFlavor.java80
4 files changed, 48 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog
index 5841cc189..be9b7f9d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-26 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * 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.
+
2006-03-26 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* gnu/java/rmi/activation/DefaultActivationGroup.java:
diff --git a/gnu/java/net/protocol/http/Headers.java b/gnu/java/net/protocol/http/Headers.java
index 0bfa4b562..a793bbd97 100644
--- a/gnu/java/net/protocol/http/Headers.java
+++ b/gnu/java/net/protocol/http/Headers.java
@@ -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);
}
}
diff --git a/gnu/javax/swing/text/html/parser/htmlValidator.java b/gnu/javax/swing/text/html/parser/htmlValidator.java
index b70f15ded..1f9eee03a 100644
--- a/gnu/javax/swing/text/html/parser/htmlValidator.java
+++ b/gnu/javax/swing/text/html/parser/htmlValidator.java
@@ -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;
}
diff --git a/java/awt/datatransfer/DataFlavor.java b/java/awt/datatransfer/DataFlavor.java
index f7c103c72..e8632cf61 100644
--- a/java/awt/datatransfer/DataFlavor.java
+++ b/java/awt/datatransfer/DataFlavor.java
@@ -124,22 +124,18 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
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.
*