diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/com/zeroc/Ice/Util.java | 59 |
1 files changed, 52 insertions, 7 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java index 5b66f212ffb..73c087c7faf 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java @@ -128,11 +128,11 @@ public final class Util * @param args A command-line argument vector. Any Ice-related options * in this vector are used to initialize the communicator. * - * @return The new communicator and a filtered argument vector. + * @return The new communicator. **/ public static Communicator initialize(String[] args) { - return initialize(args, null, null); + return initialize(args, (InitializationData)null, null); } /** @@ -144,11 +144,11 @@ public final class Util * @param remainingArgs If non null, the given list will contain on * return the command-line arguments that were not used to set properties. * - * @return The new communicator and a filtered argument vector. + * @return The new communicator. **/ public static Communicator initialize(String[] args, java.util.List<String> remainingArgs) { - return initialize(args, null, remainingArgs); + return initialize(args, (InitializationData)null, remainingArgs); } /** @@ -156,7 +156,7 @@ public final class Util * * @param initData Additional initialization data. * - * @return The new communicator and a filtered argument vector. + * @return The new communicator. **/ public static Communicator initialize(InitializationData initData) { @@ -171,7 +171,7 @@ public final class Util * * @param initData Additional initialization data. * - * @return The new communicator and a filtered argument vector. + * @return The new communicator. **/ public static Communicator initialize(String[] args, InitializationData initData) { @@ -184,13 +184,29 @@ public final class Util * @param args A command-line argument vector. Any Ice-related options * in this vector are used to initialize the communicator. * + * @param configFile Path to a config file that sets the new Communicator's default + * properties. + * + * @return The new communicator. + **/ + public static Communicator initialize(String[] args, String configFile) + { + return initialize(args, configFile, null); + } + + /** + * Creates a communicator. + * + * @param args A command-line argument vector. Any Ice-related options + * in this vector are used to initialize the communicator. + * * @param initData Additional initialization data. Property settings in <code>args</code> * override property settings in <code>initData</code>. * * @param remainingArgs If non null, the given list will contain on * return the command-line arguments that were not used to set properties. * - * @return The new communicator and a filtered argument vector. + * @return The new communicator. * * @see InitializationData **/ @@ -220,6 +236,35 @@ public final class Util } /** + * Creates a communicator. + * + * @param args A command-line argument vector. Any Ice-related options + * in this vector are used to initialize the communicator. + * + * @param configFile Path to a config file that sets the new Communicator's default + * properties. + * + * @param remainingArgs If non null, the given list will contain on + * return the command-line arguments that were not used to set properties. + * + * @return The new communicator. + **/ + public static Communicator initialize(String[] args, + String configFile, + java.util.List<String> remainingArgs) + { + InitializationData initData = null; + if(configFile != null) + { + initData = new InitializationData(); + initData.properties = Util.createProperties(); + initData.properties.load(configFile); + } + + return initialize(args, initData, remainingArgs); + } + + /** * Converts a string to an object identity. * * @param s The string to convert. |