diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-09-26 18:14:44 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-09-26 18:14:44 -0700 |
| commit | 662c3702050e2a8d9e0668d51acd77d30ebc9394 (patch) | |
| tree | 536ad69a7a91200718e8e54c4a2d216ba9d34ef8 /java | |
| parent | Ice/logger test fails when running as root (diff) | |
| download | ice-662c3702050e2a8d9e0668d51acd77d30ebc9394.tar.bz2 ice-662c3702050e2a8d9e0668d51acd77d30ebc9394.tar.xz ice-662c3702050e2a8d9e0668d51acd77d30ebc9394.zip | |
More javadoc fixes
Diffstat (limited to 'java')
| -rw-r--r-- | java/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/Object.java | 4 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/ObjectImpl.java | 4 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceUtil/Cache.java | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/java/build.gradle b/java/build.gradle index 2befd7009f7..576c65203ed 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -60,6 +60,7 @@ dist.dependsOn(project(":glacier2").assemble) dist.dependsOn(project(":icegrid").assemble) dist.dependsOn(project(":icebox").assemble) dist.dependsOn(project(":icediscovery").assemble) +dist.dependsOn(project(":icelocatordiscovery").assemble) dist.dependsOn(project(":icepatch2").assemble) dist.dependsOn(project(":icestorm").assemble) dist.dependsOn(project(":IceGridGUI").assemble) diff --git a/java/src/Ice/src/main/java/Ice/Object.java b/java/src/Ice/src/main/java/Ice/Object.java index 997c44bbe49..865c2a370c5 100644 --- a/java/src/Ice/src/main/java/Ice/Object.java +++ b/java/src/Ice/src/main/java/Ice/Object.java @@ -96,7 +96,7 @@ public interface Object * The expression <code>ice_operationAttributes("op") & 0x1</code> is true if * the operation has a <code>["freeze:write"]</code> metadata directive. * <p> - * The second- and third least significant bit indicate the transactional mode + * The second and third least significant bit indicate the transactional mode * of the operation. The expression <code>ice_operationAttributes("op") & 0x6 >> 1</code> * indicates the transactional mode as follows: * <dl> @@ -109,8 +109,6 @@ public interface Object * <dt>3</dt> * <dd><code>["freeze:read:never"]</code></dd> * </dl> - * - * @see Freeze.TransactionalEvictor **/ int ice_operationAttributes(String operation); diff --git a/java/src/Ice/src/main/java/Ice/ObjectImpl.java b/java/src/Ice/src/main/java/Ice/ObjectImpl.java index d550dc14483..582d8fe7a01 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectImpl.java +++ b/java/src/Ice/src/main/java/Ice/ObjectImpl.java @@ -215,7 +215,7 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io * The expression <code>ice_operationAttributes("op") & 0x1</code> is true if * the operation has a <code>["freeze:write"]</code> metadata directive. * <p> - * The second- and third least significant bit indicate the transactional mode + * The second and third least significant bit indicate the transactional mode * of the operation. The expression <code>ice_operationAttributes("op") & 0x6 >> 1</code> * indicates the transactional mode as follows: * <dl> @@ -228,8 +228,6 @@ public abstract class ObjectImpl implements Object, java.lang.Cloneable, java.io * <dt>3</dt> * <dd><code>["freeze:read:never"]</code></dd> * </dl> - * - * @see Freeze.TransactionalEvictor **/ @Override public int ice_operationAttributes(String operation) diff --git a/java/src/Ice/src/main/java/IceUtil/Cache.java b/java/src/Ice/src/main/java/IceUtil/Cache.java index 975a76b55dd..5914d772239 100644 --- a/java/src/Ice/src/main/java/IceUtil/Cache.java +++ b/java/src/Ice/src/main/java/IceUtil/Cache.java @@ -16,7 +16,6 @@ package IceUtil; * evictors, such as used by Freeze. * * @see Store - * @see Freeze.Evictor **/ public class Cache |