summaryrefslogtreecommitdiff
path: root/java/src/Ice/Object.java
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2009-07-20 13:16:17 +1000
committerMichi Henning <michi@zeroc.com>2009-07-20 13:16:17 +1000
commit09eabfe43746b4db696223a426197e6196e1efce (patch)
tree6a80bc8338b1f5b38816acb18912fff26aed291f /java/src/Ice/Object.java
parentbug 2806 - Java holder changes for class/interface types (diff)
downloadice-09eabfe43746b4db696223a426197e6196e1efce.tar.bz2
ice-09eabfe43746b4db696223a426197e6196e1efce.tar.xz
ice-09eabfe43746b4db696223a426197e6196e1efce.zip
Bug 3502 - Improve javadoc support in Eclipse
Fixed many doc comments in Java and Slice and added doc comments for C#.
Diffstat (limited to 'java/src/Ice/Object.java')
-rw-r--r--java/src/Ice/Object.java13
1 files changed, 8 insertions, 5 deletions
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index 7f2b79c3c1d..9d7aa80da42 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -9,6 +9,9 @@
package Ice;
+/**
+ * The base interface for servants.
+ **/
public interface Object
{
boolean equals(java.lang.Object rhs);
@@ -56,8 +59,8 @@ public interface Object
/**
* Returns the Slice type IDs of the interfaces supported by this object.
*
- * @return The Slice type Ids of the interfaces supported by this object, in base-to-derived
- * order. The first element of the return array is always <code>::Ice::Object</code>.
+ * @return The Slice type IDs of the interfaces supported by this object, in base-to-derived
+ * order. The first element of the returned array is always <code>::Ice::Object</code>.
**/
String[] ice_ids();
@@ -65,8 +68,8 @@ public interface Object
* Returns the Slice type IDs of the interfaces supported by this object.
*
* @param current The {@link Current} object for the invocation.
- * @return The Slice type Ids of the interfaces supported by this object, in base-to-derived
- * order. The first element of the return array is always <code>::Ice::Object</code>.
+ * @return The Slice type IDs of the interfaces supported by this object, in base-to-derived
+ * order. The first element of the returned array is always <code>::Ice::Object</code>.
**/
String[] ice_ids(Current current);
@@ -119,7 +122,7 @@ public interface Object
void ice_preMarshal();
/**
- * This Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
+ * The Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
* subclass to override this method in order to perform additional initialization.
**/
void ice_postUnmarshal();