2011-01-14 Basile Starynkevitch <basile@starynkevitch.net>

        MELT branch merged with trunk rev 168776



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@168777 138bc75d-0d04-0410-961f-82ee72b054a4

14 files changed, 27 insertions, 41 deletions

diff --git a/libjava/classpath/javax/xml/stream/events/Attribute.java b/libjava/classpath/javax/xml/stream/events/Attribute.java
index 6e6d0274c4a..1824a9c02b1 100644
--- a/libjava/classpath/javax/xml/stream/events/Attribute.java
+++ b/libjava/classpath/javax/xml/stream/events/Attribute.java
@@ -1,4 +1,4 @@
-/* Attribute.java -- 
+/* Attribute.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -66,6 +66,5 @@ public interface Attribute
    * just defaulted by the DTD.
    */
   boolean isSpecified();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/Characters.java b/libjava/classpath/javax/xml/stream/events/Characters.java
index 3728a997c34..d82009247cb 100644
--- a/libjava/classpath/javax/xml/stream/events/Characters.java
+++ b/libjava/classpath/javax/xml/stream/events/Characters.java
@@ -1,4 +1,4 @@
-/* Characters.java -- 
+/* Characters.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,11 +58,10 @@ public interface Characters
    * Indicates whether this is a CDATA section.
    */
   boolean isCData();
-  
+
   /**
    * Indicates whether this text is all ignorable whitespace.
    */
   boolean isIgnorableWhiteSpace();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/Comment.java b/libjava/classpath/javax/xml/stream/events/Comment.java
index 300e32c9266..4419e58f283 100644
--- a/libjava/classpath/javax/xml/stream/events/Comment.java
+++ b/libjava/classpath/javax/xml/stream/events/Comment.java
@@ -1,4 +1,4 @@
-/* Comment.java -- 
+/* Comment.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,6 +48,5 @@ public interface Comment
    * Returns the comment text.
    */
   String getText();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/DTD.java b/libjava/classpath/javax/xml/stream/events/DTD.java
index 943572ef32f..b1a906919f5 100644
--- a/libjava/classpath/javax/xml/stream/events/DTD.java
+++ b/libjava/classpath/javax/xml/stream/events/DTD.java
@@ -1,4 +1,4 @@
-/* DTD.java -- 
+/* DTD.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -68,6 +68,5 @@ public interface DTD
    */
   @SuppressWarnings("unchecked")
   List getEntities();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/EndDocument.java b/libjava/classpath/javax/xml/stream/events/EndDocument.java
index 57d93af928d..fd7e3fa4f48 100644
--- a/libjava/classpath/javax/xml/stream/events/EndDocument.java
+++ b/libjava/classpath/javax/xml/stream/events/EndDocument.java
@@ -1,4 +1,4 @@
-/* EndDocument.java -- 
+/* EndDocument.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,4 +44,3 @@ public interface EndDocument
   extends XMLEvent
 {
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/EndElement.java b/libjava/classpath/javax/xml/stream/events/EndElement.java
index 3bde8f8ad9e..a6b5c3fa281 100644
--- a/libjava/classpath/javax/xml/stream/events/EndElement.java
+++ b/libjava/classpath/javax/xml/stream/events/EndElement.java
@@ -1,4 +1,4 @@
-/* EndElement.java -- 
+/* EndElement.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -57,6 +57,5 @@ public interface EndElement
    */
   @SuppressWarnings("unchecked")
   Iterator getNamespaces();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
index a0120ddb0de..61fa177f995 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityDeclaration.java
@@ -1,4 +1,4 @@
-/* EntityDeclaration.java -- 
+/* EntityDeclaration.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,4 +75,3 @@ public interface EntityDeclaration
   String getBaseURI();
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/EntityReference.java b/libjava/classpath/javax/xml/stream/events/EntityReference.java
index 460433c1690..27bcb040fbb 100644
--- a/libjava/classpath/javax/xml/stream/events/EntityReference.java
+++ b/libjava/classpath/javax/xml/stream/events/EntityReference.java
@@ -1,4 +1,4 @@
-/* EntityReference.java -- 
+/* EntityReference.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -55,4 +55,3 @@ public interface EntityReference
   String getName();
 
 }
-
diff --git a/libjava/classpath/javax/xml/stream/events/Namespace.java b/libjava/classpath/javax/xml/stream/events/Namespace.java
index 13dd92fdaf7..05de86c9660 100644
--- a/libjava/classpath/javax/xml/stream/events/Namespace.java
+++ b/libjava/classpath/javax/xml/stream/events/Namespace.java
@@ -1,4 +1,4 @@
-/* Namespace.java -- 
+/* Namespace.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,6 +58,5 @@ public interface Namespace
    * Indicates whether this event declares the default namespace.
    */
   boolean isDefaultNamespaceDeclaration();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java b/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
index 9ac29e9cc2c..708beb5f576 100644
--- a/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
+++ b/libjava/classpath/javax/xml/stream/events/NotationDeclaration.java
@@ -1,4 +1,4 @@
-/* NotationDeclaration.java -- 
+/* NotationDeclaration.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -58,6 +58,5 @@ public interface NotationDeclaration
    * Returns the system identifier of the notation.
    */
   String getSystemId();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java b/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
index 861dd30be68..34020230038 100644
--- a/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
+++ b/libjava/classpath/javax/xml/stream/events/ProcessingInstruction.java
@@ -1,4 +1,4 @@
-/* ProcessingInstruction.java -- 
+/* ProcessingInstruction.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -53,6 +53,5 @@ public interface ProcessingInstruction
    * Returns the processing instruction data.
    */
   String getData();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/StartDocument.java b/libjava/classpath/javax/xml/stream/events/StartDocument.java
index 2bd251e4adb..7a543462455 100644
--- a/libjava/classpath/javax/xml/stream/events/StartDocument.java
+++ b/libjava/classpath/javax/xml/stream/events/StartDocument.java
@@ -1,4 +1,4 @@
-/* StartDocument.java -- 
+/* StartDocument.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -75,6 +75,5 @@ public interface StartDocument
    * Returns the XML version of the document.
    */
   String getVersion();
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/StartElement.java b/libjava/classpath/javax/xml/stream/events/StartElement.java
index 0916368c92b..359b57eefd7 100644
--- a/libjava/classpath/javax/xml/stream/events/StartElement.java
+++ b/libjava/classpath/javax/xml/stream/events/StartElement.java
@@ -1,4 +1,4 @@
-/* StartElement.java -- 
+/* StartElement.java --
    Copyright (C) 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -79,6 +79,5 @@ public interface StartElement
    * Returns the namespace URI associated with the given prefix.
    */
   String getNamespaceURI(String prefix);
-  
-}
 
+}
diff --git a/libjava/classpath/javax/xml/stream/events/XMLEvent.java b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
index 7c427da87d2..90f354667b2 100644
--- a/libjava/classpath/javax/xml/stream/events/XMLEvent.java
+++ b/libjava/classpath/javax/xml/stream/events/XMLEvent.java
@@ -1,4 +1,4 @@
-/* XMLEvent.java -- 
+/* XMLEvent.java --
    Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -125,12 +125,11 @@ public interface XMLEvent
    * not available.
    */
   QName getSchemaType();
-  
+
   /**
    * Writes this event to the specified writer.
    */
   void writeAsEncodedUnicode(Writer writer)
     throws XMLStreamException;
-  
-}
 
+}