RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1471: Remove duplicate map for codes in OrderElementTreeController

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-06-27 09:08:45 +02:00
parent fb6430e251
commit bda28676ee
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
View file

@ -356,10 +356,8 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
}
}
private Map<OrderElement, Textbox> orderElementCodeTextboxes = new HashMap<OrderElement, Textbox>();
public Map<OrderElement, Textbox> getOrderElementCodeTextboxes() {
return orderElementCodeTextboxes;
return getRenderer().getCodeTextboxByElement();
}
public class OrderElementTreeitemRenderer extends Renderer {
@ -446,10 +444,6 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
addCell(textBoxCode);
putCodeTextbox(orderElement, textBoxCode);
// FIXME remove this map as it's already in
// org.libreplan.web.tree.TreeController.Renderer.codeTextboxByElement
orderElementCodeTextboxes.put(orderElement, textBoxCode);
}
void addInitDateCell(final OrderElement currentOrderElement) {
@ -517,6 +511,11 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
return editbutton;
}
@Override
public void removeCodeTextbox(OrderElement key) {
super.removeCodeTextbox(key);
}
}
@Override
@ -720,7 +719,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
element.getName()));
} else {
super.remove(element);
orderElementCodeTextboxes.remove(element);
getRenderer().removeCodeTextbox(element);
}
}

8
libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java
View file

@ -605,10 +605,18 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
return nameTextboxByElement.get(key);
}
public Map<T, Textbox> getCodeTextboxByElement() {
return Collections.unmodifiableMap(codeTextboxByElement);
}
protected void putCodeTextbox(T key, Textbox textbox) {
codeTextboxByElement.put(key, textbox);
}
protected void removeCodeTextbox(T key) {
codeTextboxByElement.remove(key);
}
protected void putNameTextbox(T key, Textbox textbox) {
nameTextboxByElement.put(key, textbox);
}