diff options
| author | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2008-01-30 06:15:20 -0800 |
| commit | f3c3029ff651d294a1a0df0e79e72771307310fc (patch) | |
| tree | 1f061a96f5f46051b6daf45ccbdb63ebd2cdd746 /java/src/IceInternal/Reference.java | |
| parent | Fixed and moved fixVersion.py/fixCopyright.py (diff) | |
| download | ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.bz2 ice-f3c3029ff651d294a1a0df0e79e72771307310fc.tar.xz ice-f3c3029ff651d294a1a0df0e79e72771307310fc.zip | |
using Java5 types in Ice core; general cleanup
Diffstat (limited to 'java/src/IceInternal/Reference.java')
| -rw-r--r-- | java/src/IceInternal/Reference.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 12723c2fd55..26253b67daf 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -54,7 +54,7 @@ public abstract class Reference implements Cloneable return _instance; } - public final java.util.Map + public final java.util.Map<String, String> getContext() { return _context; @@ -92,7 +92,7 @@ public abstract class Reference implements Cloneable // corresponding value changed. // public final Reference - changeContext(java.util.Map newContext) + changeContext(java.util.Map<String, String> newContext) { if(newContext == null) { @@ -105,7 +105,7 @@ public abstract class Reference implements Cloneable } else { - r._context = new java.util.HashMap(newContext); + r._context = new java.util.HashMap<String, String>(newContext); } return r; } @@ -423,7 +423,7 @@ public abstract class Reference implements Cloneable protected int _hashValue; protected boolean _hashInitialized; - private static java.util.HashMap _emptyContext = new java.util.HashMap(); + private static java.util.Map<String, String> _emptyContext = new java.util.HashMap<String, String>(); final private Instance _instance; final private Ice.Communicator _communicator; @@ -431,7 +431,7 @@ public abstract class Reference implements Cloneable private int _mode; private boolean _secure; private Ice.Identity _identity; - private java.util.Map _context; + private java.util.Map<String, String> _context; private String _facet; protected boolean _overrideCompress; protected boolean _compress; // Only used if _overrideCompress == true @@ -440,7 +440,7 @@ public abstract class Reference implements Cloneable Reference(Instance instance, Ice.Communicator communicator, Ice.Identity identity, - java.util.Map context, + java.util.Map<String, String> context, String facet, int mode, boolean secure) |