diff options
Diffstat (limited to 'csharp/src/Ice/PropertiesI.cs')
| -rw-r--r-- | csharp/src/Ice/PropertiesI.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/csharp/src/Ice/PropertiesI.cs b/csharp/src/Ice/PropertiesI.cs index be5a5e9be32..5e8ac519ea6 100644 --- a/csharp/src/Ice/PropertiesI.cs +++ b/csharp/src/Ice/PropertiesI.cs @@ -84,12 +84,12 @@ namespace Ice pv.used = true; try { - return System.Int32.Parse(pv.val, CultureInfo.InvariantCulture); + return int.Parse(pv.val, CultureInfo.InvariantCulture); } - catch(System.FormatException) + catch(FormatException) { - Ice.Util.getProcessLogger().warning("numeric property " + key + - " set to non-numeric value, defaulting to " + val); + Util.getProcessLogger().warning("numeric property " + key + + " set to non-numeric value, defaulting to " + val); return val; } } @@ -120,8 +120,8 @@ namespace Ice string[] result = IceUtilInternal.StringUtil.splitString(pv.val, ", \t\r\n"); if(result == null) { - Ice.Util.getProcessLogger().warning("mismatched quotes in property " + key - + "'s value, returning default value"); + Util.getProcessLogger().warning("mismatched quotes in property " + key + + "'s value, returning default value"); return val; } else @@ -142,7 +142,7 @@ namespace Ice { if(prefix.Length == 0 || s.StartsWith(prefix, StringComparison.Ordinal)) { - PropertyValue pv = (PropertyValue)_properties[s]; + PropertyValue pv = _properties[s]; pv.used = true; result[s] = pv.val; } @@ -162,13 +162,13 @@ namespace Ice } if(key == null || key.Length == 0) { - throw new Ice.InitializationException("Attempt to set property with empty key"); + throw new InitializationException("Attempt to set property with empty key"); } // // Check if the property is legal. // - Logger logger = Ice.Util.getProcessLogger(); + Logger logger = Util.getProcessLogger(); int dotPos = key.IndexOf('.'); if(dotPos != -1) { @@ -343,7 +343,7 @@ namespace Ice } catch(System.IO.IOException ex) { - Ice.FileException fe = new Ice.FileException(ex); + FileException fe = new FileException(ex); fe.path = file; throw fe; } @@ -420,7 +420,7 @@ namespace Ice } else { - _properties["Ice.ProgramName"] = new PropertyValue(System.AppDomain.CurrentDomain.FriendlyName, true); + _properties["Ice.ProgramName"] = new PropertyValue(AppDomain.CurrentDomain.FriendlyName, true); } bool loadConfigFiles = false; @@ -438,10 +438,10 @@ namespace Ice loadConfigFiles = true; string[] arr = new string[args.Length - 1]; - System.Array.Copy(args, 0, arr, 0, i); + Array.Copy(args, 0, arr, 0, i); if(i < args.Length - 1) { - System.Array.Copy(args, i + 1, arr, i, args.Length - i - 1); + Array.Copy(args, i + 1, arr, i, args.Length - i - 1); } args = arr; } @@ -639,7 +639,7 @@ namespace Ice if((state == ParseStateKey && key.Length != 0) || (state == ParseStateValue && key.Length == 0)) { - Ice.Util.getProcessLogger().warning("invalid config file entry: \"" + line + "\""); + Util.getProcessLogger().warning("invalid config file entry: \"" + line + "\""); return; } else if(key.Length == 0) @@ -655,7 +655,7 @@ namespace Ice string val = getProperty("Ice.Config"); if(val.Length == 0 || val.Equals("1")) { - string s = System.Environment.GetEnvironmentVariable("ICE_CONFIG"); + string s = Environment.GetEnvironmentVariable("ICE_CONFIG"); if(s != null && s.Length != 0) { val = s; |