Commit a31ac548 authored by yannick legoc's avatar yannick legoc
Browse files

testing isCommand forgotten in the getInstalledCommands implementation

parent 15fce761
......@@ -120,8 +120,8 @@ public class CorbaControllerManager extends ControllerManager implements ServerC
}
return null;
}
public Map getInstalledControllers() {
private Map getInstalledControllers(boolean testCommand) {
Map<String, Map<String, List<String>>> installedControllers = new TreeMap<String, Map<String, List<String>>>();
......@@ -129,7 +129,13 @@ public class CorbaControllerManager extends ControllerManager implements ServerC
while (it.hasNext()) {
ClientServantDescriptor descriptor = it.next();
if (descriptor.isEnabled() && descriptor.isVisible()) {
boolean testCommandOk = true;
if (testCommand && !descriptor.isCommand()) {
testCommandOk = false;
}
if (testCommandOk && descriptor.isEnabled() && descriptor.isVisible()) {
String family = descriptor.getFamily();
String subfamily = descriptor.getSubfamily();
......@@ -162,8 +168,12 @@ public class CorbaControllerManager extends ControllerManager implements ServerC
}
public Map getInstalledControllers() {
return getInstalledControllers(false);
}
public Map getInstalledCommands() {
return getInstalledControllers();
return getInstalledControllers(true);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment