Commit 2d730781 authored by helene ortiz's avatar helene ortiz
Browse files

No commit message

No commit message
parent 18699062
...@@ -65,38 +65,6 @@ public class PropertyManager { ...@@ -65,38 +65,6 @@ public class PropertyManager {
private static final Logger LOGGER = Logger.getLogger(PropertyManager.class.getName()); private static final Logger LOGGER = Logger.getLogger(PropertyManager.class.getName());
private Map<String, Boolean> clientFilesFoundPerControllerType; // Store controller types which client files have already been read private Map<String, Boolean> clientFilesFoundPerControllerType; // Store controller types which client files have already been read
static class CommandBoxKey {
private String serverId;
private int commandBoxId;
public CommandBoxKey(String serverId, int commandBoxId) {
this.serverId = serverId;
this.commandBoxId = commandBoxId;
}
public String toString() {
return serverId + "-" + commandBoxId;
}
public int hashCode() {
return this.toString().hashCode();
}
public boolean equals(Object key) {
if (key == null) {
return false;
}
if (this.getClass() != key.getClass()) {
return false;
}
String content = ((CommandBoxKey)key).toString();
return this.toString().equals(content);
}
}
private PropertyParser propertyParser; private PropertyParser propertyParser;
private Map<Integer, Map<String, Property>> propertyMap = new HashMap<Integer, Map<String, Property>>(NB_CONTROLLERS); // KEY=Servant id VALUE=Map(KEY=propertyName VALUE=Property instance) private Map<Integer, Map<String, Property>> propertyMap = new HashMap<Integer, Map<String, Property>>(NB_CONTROLLERS); // KEY=Servant id VALUE=Map(KEY=propertyName VALUE=Property instance)
...@@ -886,4 +854,36 @@ public class PropertyManager { ...@@ -886,4 +854,36 @@ public class PropertyManager {
public void removePropertyDescriptor(String controllerType) { public void removePropertyDescriptor(String controllerType) {
propertiesByControllerType.remove(controllerType); propertiesByControllerType.remove(controllerType);
} }
static class CommandBoxKey {
private String serverId;
private int commandBoxId;
public CommandBoxKey(String serverId, int commandBoxId) {
this.serverId = serverId;
this.commandBoxId = commandBoxId;
}
public String toString() {
return serverId + "-" + commandBoxId;
}
public int hashCode() {
return this.toString().hashCode();
}
public boolean equals(Object key) {
if (key == null) {
return false;
}
if (this.getClass() != key.getClass()) {
return false;
}
String content = ((CommandBoxKey)key).toString();
return this.toString().equals(content);
}
}
} }
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