summaryrefslogtreecommitdiff
path: root/java/src/Ice/PluginManagerI.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/src/Ice/PluginManagerI.java')
-rw-r--r--java/src/Ice/PluginManagerI.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/java/src/Ice/PluginManagerI.java b/java/src/Ice/PluginManagerI.java
index f76789f4a21..0eb405f7638 100644
--- a/java/src/Ice/PluginManagerI.java
+++ b/java/src/Ice/PluginManagerI.java
@@ -19,12 +19,12 @@ public final class PluginManagerI implements PluginManager
if(_initialized)
{
InitializationException ex = new InitializationException();
- ex.reason = "plugins already initialized";
+ ex.reason = "plug-ins already initialized";
throw ex;
}
//
- // Invoke initialize() on the plugins, in the order they were loaded.
+ // Invoke initialize() on the plug-ins, in the order they were loaded.
//
java.util.List<Plugin> initializedPlugins = new java.util.ArrayList<Plugin>();
try
@@ -40,7 +40,7 @@ public final class PluginManagerI implements PluginManager
catch(RuntimeException ex)
{
//
- // Destroy the plugins that have been successfully initialized, in the
+ // Destroy the plug-ins that have been successfully initialized, in the
// reverse order.
//
java.util.ListIterator<Plugin> i = initializedPlugins.listIterator(initializedPlugins.size());
@@ -135,8 +135,8 @@ public final class PluginManagerI implements PluginManager
// Ice.Plugin.name[.<language>]=entry_point [args]
//
// If the Ice.PluginLoadOrder property is defined, load the
- // specified plugins in the specified order, then load any
- // remaining plugins.
+ // specified plug-ins in the specified order, then load any
+ // remaining plug-ins.
//
final String prefix = "Ice.Plugin.";
Properties properties = _communicator.getProperties();
@@ -148,7 +148,7 @@ public final class PluginManagerI implements PluginManager
if(_plugins.containsKey(loadOrder[i]))
{
PluginInitializationException ex = new PluginInitializationException();
- ex.reason = "plugin `" + loadOrder[i] + "' already loaded";
+ ex.reason = "plug-in `" + loadOrder[i] + "' already loaded";
throw ex;
}
@@ -173,13 +173,13 @@ public final class PluginManagerI implements PluginManager
else
{
PluginInitializationException ex = new PluginInitializationException();
- ex.reason = "plugin `" + loadOrder[i] + "' not defined";
+ ex.reason = "plug-in `" + loadOrder[i] + "' not defined";
throw ex;
}
}
//
- // Load any remaining plugins that weren't specified in PluginLoadOrder.
+ // Load any remaining plug-ins that weren't specified in PluginLoadOrder.
//
while(!plugins.isEmpty())
{
@@ -240,7 +240,7 @@ public final class PluginManagerI implements PluginManager
//
// An application can set Ice.InitPlugins=0 if it wants to postpone
// initialization until after it has interacted directly with the
- // plugins.
+ // plug-ins.
//
if(properties.getPropertyAsIntWithDefault("Ice.InitPlugins", 1) > 0)
{