diff options
Diffstat (limited to 'libjava/classpath/gnu/CORBA/CDR')
19 files changed, 152 insertions, 152 deletions
diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java index f582c31bd18..fae16eed9d7 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrInput.java @@ -86,13 +86,13 @@ import java.math.BigDecimal; * from the given {@link java.io.InputStream}. The primitive types are aligned * on they natural boundaries by implementing the abstract method * {@link #align(int boundary)}. - * + * * The same class also implements {@link org.omg.CORBA.DataInputStream} to read * the object content in a user defined way. - * + * * TODO This class uses 16 bits per Unicode character only, as it was until jdk * 1.4 inclusive. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public abstract class AbstractCdrInput @@ -173,7 +173,7 @@ public abstract class AbstractCdrInput /** * Creates the stream. The stream reads Big Endian by default. - * + * * @param readFrom a stream to read CORBA input from. */ public AbstractCdrInput(java.io.InputStream readFrom) @@ -194,7 +194,7 @@ public abstract class AbstractCdrInput /** * Set the Big Endian or Little Endian encoding. The stream reads Big Endian * by default. - * + * * @param use_big_endian if true, the stream expect the multi-byte data in * the form "most significant byte first" (Big Endian). This is the * java standard. @@ -207,7 +207,7 @@ public abstract class AbstractCdrInput /** * Get the used encoding. - * + * * @return true for Big Endian, false for Little Endian. */ public boolean isBigEndian() @@ -228,7 +228,7 @@ public abstract class AbstractCdrInput /** * Set the input stream that receives the CORBA input. - * + * * @param readFrom the stream. */ public void setInputStream(java.io.InputStream readFrom) @@ -249,7 +249,7 @@ public abstract class AbstractCdrInput /** * Set the orb, associated with this stream. - * + * * @param an_orb */ public void setOrb(ORB an_orb) @@ -323,7 +323,7 @@ public abstract class AbstractCdrInput /** * Return the associated {@link ORB}. - * + * * @return the associated {@link ORB} or null is no such is set. */ public ORB orb() @@ -393,14 +393,14 @@ public abstract class AbstractCdrInput * plain (not a string-encoded) IOR profile without the heading endian * indicator. The responsible method for reading such data is * {@link IOR.read_no_endian}. - * + * * The returned object is usually casted into the given type using the .narrow * method of its helper, despite in some cases the direct cast would also * work. - * + * * The null objects are recognised from the empty profile set. For such * objects, null is returned. - * + * * @return the loaded and constructed object. */ public org.omg.CORBA.Object read_Object() @@ -991,7 +991,7 @@ public abstract class AbstractCdrInput * Read a singe byte string. The method firs reads the byte array and then * calls a constructor to create a string from this array. The character * encoding, if previously set, is taken into consideration. - * + * * @return a loaded string. */ public String read_string() @@ -1195,7 +1195,7 @@ public abstract class AbstractCdrInput /** * Reads the string in wide character format (ussually UTF-16, Unicode). Takes * the currently set charset into consideration. - * + * * If the native (UTF-16) encoding is used of the GIOP protocol is before 1.2, * delegates functionality to "plain" {@link #read_wstring_UTF_16}. */ @@ -1239,7 +1239,7 @@ public abstract class AbstractCdrInput { int p = 0; int n = read_long(); - + if (n<0) { MARSHAL m = new MARSHAL("Negative string size"); @@ -1336,9 +1336,9 @@ public abstract class AbstractCdrInput * Read the object that is an instance of the given class. The current * implementation delegates functionality to the parameterless * {@link readObject()}. - * + * * @param klass a class of that this object the instance is. - * + * * @return the returned object. */ public org.omg.CORBA.Object read_Object(Class klass) @@ -1348,11 +1348,11 @@ public abstract class AbstractCdrInput /** * Read a value type structure from the stream. - * + * * OMG specification states the writing format is outside the scope of GIOP * definition. This implementation uses java serialization mechanism, calling * {@link ObjectInputStream#readObject} - * + * * @return an value type structure, unmarshaled from the stream */ public Serializable read_Value() @@ -1363,11 +1363,11 @@ public abstract class AbstractCdrInput /** * Read the abstract interface. An abstract interface can be either CORBA * value type or CORBA object and is returned as an abstract java.lang.Object. - * + * * As specified in OMG specification, this reads a single boolean and then * delegates either to {@link #read_Object()} (for false) or to * {@link #read_Value()} (for true). - * + * * @return an abstract interface, unmarshaled from the stream */ public java.lang.Object read_Abstract() @@ -1402,11 +1402,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the char array to fit the newly read * values. - * + * * @param holder_value the existing char array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1450,11 +1450,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the int array to fit the newly read values. - * + * * @param holder_value the existing int array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1487,11 +1487,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the float array to fit the newly read * values. - * + * * @param holder_value the existing float array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1524,11 +1524,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the double array to fit the newly read * values. - * + * * @param holder_value the existing double array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1568,11 +1568,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the short array to fit the newly read * values. - * + * * @param holder_value the existing short array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1605,11 +1605,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the byte array to fit the newly read * values. - * + * * @param holder_value the existing byte array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1656,11 +1656,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of longs to fit the newly read * values. - * + * * @param holder_value the existing array, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1693,11 +1693,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of booleans to fit the newly read * values. - * + * * @param holder_value the existing array of booleans, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1733,11 +1733,11 @@ public abstract class AbstractCdrInput /** * If required, allocate or resize the array of Anys to fit the newly read * values. - * + * * @param holder_value the existing array of Anys, may be null. * @param offset the required offset to read. * @param length the length of the new sequence. - * + * * @return the allocated or resized array, same array if no such operations * are required. */ @@ -1758,11 +1758,11 @@ public abstract class AbstractCdrInput /** * This method is required to represent the DataInputStream as a value type * object. - * + * * @return a single entity "IDL:omg.org/CORBA/DataInputStream:1.0", always. */ public String[] _truncatable_ids() { return new String[] { "IDL:omg.org/CORBA/DataInputStream:1.0" }; } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java index 7f3e3ab0daf..ab0b982ab4a 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractCdrOutput.java @@ -79,7 +79,7 @@ import java.math.BigDecimal; * The same class also implements the {@link DataInputStream}, * providing support for writing the value type objects * in a user defined way. - * + * * TODO This class uses 16 bits per Unicode character only, as it was until * jdk 1.4 inclusive. * @@ -90,11 +90,11 @@ public abstract class AbstractCdrOutput implements org.omg.CORBA.DataOutputStream { /** - * The runtime, associated with this stream. This field is only used when + * The runtime, associated with this stream. This field is only used when * reading and writing value types and filled-in in gnu.CORBA.CDR.Vio. */ - public transient gnuRuntime runtime; - + public transient gnuRuntime runtime; + /** * This instance is used to convert primitive data types into the * byte sequences. @@ -177,7 +177,7 @@ public abstract class AbstractCdrOutput * stream is different from 0. */ public abstract void setOffset(int an_offset); - + /** * Clone all important settings to another stream. */ @@ -187,7 +187,7 @@ public abstract class AbstractCdrOutput stream.setCodeSet(getCodeSet()); stream.setVersion(giop); stream.setOrb(orb); - } + } /** * Set the current code set context. @@ -336,7 +336,7 @@ public abstract class AbstractCdrOutput * Read the CORBA object. The object is written form of the plain (not a * string-encoded) IOR profile without the heading endian indicator. The * responsible method for reading such data is {@link IOR.write_no_endian}. - * + * * The null value is written as defined in OMG specification (zero length * string, followed by an empty set of profiles). */ @@ -901,7 +901,7 @@ public abstract class AbstractCdrOutput /** * Writes the character as two byte short integer (Unicode value), high byte * first. Writes in Big Endian, but never writes the endian indicator. - * + * * The character is always written using the native UTF-16BE charset because * its size under arbitrary encoding is not evident. */ @@ -944,11 +944,11 @@ public abstract class AbstractCdrOutput /** * Write the array of wide chars. - * + * * @param chars the array of wide chars * @param offset offset * @param length length - * + * * The char array is always written using the native UTF-16BE charset because * the character size under arbitrary encoding is not evident. */ @@ -1044,4 +1044,4 @@ public abstract class AbstractCdrOutput { write_value(value); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java index 4d120fa2c0c..0ad98bed7bf 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractDataInput.java @@ -389,4 +389,4 @@ public interface AbstractDataInput */ int skipBytes(int n) throws IOException; -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java b/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java index e37c0cb7ddd..e41ec598aec 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AbstractDataOutput.java @@ -182,4 +182,4 @@ public interface AbstractDataOutput */ void writeDouble(double value) throws IOException; -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/AligningInput.java b/libjava/classpath/gnu/CORBA/CDR/AligningInput.java index e2710628a52..8d438ab0610 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AligningInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AligningInput.java @@ -107,17 +107,17 @@ public class AligningInput { return buf; } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return pos + offset; - } - + } + /** * Jump to the given position, taking offset into consideration. */ @@ -127,5 +127,5 @@ public class AligningInput throw new ArrayIndexOutOfBoundsException(position + " is out of valid ["+offset+".." + (count+offset) + "[ range"); pos = position - offset; - } + } } diff --git a/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java b/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java index 135f75af6a7..b0c569ec879 100644 --- a/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/AligningOutput.java @@ -117,17 +117,17 @@ public class AligningOutput write(0); } } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return size()+offset; } - + /** * Seek to the given position (not in use). */ @@ -135,7 +135,7 @@ public class AligningOutput { count = position - offset; } - + /** * Get the buffer without copying it. Use with care. */ @@ -143,6 +143,6 @@ public class AligningOutput { return buf; } - + } diff --git a/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java b/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java index 7a4d9c5aa8f..0578f13b857 100644 --- a/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java +++ b/libjava/classpath/gnu/CORBA/CDR/ArrayValueHelper.java @@ -63,7 +63,7 @@ import javax.rmi.CORBA.ValueHandler; * Writes arrays as a boxed value types. A single instance is used to write a * single array. This class is only used with RMI/IIOP, to handle array boxed * values. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ class ArrayValueHelper diff --git a/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java b/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java index 1559d75a41e..5579789a58b 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/BigEndianInputStream.java @@ -58,4 +58,4 @@ public class BigEndianInputStream { super(in); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java b/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java index 7d3b02ec950..dda14a03a33 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/BigEndianOutputStream.java @@ -59,4 +59,4 @@ public class BigEndianOutputStream { super(out); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java b/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java index 69bf95beb66..ae510b39c9b 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java +++ b/libjava/classpath/gnu/CORBA/CDR/BufferedCdrOutput.java @@ -42,7 +42,7 @@ import java.io.ByteArrayOutputStream; /** * A CORBA output stream, writing data into the internal buffer ({@link ByteArrayOutputStream}). - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class BufferedCdrOutput @@ -61,7 +61,7 @@ public class BufferedCdrOutput /** * Creates the instance with the given initial buffer size. - * + * * @param bufSize the buffer size. */ public BufferedCdrOutput(int bufSize) @@ -121,7 +121,7 @@ public class BufferedCdrOutput /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() diff --git a/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java b/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java index f0159a88dac..accb65a0db6 100644 --- a/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/BufferredCdrInput.java @@ -45,14 +45,14 @@ package gnu.CORBA.CDR; * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public class BufferredCdrInput - extends AbstractCdrInput + extends AbstractCdrInput implements gnuValueStream { - /** - * Use serialVersionUID for interoperability. + /** + * Use serialVersionUID for interoperability. */ private static final long serialVersionUID = 1; - + /** * The byte array input stream to read data from. */ @@ -114,17 +114,17 @@ public class BufferredCdrInput buffer.reset(); setInputStream(buffer); } - + /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition() { return buffer.getPosition(); } - + /** * Jump to the given position, taking offset into consideration. */ @@ -133,15 +133,15 @@ public class BufferredCdrInput buffer.seek(position); setInputStream(buffer); } - + /** * Get the associated RunTime. */ public gnuRuntime getRunTime() { return runtime; - } - + } + /** * Replace the instance of RunTime. */ @@ -149,5 +149,5 @@ public class BufferredCdrInput { runtime = a_runtime; } - + } diff --git a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java index 273ecea5024..5e97c73b8db 100644 --- a/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java +++ b/libjava/classpath/gnu/CORBA/CDR/HeadlessInput.java @@ -71,10 +71,10 @@ import java.math.BigDecimal; * Substitutes the main stream in factories when the header is already behind. * Overrides methods that may be invoked from the factory, forcing not to read * the header if called first time on this stream. - * + * * This stream reverts to default behavior if one or more call are made (reading * value types that are nested fields of the value type). - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class HeadlessInput @@ -103,7 +103,7 @@ public class HeadlessInput /** * Create an instance, reading from the given buffer. - * + * * @param a_stream a stream from where the data will be read. * @param inheritSettings a stream from that endian and other settings are * inherited. @@ -746,4 +746,4 @@ public class HeadlessInput stream.seek(position); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java b/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java index 3259a48770c..663e041961f 100644 --- a/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java +++ b/libjava/classpath/gnu/CORBA/CDR/IDLTypeHelper.java @@ -52,7 +52,7 @@ import java.lang.reflect.Modifier; /** * Handles case when the CORBA IDL type with the known helper is wrapped into * Value type. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class IDLTypeHelper @@ -118,7 +118,7 @@ public class IDLTypeHelper catch (Exception ex) { MARSHAL m = new MARSHAL(msg() + " read(..)"); - m.minor = Minor.Boxed; + m.minor = Minor.Boxed; m.initCause(ex); throw m; } @@ -152,7 +152,7 @@ public class IDLTypeHelper catch (Exception ex) { MARSHAL m = new MARSHAL(msg() + " write(..)"); - m.minor = Minor.Boxed; + m.minor = Minor.Boxed; m.initCause(ex); throw m; } diff --git a/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java b/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java index 6791a82e7c3..f1b8e04b3d2 100644 --- a/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/LittleEndianOutputStream.java @@ -250,4 +250,4 @@ public class LittleEndianOutputStream { writeLong(Double.doubleToLongBits(value)); } -}
\ No newline at end of file +} diff --git a/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java b/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java index 314dd8eb948..cb36f8c4297 100644 --- a/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java +++ b/libjava/classpath/gnu/CORBA/CDR/UnknownExceptionCtxHandler.java @@ -54,7 +54,7 @@ import javax.rmi.CORBA.Util; /** * Reads the data about an unknown exception from the UnknownExceptionInfo. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class UnknownExceptionCtxHandler @@ -109,16 +109,16 @@ public class UnknownExceptionCtxHandler * Following the documentation, this must be just value type, but it seems * that in Sun's implementation is is not, as starts from 0x0. For value type, * this would be null. - * + * * TODO Implement reading and writing in Sun format, making Classpath IIOP * interoperable with Sun's implementation. Current inmplementation reads and * reproduces the exception class type only. - * + * * @param input the input stream to read the context (orb and other settings * are inherited from the main stream that received the message). - * + * * @param contexts all service contexts that were present in the message. - * + * * @return the Throwable, extracted from context, on null, if this has failed. */ public static Throwable read(BufferredCdrInput input, ServiceContext[] contexts) diff --git a/libjava/classpath/gnu/CORBA/CDR/VMVio.java b/libjava/classpath/gnu/CORBA/CDR/VMVio.java index 9b719fd7c50..47a6c0c25cc 100644 --- a/libjava/classpath/gnu/CORBA/CDR/VMVio.java +++ b/libjava/classpath/gnu/CORBA/CDR/VMVio.java @@ -36,13 +36,13 @@ exception statement from your version. */ /** - * This is a temporary replacement for the native call that would allocate + * This is a temporary replacement for the native call that would allocate * objects without public constructors. The replacement only allocates * objects with public parameterless constructor and objects with public * constructor taking string (like some Throwables). * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) - * + * * TODO FIXME replace by native call like in VMObjectInputStream. * Required modification of Classpath the build system. */ diff --git a/libjava/classpath/gnu/CORBA/CDR/Vio.java b/libjava/classpath/gnu/CORBA/CDR/Vio.java index 86f842c34bb..1eecb651b20 100644 --- a/libjava/classpath/gnu/CORBA/CDR/Vio.java +++ b/libjava/classpath/gnu/CORBA/CDR/Vio.java @@ -69,7 +69,7 @@ import javax.rmi.CORBA.ValueHandler; /** * A specialised class for reading and writing the value types. - * + * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) */ public abstract class Vio @@ -79,7 +79,7 @@ public abstract class Vio * and is not required for interoperability with jdk 1.5, but is left in the * implementation as the optional mode for solving possible interoperability * problems with non-Sun CORBA implementations. - * + * * The current implementation would accept both single chunk or multiple * chunks, but will always send a single chunk (if true) or unchunked data (if * false). @@ -155,11 +155,11 @@ public abstract class Vio * required when an unitialised instance or at least class of the value type * is known. Hence it may be faster to use the alternative methods, * read(InputStream, Class) or read(InputStream, Serializable). - * + * * @param input a stream to read from. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input) @@ -173,12 +173,12 @@ public abstract class Vio * required when an unitialised instance or at least class of the value type * is known. Hence it may be faster to use the alternative methods, * read(InputStream, Class) or read(InputStream, Serializable). - * + * * @param input a stream to read from. * @param repository_id a repository id of the object being read, may be null. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input, String repository_id) @@ -240,7 +240,7 @@ public abstract class Vio catch (Exception ex) { MARSHAL m = new MARSHAL(); - m.minor = Minor.Value; + m.minor = Minor.Value; m.initCause(ex); throw m; } @@ -249,12 +249,12 @@ public abstract class Vio /** * Read the value base from the given input stream when the value base class * is available. Hence there is no need to guess it from the repository id. - * + * * @param input a stream to read from. * @param value_class the class of the value being read. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Serializable read(InputStream input, Class value_class) @@ -353,18 +353,18 @@ public abstract class Vio * Read the value base from the given input stream when the unitialised * instance is available. Hence there is no need to guess the class from the * repository id and then to instantiate an instance. - * + * * @param input a stream to read from. - * + * * @param value_instance an pre-created instance of the value. If the helper * is not null, this parameter is ignored an should be null. - * + * * @param helper a helper to create an instance and read the object- specific * part of the record. If the value_instance is used instead, this parameter * should be null. - * + * * @return the loaded value. - * + * * @throws MARSHAL if the reading has failed due any reason. */ public static Object read(InputStream input, Object value_instance, @@ -431,10 +431,10 @@ public abstract class Vio * Read using provided boxed value helper. This method expects the full value * type header, followed by contents, that are delegated to the provided * helper. It handles null. - * + * * @param input the stream to read from. * @param helper the helper that reads the type-specific part of the content. - * + * * @return the value, created by the helper, or null if the header indicates * that null was previously written. */ @@ -447,17 +447,17 @@ public abstract class Vio * Fill in the instance fields by the data from the input stream. The method * assumes that the value header, if any, is already behind. The information * from the stream is stored into the passed ox parameter. - * + * * @param input an input stream to read from. - * + * * @param value a pre-instantiated value type object, must be either * Streamable or CustomMarshal. If the helper is used, this parameter is * ignored and should be null. - * + * * @param value_tag the tag that must be read previously. * @param helper the helper for read object specific part; may be null to read * in using other methods. - * + * * @return the value that was read. */ static Object read_instance(InputStream input, final int position, @@ -542,13 +542,13 @@ public abstract class Vio /** * Read the chunked nested value from the given input stream, transferring the * contents to the given output stream. - * + * * @param value_tag the value tag of the value being read. * @param input the input stream from where the remainder of the nested value * must be read. * @param output the output stream where the unchunked nested value must be * copied. - * + * * @return the tag that ended the nested value. */ public static int readNestedValue(int value_tag, InputStream input, @@ -769,12 +769,12 @@ public abstract class Vio /** * Write the value base into the given stream. - * + * * @param output a stream to write to. - * + * * @param value a value type object, must be either Streamable or * CustomMarshal. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value) @@ -791,11 +791,11 @@ public abstract class Vio /** * Write the value base into the given stream, stating that it is an instance * of the given class. - * + * * @param output a stream to write to. - * + * * @param value a value to write. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value, @@ -831,11 +831,11 @@ public abstract class Vio * Write the value base into the given stream, supplementing it with an array * of the provided repository ids plus the repository id, derived from the * passed value. - * + * * @param output a stream to write to. - * + * * @param value a value to write. - * + * * @throws MARSHAL if the writing failed due any reason. */ public static void write(OutputStream output, Serializable value, @@ -857,7 +857,7 @@ public abstract class Vio /** * Write value when its repository Id is explicitly given. Only this Id is * written, the type of value is not taken into consideration. - * + * * @param output an output stream to write into. * @param value a value to write. * @param id a value repository id. @@ -873,7 +873,7 @@ public abstract class Vio /** * Write standard value type header, followed by contents, produced by the * boxed value helper. - * + * * @param output the stream to write to. * @param value the value to write, can be null. * @param helper the helper that writes the value content if it is not null @@ -902,7 +902,7 @@ public abstract class Vio /** * Write value when its repository Id is explicitly given. Does not handle * null. - * + * * @param output an output stream to write into. * @param value a value to write. * @param ids a value repository id (can be either single string or string @@ -1070,7 +1070,7 @@ public abstract class Vio /** * Read the indirection data and return the object that was already written to * this stream. - * + * * @param an_input the input stream, must be BufferredCdrInput. */ static Serializable readIndirection(InputStream an_input) @@ -1106,9 +1106,9 @@ public abstract class Vio /** * Check the passed value tag for correctness. - * + * * @param value_tag a tag to check, must be between 0x7fffff00 and 0x7fffffff - * + * * @throws MARSHAL if the tag is outside this interval. */ static void checkTag(int value_tag) @@ -1452,7 +1452,7 @@ public abstract class Vio * Instantiate an instance of this class anyway; also in the case when it has * no parameterless or any other constructor. The fields will be assigned * while reading the class from the stream. - * + * * @param clazz a class for that the instance should be instantiated. */ public static Object instantiateAnyWay(Class clazz) diff --git a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java index 4af8c68515a..1d07094e968 100644 --- a/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java +++ b/libjava/classpath/gnu/CORBA/CDR/gnuRuntime.java @@ -56,7 +56,7 @@ import java.util.TreeSet; /** * Our implementation of the sending context runtime. - * + * * @author Audrius Meskauskas, Lithuania (AudriusA@Bioinformatics.org) */ public class gnuRuntime @@ -165,7 +165,7 @@ public class gnuRuntime /** * Create Runtime. - * + * * @param a_id a repository Id, if only one Id was specified in the stream. * @param a_ids a repository Ids, if the multiple Ids were specified in te * stream. @@ -200,7 +200,7 @@ public class gnuRuntime /** * Check if the object is already written. - * + * * @return the position, at that the object is allready written or -1 if it is * not yet written. */ @@ -224,9 +224,9 @@ public class gnuRuntime /** * Get the object, written at the given position. This returs both shared * objects and repository Ids. - * + * * @return the position, at that the object is allready written. - * + * * @throws MARSHAL if there is no object written at that position. */ public Object isObjectWrittenAt(int x, int offset) @@ -238,7 +238,7 @@ public class gnuRuntime return e.object; else { - MARSHAL m = new MARSHAL("No object was written at " + x + + MARSHAL m = new MARSHAL("No object was written at " + x + " (offset " + offset + ") r " + this + dump()); m.minor = Minor.Graph; throw m; @@ -268,7 +268,7 @@ public class gnuRuntime public void multipleIdsWritten(String[] ids, int at) { if (sh_ids.containsKey(ids)) - throw new InternalError("Repetetive writing of the same string " + + throw new InternalError("Repetetive writing of the same string " + ids + dump()); Entry e = new Entry(); @@ -281,7 +281,7 @@ public class gnuRuntime /** * Check if the object is already written. - * + * * @return the position, at that the object is allready written or -1 if it is * not yet written. */ diff --git a/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java b/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java index 663c9901861..95d9edb2e74 100644 --- a/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java +++ b/libjava/classpath/gnu/CORBA/CDR/gnuValueStream.java @@ -48,24 +48,24 @@ public interface gnuValueStream { /** * Get the current position in the buffer. - * + * * @return The position in the buffer, taking offset into consideration. */ public int getPosition(); - + /** * Jump to the given position, taking offset into consideration. */ public void seek(int position); - + /** - * Get the RunTime information. + * Get the RunTime information. */ public gnuRuntime getRunTime(); - + /** - * Replace the instance of RunTime. + * Replace the instance of RunTime. */ public void setRunTime(gnuRuntime a_runtime); - + } |
