summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectPrxHelper.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
committerMatthew Newhook <matthew@zeroc.com>2014-08-07 14:05:44 -0230
commite3a672a438635a1173388aea9d7a2d44de358945 (patch)
tree57113ece1dd013c9687468a8dd7cc62c80136b86 /java/src/Ice/ObjectPrxHelper.java
parentICE-5457 added ability to set source address for connections (diff)
downloadice-e3a672a438635a1173388aea9d7a2d44de358945.tar.bz2
ice-e3a672a438635a1173388aea9d7a2d44de358945.tar.xz
ice-e3a672a438635a1173388aea9d7a2d44de358945.zip
Add @Override where possible, and remove trailing white space.
Diffstat (limited to 'java/src/Ice/ObjectPrxHelper.java')
-rw-r--r--java/src/Ice/ObjectPrxHelper.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index 14bbc89f4da..45c290df6e2 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -144,15 +144,15 @@ public class ObjectPrxHelper extends ObjectPrxHelperBase
}
/**
- * Returns the Slice type id of the interface or class associated
+ * Returns the Slice type id of the interface or class associated
* with this proxy class.
*
- * @return the type id, "::Ice::Object"
- **/
+ * @return the type id, "::Ice::Object"
+ **/
public static String
ice_staticId()
{
- return Ice.ObjectImpl.ice_staticId();
+ return Ice.ObjectImpl.ice_staticId();
}
}