summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Protocol.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/IceInternal/Protocol.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/IceInternal/Protocol.java')
-rw-r--r--java/src/IceInternal/Protocol.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceInternal/Protocol.java b/java/src/IceInternal/Protocol.java
index 8d1769f2de4..a129e406a22 100644
--- a/java/src/IceInternal/Protocol.java
+++ b/java/src/IceInternal/Protocol.java
@@ -98,7 +98,7 @@ final public class Protocol
};
static final public Ice.ProtocolVersion currentProtocol = new Ice.ProtocolVersion(protocolMajor, protocolMinor);
- static final public Ice.EncodingVersion currentProtocolEncoding = new Ice.EncodingVersion(protocolEncodingMajor,
+ static final public Ice.EncodingVersion currentProtocolEncoding = new Ice.EncodingVersion(protocolEncodingMajor,
protocolEncodingMinor);
static final public Ice.EncodingVersion currentEncoding = new Ice.EncodingVersion(encodingMajor, encodingMinor);
@@ -151,7 +151,7 @@ final public class Protocol
// Unsupported but compatible, use the currently supported
// protocol, that's the best we can do.
//
- return currentProtocol;
+ return currentProtocol;
}
}
@@ -176,7 +176,7 @@ final public class Protocol
// Unsupported but compatible, use the currently supported
// encoding, that's the best we can do.
//
- return currentEncoding;
+ return currentEncoding;
}
}