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

9 files changed, 87 insertions, 87 deletions

diff --git a/libjava/classpath/javax/rmi/CORBA/ClassDesc.java b/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
index c8b38ead095..831cdbe48a3 100644
--- a/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
+++ b/libjava/classpath/javax/rmi/CORBA/ClassDesc.java
@@ -49,8 +49,8 @@ import java.io.Serializable;
  */
 public class ClassDesc implements Serializable
 {
-  /** 
-   * Use serialVersionUID (V1.4) for interoperability. 
+  /**
+   * Use serialVersionUID (V1.4) for interoperability.
    */
   private static final long serialVersionUID = -3477057297839810709L;
 
@@ -58,7 +58,7 @@ public class ClassDesc implements Serializable
    * The class repository Id.
    */
   String repid;
-  
+
   /**
    * Space separeted list of URL's from where the code can be downloaded.
    */
diff --git a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
index f376bedfe80..b8f1d06dafe 100644
--- a/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java
@@ -45,11 +45,11 @@ import java.rmi.RemoteException;
 /**
  * A delegate, implementing the functionality, provided by the
  * {@link PortableRemoteObject}.
- * 
+ *
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.PortableRemoteObjectClass" to the name of the alternative
  * class that must implement {@link PortableRemoteObjectDelegate}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface PortableRemoteObjectDelegate
@@ -66,12 +66,12 @@ public interface PortableRemoteObjectDelegate
    * {@link Stub#connect} if it is a stub or by associating its tie with an ORB
    * if it is an implementation object.
    * </p>
-   * 
+   *
    * @param target the target object that may be either an RMI/IDL stub or an
    * exported RMI/IDL implementation object
    * @param source the source object may also be either an RMI/IDL stub or an
    * exported RMI/IDL implementation object.
-   * 
+   *
    * @throws RemoteException if the target is already connected to another ORB.
    */
   void connect(Remote target, Remote source)
@@ -83,9 +83,9 @@ public interface PortableRemoteObjectDelegate
    * non-daemon thread that prevents jre from terminating until all objects are
    * unexported. Also, such object cannot be collected by garbage collector.
    * This is usually impemented via {@link Util#unexportObject}
-   * 
+   *
    * @param obj the object to export.
-   * 
+   *
    * @throws RemoteException
    */
   void exportObject(Remote obj)
@@ -95,13 +95,13 @@ public interface PortableRemoteObjectDelegate
    * Narrows the passed object to conform to the given interface or IDL type.
    * This method may return different instance and cannot be replaced by the
    * direct cast.
-   * 
+   *
    * @param narrowFrom an object to narrow.
    * @param narrowTo a type to that the object must be narrowed.
-   * 
+   *
    * @return On success, an object of type narrowTo or null, if narrowFrom =
    * null.
-   * 
+   *
    * @throws ClassCastException if no narrowing is possible.
    */
   Object narrow(Object narrowFrom, Class narrowTo)
@@ -112,10 +112,10 @@ public interface PortableRemoteObjectDelegate
    * used to access that server object (target). If the target is connected, the
    * returned stub is also connected to the same ORB. If the target is
    * unconnected, the returned stub is unconnected.
-   * 
+   *
    * @param obj a server side object.
    * @return a stub object that can be used to access that server object.
-   * 
+   *
    * @throws NoSuchObjectException if a stub cannot be located for the given
    * target.
    */
@@ -126,9 +126,9 @@ public interface PortableRemoteObjectDelegate
    * Deregister a currently exported server object from the ORB runtimes. The
    * object to becomes available for garbage collection. This is usually
    * impemented via {@link Util#unexportObject}
-   * 
+   *
    * @param obj the object to unexport.
-   * 
+   *
    * @throws NoSuchObjectException if the passed object is not currently
    * exported.
    */
diff --git a/libjava/classpath/javax/rmi/CORBA/Stub.java b/libjava/classpath/javax/rmi/CORBA/Stub.java
index 190b10dad57..d9b45f77b3d 100644
--- a/libjava/classpath/javax/rmi/CORBA/Stub.java
+++ b/libjava/classpath/javax/rmi/CORBA/Stub.java
@@ -60,10 +60,10 @@ import org.omg.CORBA_2_3.portable.ObjectImpl;
  * "javax.rmi.CORBA.StubClass" to the name of the alternative class that must
  * implement {@link StubDelegate}. Hence Stub contains two delegates, one for
  * Stub-related operations and another inherited from the ObjectImpl.
- * 
+ *
  * @specnote GNU Classpath uses separate delegate per each Stub. The delegate
  * holds information about the ORB and other data, specific for the each Stub.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public abstract class Stub
@@ -118,7 +118,7 @@ public abstract class Stub
 
   /**
    * Get the string representation of this Stub.
-   * 
+   *
    * @return the CORBA IOR reference.
    */
   public String toString()
@@ -149,13 +149,13 @@ public abstract class Stub
    * It is frequently easier to call {@link PortableRemoteObject#connect} rather
    * than this method.
    * </p>
-   * 
+   *
    * @param orb the ORB where the Stub must be connected.
-   * 
+   *
    * @throws RemoteException if the stub is already connected to some other ORB.
    * If the stub is already connected to the ORB that was passed as parameter,
    * the method returns without action.
-   * 
+   *
    * @throws BAD_PARAM if the name of this stub does not match the stub name
    * pattern, "_*_Stub" or if the Tie class, "_*Impl_Tie", does not exists or an
    * instance of this class cannot be instantiated.
@@ -200,4 +200,4 @@ public abstract class Stub
 
       delegate.writeObject(this, output);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/StubDelegate.java b/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
index cdf76e841c3..a191eb446bd 100644
--- a/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/StubDelegate.java
@@ -51,7 +51,7 @@ import java.rmi.RemoteException;
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.StubClass" to the name of the alternative class that must
  * implement StubDelegate.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface StubDelegate
@@ -64,9 +64,9 @@ public interface StubDelegate
    * It is frequently easier to call {@link PortableRemoteObject#connect} rather
    * than this method.
    * </p>
-   * 
+   *
    * @param orb the ORB where the Stub must be connected.
-   * 
+   *
    * @throws RemoteException if the stub is already connected to some other ORB.
    * If the stub is already connected to the ORB that was passed as parameter,
    * the method returns without action.
@@ -100,4 +100,4 @@ public interface StubDelegate
    * Get the string representation of this stub.
    */
   String toString(Stub self);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/Tie.java b/libjava/classpath/javax/rmi/CORBA/Tie.java
index af9ddd3d44a..90a82511e5c 100644
--- a/libjava/classpath/javax/rmi/CORBA/Tie.java
+++ b/libjava/classpath/javax/rmi/CORBA/Tie.java
@@ -61,7 +61,7 @@ import org.omg.CORBA.portable.InvokeHandler;
  * <code>rmic</code> compiler using <code>-poa</code> key. Ties can be also
  * derived from {@link org.omg.CORBA_2_3.portable.ObjectImpl}.
  * </p>
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface Tie
@@ -69,7 +69,7 @@ public interface Tie
 {
   /**
    * Get the invocation target, where all method calls should be delegated.
-   * 
+   *
    * @return the object, implementing methods, defined in the interface being
    * served by this Tie.
    */
@@ -77,12 +77,12 @@ public interface Tie
 
   /**
    * Set the invocation target, where all method calls should be delegated.
-   * 
+   *
    * @param target the object, implementing methods, defined in the interface
    * being served by this Tie. The code, produced by a typical rmic compiler
    * usually requires the target to be an instance of the implementation from
    * that the Tie was generated.
-   * 
+   *
    * @throws ClassCastException if the passed parameter is not an instance of
    * the implementation from that the Tie was generated.
    */
@@ -90,7 +90,7 @@ public interface Tie
 
   /**
    * Get the ORB to that this Tie is connected.
-   * 
+   *
    * @see org.omg.PortableServer.Servant#_orb
    */
   ORB orb();
@@ -102,7 +102,7 @@ public interface Tie
 
   /**
    * Get the object that delegates calls to this tie.
-   * 
+   *
    * @see org.omg.PortableServer.Servant#_this_object()
    */
   org.omg.CORBA.Object thisObject();
@@ -113,13 +113,13 @@ public interface Tie
    * again. The ties that are not derived from
    * {@link org.omg.PortableServer.Servant} deactivate themselves by
    * {@link ORB#disconnect}.
-   * 
+   *
    * @throws NoSuchObjectException if there are no objects served by this Tie,
    * or if the these objects are already deactivated.
-   * 
+   *
    * @see org.omg.PortableServer.POAOperations#deactivate_object
    */
   void deactivate()
     throws NoSuchObjectException;
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/Util.java b/libjava/classpath/javax/rmi/CORBA/Util.java
index 04b6f63a6fb..9c6df60a860 100644
--- a/libjava/classpath/javax/rmi/CORBA/Util.java
+++ b/libjava/classpath/javax/rmi/CORBA/Util.java
@@ -77,7 +77,7 @@ import javax.transaction.TransactionRolledbackException;
  * The functionality is forwarded to the enclosed UtilDelegate. This delegate
  * can be altered by setting the system property "javax.rmi.CORBA.UtilClass" to
  * the name of the alternative class that must implement {@link UtilDelegate}.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public class Util
@@ -119,7 +119,7 @@ public class Util
   /**
    * Get the value handler that Serializes Java objects to and from CDR (GIOP)
    * streams.
-   * 
+   *
    * When using the default Util implementation, the class of the returned
    * handler can be altered by setting by setting the system property
    * "javax.rmi.CORBA.ValueHandlerClass" to the name of the alternative class
@@ -143,7 +143,7 @@ public class Util
    * pair has not been previously registered using {@link #registerTarget},
    * this method tries to locate a tie class by the name pattern. If this
    * succeeds, the tie-target pair is also registered.
-   * 
+   *
    * @return the Tie.
    */
   public static Tie getTie(Remote target)
@@ -154,10 +154,10 @@ public class Util
   /**
    * Checks if the given stub is local. The implementation it delegates call to
    * {@link ObjectImpl#_is_local().
-   * 
+   *
    * @param stub a stub to check.
    * @return true if the stub is local, false otherwise.
-   * 
+   *
    * @throws RemoteException if the {@link ObjectImpl#_is_local()} throws a
    * {@link org.omg.CORBA.SystemException}.
    */
@@ -171,7 +171,7 @@ public class Util
    * Load the class. The method uses class loaders from the call stact first. If
    * this fails, the further behaviour depends on the System Property
    * "java.rmi.server.useCodebaseOnly" with default value "false".
-   * 
+   *
    * <ul>
    * <li>If remoteCodebase is non-null and useCodebaseOnly is "false" then call
    * java.rmi.server.RMIClassLoader.loadClass (remoteCodebase, className)</li>
@@ -180,12 +180,12 @@ public class Util
    * <li>If a class is still not successfully loaded and the loader != null
    * then try Class.forName(className, false, loader). </li>
    * </ul>
-   * 
+   *
    * @param className the name of the class.
    * @param remoteCodebase the codebase.
    * @param loader the class loader.
    * @return the loaded class.
-   * 
+   *
    * @throws ClassNotFoundException of the class cannot be loaded.
    */
   public static Class loadClass(String className, String remoteCodebase,
@@ -331,14 +331,14 @@ public class Util
    * <td>{@link UnexpectedException}</td>
    * </tr>
    * </table>
-   * 
+   *
    * @param exception an exception that was thrown on a server side implementation.
-   * 
+   *
    * @return the corresponding RemoteException unless it is a RuntimeException.
-   * 
+   *
    * @throws RuntimeException the passed exception if it is an instance of
    * RuntimeException.
-   * 
+   *
    * @specnote It is the same behavior, as in Suns implementations 1.4.0-1.5.0.
    */
   public static RemoteException wrapException(Throwable exception)
@@ -354,10 +354,10 @@ public class Util
    * {@link #writeRemoteObject}. The written data contains discriminator,
    * defining, that was written. Another method that writes the same content is
    * {@link org.omg.CORBA_2_3.portable.OutputStream#write_abstract_interface(java.lang.Object)}.
-   * 
+   *
    * @param output a stream to write to, must be
    * {@link org.omg.CORBA_2_3.portable.OutputStream}.
-   * 
+   *
    * @param object an object to write, must be CORBA object, Remote
    */
   public static void writeAbstractObject(OutputStream output,
@@ -375,7 +375,7 @@ public class Util
    * method writes CORBA object, value type or value box. For value types Null
    * is written with the abstract interface, its typecode having repository id
    * "IDL:omg.org/CORBA/AbstractBase:1.0" and the empty string name.
-   * 
+   *
    * @param output the object to write.
    * @param object the java object that must be written in the form of the CORBA
    * {@link Any}.
@@ -384,9 +384,9 @@ public class Util
   {
     delegate.writeAny(output, object);
   }
-  
+
   /**
-   * Read Any from the input stream. 
+   * Read Any from the input stream.
    */
   public static java.lang.Object readAny(InputStream input)
   {
@@ -403,7 +403,7 @@ public class Util
    * used in write_value(..) method group in
    * {@link org.omg.CORBA_2_3.portable.OutputStream} and also may be called
    * directly from generated Stubs and Ties.
-   * 
+   *
    * @param output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param object an object to write.
@@ -413,4 +413,4 @@ public class Util
   {
     delegate.writeRemoteObject(output, object);
   }
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
index 79d740e7b0a..2454f534814 100644
--- a/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
+++ b/libjava/classpath/javax/rmi/CORBA/UtilDelegate.java
@@ -71,11 +71,11 @@ import javax.transaction.TransactionRolledbackException;
 
 /**
  * A delegate, implementing the functionality, provided by the {@link Util}.
- * 
+ *
  * The default delegate can be altered by setting the system property
  * "javax.rmi.CORBA.UtilClass" to the name of the alternative class that must
  * implement this interface.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface UtilDelegate
@@ -195,7 +195,7 @@ public interface UtilDelegate
   /**
    * Get the Tie that handles invocations on the given target. The target/Tie
    * pair must be previously registered using {@link #registerTarget}.
-   * 
+   *
    * @return the Tie, or null if no such is known.
    */
   Tie getTie(Remote target);
@@ -242,14 +242,14 @@ public interface UtilDelegate
    * <td>{@link UnexpectedException}</td>
    * </tr>
    * </table>
-   * 
+   *
    * @param e an exception that was thrown on a server side implementation.
-   * 
+   *
    * @return the corresponding RemoteException unless it is a RuntimeException.
-   * 
+   *
    * @throws RuntimeException the passed exception if it is an instance of
    * RuntimeException.
-   * 
+   *
    * @specnote It is the same behavior, as in Suns implementations 1.4.0-1.5.0.
    */
   RemoteException wrapException(Throwable orig);
@@ -263,7 +263,7 @@ public interface UtilDelegate
    * possible. This method is used in write_value(..) method group in
    * {@link org.omg.CORBA_2_3.portable.OutputStream} and also may be called
    * directly from generated Stubs and Ties.
-   * 
+   *
    * @param output a stream to write to, must be
    * org.omg.CORBA_2_3.portable.OutputStream
    * @param obj an object to write.
@@ -278,10 +278,10 @@ public interface UtilDelegate
    * {@link #writeRemoteObject}. The written data contains discriminator,
    * defining, that was written. Another method that writes the same content is
    * {@link org.omg.CORBA_2_3.portable.OutputStream#write_abstract_interface(java.lang.Object)}.
-   * 
+   *
    * @param output a stream to write to, must be
    * {@link org.omg.CORBA_2_3.portable.OutputStream}.
-   * 
+   *
    * @param object an object to write, must be CORBA object, Remote
    */
   void writeAbstractObject(OutputStream output, Object object);
@@ -295,7 +295,7 @@ public interface UtilDelegate
    * method writes CORBA object, value type or value box. For value types Null
    * is written with the abstract interface, its typecode having repository id
    * "IDL:omg.org/CORBA/AbstractBase:1.0" and the empty string name.
-   * 
+   *
    * @param output the object to write.
    * @param object the java object that must be written in the form of the CORBA
    * {@link Any}.
@@ -303,8 +303,8 @@ public interface UtilDelegate
   void writeAny(OutputStream output, Object object);
 
   /**
-   * Read Any from the input stream. 
+   * Read Any from the input stream.
    */
   Object readAny(InputStream input);
 
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
index acc44aa2f4a..cc855b80826 100644
--- a/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
+++ b/libjava/classpath/javax/rmi/CORBA/ValueHandler.java
@@ -51,32 +51,32 @@ import org.omg.SendingContext.RunTime;
  * of the value handler is returned by {@link Util#createValueHandler} and can
  * be altered by setting the system property "javax.rmi.CORBA.ValueHandlerClass"
  * to the name of the alternative class that must implement ValueHandler.
- * 
+ *
  * @author Audrius Meskauskas (AudriusA@Bioinformatics.org)
  */
 public interface ValueHandler
 {
   /**
    * Get CORBA repository Id for the given java class.
-   * 
+   *
    * The syntax of the repository ID is the initial ?RMI:?, followed by the Java
    * class name, followed by name, followed by a hash code string, followed
    * optionally by a serialization version UID string.
-   * 
+   *
    * For Java identifiers that contain illegal OMG IDL identifier characters
    * such as ?$?, any such illegal characters are replaced by ?\U? followed by
    * the 4 hexadecimal characters (in upper case) representing the Unicode
    * value.
-   * 
+   *
    * @param clz a class for that the repository Id is required.
-   * 
+   *
    * @return the class repository id.
    */
   String getRMIRepositoryID(Class clz);
 
   /**
    * Returns the CodeBase for this ValueHandler.
-   * 
+   *
    * @return the codebase.
    */
   RunTime getRunTimeCodeBase();
@@ -86,7 +86,7 @@ public interface ValueHandler
    * content to the stream. Such classes implement either {@link Streamable}
    * (default marshalling, generated by IDL-to-java compiler) or
    * {@link CustomMarshal} (the user-programmed marshalling).
-   * 
+   *
    * @param clz the class being checked.
    * @return true if the class supports custom or default marshalling, false
    * otherwise.
@@ -97,14 +97,14 @@ public interface ValueHandler
    * Read value from the CORBA input stream in the case when the value is not
    * Streamable or CustomMarshall'ed. The fields of the class being written will
    * be accessed using reflection.
-   * 
+   *
    * @param in a CORBA stream to read.
    * @param offset the current position in the input stream.
    * @param clz the type of value being read.
    * @param repositoryID the repository Id of the value being read.
    * @param sender the sending context that should provide data about the
    * message originator.
-   * 
+   *
    * @return the object, extracted from the stream.
    */
   Serializable readValue(InputStream in, int offset, Class clz,
@@ -113,18 +113,18 @@ public interface ValueHandler
   /**
    * When the value provides the writeReplace method, the result of this method
    * is written. Otherwise, the value itself is written.
-   * 
+   *
    * @param value the value that should be written to the stream.
-   * 
+   *
    * @return the value that will be actually written to the stream.
    */
   Serializable writeReplace(Serializable value);
 
   /**
    * Write value to CORBA output stream using java senmatics.
-   * 
+   *
    * @param out a stream to write into.
    * @param value a java object to write.
    */
   void writeValue(OutputStream out, Serializable value);
-}
\ No newline at end of file
+}
diff --git a/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java b/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
index 4db65c1dbfd..6bc6ad0af90 100644
--- a/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
+++ b/libjava/classpath/javax/rmi/CORBA/ValueHandlerMultiFormat.java
@@ -46,9 +46,9 @@ import java.io.Serializable;
  * This interface extends the previous ValueHandler, supporting various stream
  * format versions. The {@link ValueHandler} can be casted into this interface
  * to access additional features.
- * 
+ *
  * @since 1.5
- * 
+ *
  * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org)
  */
 public interface ValueHandlerMultiFormat
@@ -58,7 +58,7 @@ public interface ValueHandlerMultiFormat
    * Get the maximal supported version for the value types, supported by
    * this value handler. The versions are integer numbers, the currently valid
    * values being 1 and 2.
-   * 
+   *
    * These two versions differ in how the additional data, stored by the
    * writeObject method, are encoded.
    * <ul>
@@ -72,7 +72,7 @@ public interface ValueHandlerMultiFormat
    * </ul>
    * As the version number is part of the value type record, there is no need
    * to the format control during the reading.
-   * 
+   *
    * @return the maximal supported version.
    */
   byte getMaximumStreamFormatVersion();
@@ -80,13 +80,13 @@ public interface ValueHandlerMultiFormat
   /**
    * Write the value type to the output stream using the given format version.
    * The older method {@link ValueHandler#writeValue} always uses the version 1.
-   * 
+   *
    * @param output the stream, where the value should be written, must implement
    * {@link ValueOutputStream}.
    * @param value the value that should be written.
    * @param version the version of the format that must be used to write the
    * value.
-   * 
+   *
    * @throws BAD_PARAM if the version number is less than 1 or greater than the
    * maximal supported version.
    */