diff options
| author | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-20 10:36:51 +0100 |
| commit | 13f4fd6d3cc5a044db66d9c25319419bb4ede5fa (patch) | |
| tree | c230ae28caba40ac1f939fbedb5fd780d49fad0c /java/src | |
| parent | ICE-6861 - removing public stream API (diff) | |
| download | ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.bz2 ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.tar.xz ice-13f4fd6d3cc5a044db66d9c25319419bb4ede5fa.zip | |
ice_name/ice_id fixes & simplifications.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/Exception.java | 7 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/UserException.java | 7 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceSSL/RFC2253.java | 7 |
3 files changed, 10 insertions, 11 deletions
diff --git a/java/src/Ice/src/main/java/Ice/Exception.java b/java/src/Ice/src/main/java/Ice/Exception.java index dd8bf25281d..5cafdc6d592 100644 --- a/java/src/Ice/src/main/java/Ice/Exception.java +++ b/java/src/Ice/src/main/java/Ice/Exception.java @@ -55,8 +55,11 @@ public abstract class Exception extends RuntimeException implements Cloneable * @deprecated ice_name() is deprecated, use ice_id() instead. **/ @Deprecated - public abstract String - ice_name(); + public String + ice_name() + { + return ice_id().substring(2); + } /** * Returns the type id of this exception. diff --git a/java/src/Ice/src/main/java/Ice/UserException.java b/java/src/Ice/src/main/java/Ice/UserException.java index 7b606d53584..8faaf9b7aaf 100644 --- a/java/src/Ice/src/main/java/Ice/UserException.java +++ b/java/src/Ice/src/main/java/Ice/UserException.java @@ -52,8 +52,11 @@ public abstract class UserException extends java.lang.Exception implements Clone * @deprecated ice_name() is deprecated, use ice_id() instead. **/ @Deprecated - public abstract String - ice_name(); + public String + ice_name() + { + return ice_id().substring(2); + } /** * Returns the type id of this exception. diff --git a/java/src/Ice/src/main/java/IceSSL/RFC2253.java b/java/src/Ice/src/main/java/IceSSL/RFC2253.java index 28fa526cf9e..e7f2b353b83 100644 --- a/java/src/Ice/src/main/java/IceSSL/RFC2253.java +++ b/java/src/Ice/src/main/java/IceSSL/RFC2253.java @@ -31,13 +31,6 @@ class RFC2253 { return "::RFC2253::ParseException"; } - - @Override - public String - ice_name() - { - return "RFC2253::ParseException"; - } public String reason; } |