summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/InputStreamI.java4
-rw-r--r--java/src/Ice/OutputStreamI.java4
-rw-r--r--java/src/IceGridGUI/LiveDeployment/Server.java58
-rw-r--r--java/src/IceInternal/BasicStream.java12
-rw-r--r--java/src/IceInternal/Outgoing.java2
-rw-r--r--java/src/IceInternal/OutgoingAsync.java2
6 files changed, 41 insertions, 41 deletions
diff --git a/java/src/Ice/InputStreamI.java b/java/src/Ice/InputStreamI.java
index 588fffd3dbb..1bd53326c14 100644
--- a/java/src/Ice/InputStreamI.java
+++ b/java/src/Ice/InputStreamI.java
@@ -187,9 +187,9 @@ public class InputStreamI implements InputStream
}
public int
- readEnum(int limit)
+ readEnum(int maxValue)
{
- return _is.readEnum(limit);
+ return _is.readEnum(maxValue);
}
public void
diff --git a/java/src/Ice/OutputStreamI.java b/java/src/Ice/OutputStreamI.java
index 8d2e2c086d4..16d2323b809 100644
--- a/java/src/Ice/OutputStreamI.java
+++ b/java/src/Ice/OutputStreamI.java
@@ -160,9 +160,9 @@ public class OutputStreamI implements OutputStream
}
public void
- writeEnum(int v, int limit)
+ writeEnum(int v, int maxValue)
{
- _os.writeEnum(v, limit);
+ _os.writeEnum(v, maxValue);
}
public void
diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java
index 58dc8b0e2b9..31e5ca08fd8 100644
--- a/java/src/IceGridGUI/LiveDeployment/Server.java
+++ b/java/src/IceGridGUI/LiveDeployment/Server.java
@@ -608,69 +608,69 @@ public class Server extends ListArrayTreeNode
//
_icons = new Icon[8][2][2];
_icons[0][0][0] = Utils.getIcon("/icons/16x16/server_unknown.png");
- _icons[ServerState.Inactive.ordinal() + 1][0][0] = Utils.getIcon("/icons/16x16/server_inactive.png");
- _icons[ServerState.Activating.ordinal() + 1][0][0] = Utils.getIcon("/icons/16x16/server_activating.png");
- _icons[ServerState.ActivationTimedOut.ordinal() + 1][0][0] =
+ _icons[ServerState.Inactive.value() + 1][0][0] = Utils.getIcon("/icons/16x16/server_inactive.png");
+ _icons[ServerState.Activating.value() + 1][0][0] = Utils.getIcon("/icons/16x16/server_activating.png");
+ _icons[ServerState.ActivationTimedOut.value() + 1][0][0] =
Utils.getIcon("/icons/16x16/server_activating.png");
- _icons[ServerState.Active.ordinal() + 1][0][0] = Utils.getIcon("/icons/16x16/server_active.png");
- _icons[ServerState.Deactivating.ordinal() + 1][0][0] =
+ _icons[ServerState.Active.value() + 1][0][0] = Utils.getIcon("/icons/16x16/server_active.png");
+ _icons[ServerState.Deactivating.value() + 1][0][0] =
Utils.getIcon("/icons/16x16/server_deactivating.png");
- _icons[ServerState.Destroying.ordinal() + 1][0][0] = Utils.getIcon("/icons/16x16/server_destroying.png");
- _icons[ServerState.Destroyed.ordinal() + 1][0][0] = Utils.getIcon("/icons/16x16/server_destroyed.png");
+ _icons[ServerState.Destroying.value() + 1][0][0] = Utils.getIcon("/icons/16x16/server_destroying.png");
+ _icons[ServerState.Destroyed.value() + 1][0][0] = Utils.getIcon("/icons/16x16/server_destroyed.png");
//
// IceBox servers
//
_icons[0][1][0] = Utils.getIcon("/icons/16x16/icebox_server_unknown.png");
- _icons[ServerState.Inactive.ordinal() + 1][1][0] =
+ _icons[ServerState.Inactive.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_inactive.png");
- _icons[ServerState.Activating.ordinal() + 1][1][0] =
+ _icons[ServerState.Activating.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_activating.png");
- _icons[ServerState.ActivationTimedOut.ordinal() + 1][1][0] =
+ _icons[ServerState.ActivationTimedOut.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_activating.png");
- _icons[ServerState.Active.ordinal() + 1][1][0] = Utils.getIcon("/icons/16x16/icebox_server_active.png");
- _icons[ServerState.Deactivating.ordinal() + 1][1][0] =
+ _icons[ServerState.Active.value() + 1][1][0] = Utils.getIcon("/icons/16x16/icebox_server_active.png");
+ _icons[ServerState.Deactivating.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_deactivating.png");
- _icons[ServerState.Destroying.ordinal() + 1][1][0] =
+ _icons[ServerState.Destroying.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_destroying.png");
- _icons[ServerState.Destroyed.ordinal() + 1][1][0] =
+ _icons[ServerState.Destroyed.value() + 1][1][0] =
Utils.getIcon("/icons/16x16/icebox_server_destroyed.png");
//
// Regular servers (disabled)
//
_icons[0][0][1] = Utils.getIcon("/icons/16x16/server_unknown.png");
- _icons[ServerState.Inactive.ordinal() + 1][0][1] =
+ _icons[ServerState.Inactive.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_inactive.png");
- _icons[ServerState.Activating.ordinal() + 1][0][1] =
+ _icons[ServerState.Activating.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_activating.png");
- _icons[ServerState.ActivationTimedOut.ordinal() + 1][0][1] =
+ _icons[ServerState.ActivationTimedOut.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_activating.png");
- _icons[ServerState.Active.ordinal() + 1][0][1] = Utils.getIcon("/icons/16x16/server_disabled_active.png");
- _icons[ServerState.Deactivating.ordinal() + 1][0][1] =
+ _icons[ServerState.Active.value() + 1][0][1] = Utils.getIcon("/icons/16x16/server_disabled_active.png");
+ _icons[ServerState.Deactivating.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_deactivating.png");
- _icons[ServerState.Destroying.ordinal() + 1][0][1] =
+ _icons[ServerState.Destroying.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_destroying.png");
- _icons[ServerState.Destroyed.ordinal() + 1][0][1] =
+ _icons[ServerState.Destroyed.value() + 1][0][1] =
Utils.getIcon("/icons/16x16/server_disabled_destroyed.png");
//
// IceBox servers (disabled)
//
_icons[0][1][1] = Utils.getIcon("/icons/16x16/icebox_server_unknown.png");
- _icons[ServerState.Inactive.ordinal() + 1][1][1]
+ _icons[ServerState.Inactive.value() + 1][1][1]
= Utils.getIcon("/icons/16x16/icebox_server_disabled_inactive.png");
- _icons[ServerState.Activating.ordinal() + 1][1][1] =
+ _icons[ServerState.Activating.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_activating.png");
- _icons[ServerState.ActivationTimedOut.ordinal() + 1][1][1] =
+ _icons[ServerState.ActivationTimedOut.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_activating.png");
- _icons[ServerState.Active.ordinal() + 1][1][1] =
+ _icons[ServerState.Active.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_active.png");
- _icons[ServerState.Deactivating.ordinal() + 1][1][1] =
+ _icons[ServerState.Deactivating.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_deactivating.png");
- _icons[ServerState.Destroying.ordinal() + 1][1][1] =
+ _icons[ServerState.Destroying.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_destroying.png");
- _icons[ServerState.Destroyed.ordinal() + 1][1][1] =
+ _icons[ServerState.Destroyed.value() + 1][1][1] =
Utils.getIcon("/icons/16x16/icebox_server_disabled_destroyed.png");
}
@@ -901,7 +901,7 @@ public class Server extends ListArrayTreeNode
}
else
{
- _stateIconIndex = _state.ordinal() + 1;
+ _stateIconIndex = _state.value() + 1;
}
if(_state == ServerState.Active && getRoot().getTree().isExpanded(getPath()))
diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java
index 20a2ebf9121..7ca5ab9e4ac 100644
--- a/java/src/IceInternal/BasicStream.java
+++ b/java/src/IceInternal/BasicStream.java
@@ -1973,15 +1973,15 @@ public class BasicStream
}
public void
- writeEnum(int v, int limit)
+ writeEnum(int v, int maxValue)
{
if(isWriteEncoding_1_0())
{
- if(limit <= 127)
+ if(maxValue < 127)
{
writeByte((byte)v);
}
- else if(limit <= 32767)
+ else if(maxValue < 32767)
{
writeShort((short)v);
}
@@ -1997,15 +1997,15 @@ public class BasicStream
}
public int
- readEnum(int limit)
+ readEnum(int maxValue)
{
if(getReadEncoding().equals(Ice.Util.Encoding_1_0))
{
- if(limit <= 127)
+ if(maxValue < 127)
{
return readByte();
}
- else if(limit <= 32767)
+ else if(maxValue < 32767)
{
return readShort();
}
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 90848d502e6..f2d2b6317fe 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -594,7 +594,7 @@ public final class Outgoing implements OutgoingMessageCallback
_os.writeString(operation);
- _os.writeByte((byte)mode.ordinal());
+ _os.writeByte((byte)mode.value());
if(context != null)
{
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index cb44b4ea4dc..83166e27103 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -63,7 +63,7 @@ public class OutgoingAsync extends Ice.AsyncResult implements OutgoingAsyncMessa
_os.writeString(operation);
- _os.writeByte((byte)mode.ordinal());
+ _os.writeByte((byte)mode.value());
if(ctx != null)
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:56:30 +0000