Avoid where possible to mark a method as throws Exception
FEA: ItEr74S04BugFixing
This commit is contained in:
parent
8671d73a8c
commit
8370d66ebb
112 changed files with 423 additions and 419 deletions
|
|
@ -65,7 +65,7 @@ class CommandContextualized<T> {
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
doAction();
|
doAction();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -511,7 +511,7 @@ public class FunctionalityExposedForExtensions<T> implements IContext<T> {
|
||||||
Button printButton = (Button) printProperties.getFellow("printButton");
|
Button printButton = (Button) printProperties.getFellow("printButton");
|
||||||
printButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
printButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
printProperties.detach();
|
printProperties.detach();
|
||||||
configuration.print(buildParameters(printProperties),planner);
|
configuration.print(buildParameters(printProperties),planner);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ public class LeftTasksTree extends HtmlMacroComponent {
|
||||||
Treeitem item) {
|
Treeitem item) {
|
||||||
item.addEventListener("onOpen", new EventListener() {
|
item.addEventListener("onOpen", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
OpenEvent openEvent = (OpenEvent) event;
|
OpenEvent openEvent = (OpenEvent) event;
|
||||||
taskBean.setExpanded(openEvent.isOpen());
|
taskBean.setExpanded(openEvent.isOpen());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -316,7 +316,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer {
|
||||||
textBox.addEventListener("onCtrlKey", new EventListener() {
|
textBox.addEventListener("onCtrlKey", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
userWantsToMove(textBox, (KeyEvent) event);
|
userWantsToMove(textBox, (KeyEvent) event);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -326,7 +326,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer {
|
||||||
component.addEventListener("onChange", new EventListener() {
|
component.addEventListener("onChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
updateBean(component);
|
updateBean(component);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -336,7 +336,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer {
|
||||||
textBox.addEventListener("onOK", new EventListener() {
|
textBox.addEventListener("onOK", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
userWantsDateBox(textBox);
|
userWantsDateBox(textBox);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -346,7 +346,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer {
|
||||||
datebox.addEventListener("onOK", new EventListener() {
|
datebox.addEventListener("onOK", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
datebox.setOpen(true);
|
datebox.setOpen(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -375,7 +375,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer {
|
||||||
datebox.addEventListener("onBlur", new EventListener() {
|
datebox.addEventListener("onBlur", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
dateBoxHasLostFocus(datebox);
|
dateBoxHasLostFocus(datebox);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -286,7 +286,7 @@ public class Planner extends HtmlMacroComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
ganttPanel.zoomIncrease();
|
ganttPanel.zoomIncrease();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -303,7 +303,7 @@ public class Planner extends HtmlMacroComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
ganttPanel.zoomDecrease();
|
ganttPanel.zoomDecrease();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -497,7 +497,7 @@ public class Planner extends HtmlMacroComponent {
|
||||||
westContainer.addEventListener(Events.ON_SIZE, new EventListener() {
|
westContainer.addEventListener(Events.ON_SIZE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Clients.evalJavaScript("zkTaskContainer.legendResize();");
|
Clients.evalJavaScript("zkTaskContainer.legendResize();");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ public class TabsRegistry {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (_("Limiting resources").equals(t.getName())) {
|
if (_("Limiting resources").equals(t.getName())) {
|
||||||
Executions.sendRedirect("/planner/index.zul;limiting_resources");
|
Executions.sendRedirect("/planner/index.zul;limiting_resources");
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,7 @@ public class TaskList extends XulElement implements AfterCompose {
|
||||||
taskComponent.addEventListener("onDoubleClick", new EventListener() {
|
taskComponent.addEventListener("onDoubleClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
doubleClickCommand.doAction(taskComponent);
|
doubleClickCommand.doAction(taskComponent);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -190,7 +190,7 @@ public class TaskList extends XulElement implements AfterCompose {
|
||||||
taskComponent.addEventListener("onRightClick", new EventListener() {
|
taskComponent.addEventListener("onRightClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
try {
|
try {
|
||||||
getContextMenuFor(taskComponent).open(taskComponent);
|
getContextMenuFor(taskComponent).open(taskComponent);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,7 @@ public class ResourceLoadComponent extends XulElement {
|
||||||
private void addDoubleClickAction(final Div div, final LoadTimeLine loadLine) {
|
private void addDoubleClickAction(final Div div, final LoadTimeLine loadLine) {
|
||||||
div.addEventListener("onDoubleClick", new EventListener() {
|
div.addEventListener("onDoubleClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
schedule(loadLine);
|
schedule(loadLine);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -107,7 +107,7 @@ public class ResourceLoadComponent extends XulElement {
|
||||||
final LoadTimeLine loadLine) {
|
final LoadTimeLine loadLine) {
|
||||||
div.addEventListener("onRightClick", new EventListener() {
|
div.addEventListener("onRightClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
try {
|
try {
|
||||||
getContextMenuFor(divs, div, loadLine).open(div);
|
getContextMenuFor(divs, div, loadLine).open(div);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ MutableTreeModel<LoadTimeLine> modelForTree,
|
||||||
return new TreeitemRenderer() {
|
return new TreeitemRenderer() {
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem item, Object data)
|
public void render(Treeitem item, Object data)
|
||||||
throws Exception {
|
{
|
||||||
LoadTimeLine line = (LoadTimeLine) data;
|
LoadTimeLine line = (LoadTimeLine) data;
|
||||||
item.setOpen(false);
|
item.setOpen(false);
|
||||||
item.setValue(line);
|
item.setValue(line);
|
||||||
|
|
@ -111,7 +111,7 @@ MutableTreeModel<LoadTimeLine> modelForTree,
|
||||||
buttonPlan.setTooltiptext(_("See scheduling"));
|
buttonPlan.setTooltiptext(_("See scheduling"));
|
||||||
buttonPlan.addEventListener("onClick", new EventListener() {
|
buttonPlan.addEventListener("onClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
schedule(taskLine);
|
schedule(taskLine);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -134,7 +134,7 @@ MutableTreeModel<LoadTimeLine> modelForTree,
|
||||||
final LoadTimeLine line) {
|
final LoadTimeLine line) {
|
||||||
item.addEventListener("onOpen", new EventListener() {
|
item.addEventListener("onOpen", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
OpenEvent openEvent = (OpenEvent) event;
|
OpenEvent openEvent = (OpenEvent) event;
|
||||||
if (openEvent.isOpen()) {
|
if (openEvent.isOpen()) {
|
||||||
List<LoadTimeLine> closed = calculatedClosedItems(item);
|
List<LoadTimeLine> closed = calculatedClosedItems(item);
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
|
||||||
new ILongOperation() {
|
new ILongOperation() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
applyFilter();
|
applyFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -252,7 +252,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
|
||||||
Button result = new Button();
|
Button result = new Button();
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
c.doAction();
|
c.doAction();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -506,7 +506,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
|
||||||
new ILongOperation() {
|
new ILongOperation() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
if(paginationType == PaginationType.INTERNAL_PAGINATION) {
|
if(paginationType == PaginationType.INTERNAL_PAGINATION) {
|
||||||
//if the pagination is internal, we are in charge of repainting the graph
|
//if the pagination is internal, we are in charge of repainting the graph
|
||||||
treeModel = createModelForTree();
|
treeModel = createModelForTree();
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ public class TimeTrackedTableWithLeftPane<A, B> {
|
||||||
return new Callable<List<B>>() {
|
return new Callable<List<B>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<B> call() throws Exception {
|
public List<B> call() {
|
||||||
return loadPairOfListsFromCallable().getSecond();
|
return loadPairOfListsFromCallable().getSecond();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -234,7 +234,7 @@ public class TimeTracker {
|
||||||
new ILongOperation() {
|
new ILongOperation() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
invalidatingChangeHappened();
|
invalidatingChangeHappened();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,12 +31,13 @@ public class GanttUtils {
|
||||||
private GanttUtils() {
|
private GanttUtils() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getIntFromStylePosition(String position) throws Exception {
|
public static int getIntFromStylePosition(String position) {
|
||||||
|
|
||||||
String[] tokens = position.split("px");
|
String[] tokens = position.split("px");
|
||||||
|
|
||||||
if (tokens.length != 1) {
|
if (tokens.length != 1) {
|
||||||
throw new Exception("Bad formatting for input parameter");
|
throw new IllegalArgumentException(
|
||||||
|
"Bad formatting for input parameter");
|
||||||
}
|
}
|
||||||
|
|
||||||
return Integer.parseInt(tokens[0]);
|
return Integer.parseInt(tokens[0]);
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ public class LongOperationFeedback {
|
||||||
component.addEventListener(eventName, new EventListener() {
|
component.addEventListener(eventName, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
try {
|
try {
|
||||||
runnable.run();
|
runnable.run();
|
||||||
} finally {
|
} finally {
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ public class MenuBuilder<T extends XulElement> {
|
||||||
result.addEventListener("onOpen", new EventListener() {
|
result.addEventListener("onOpen", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
OpenEvent openEvent = (OpenEvent) event;
|
OpenEvent openEvent = (OpenEvent) event;
|
||||||
referenced = (T) openEvent.getReference();
|
referenced = (T) openEvent.getReference();
|
||||||
}
|
}
|
||||||
|
|
@ -126,7 +126,7 @@ public class MenuBuilder<T extends XulElement> {
|
||||||
Menuitem menuItem = item.createMenuItem();
|
Menuitem menuItem = item.createMenuItem();
|
||||||
menuItem.addEventListener("onClick", new EventListener() {
|
menuItem.addEventListener("onClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
ItemAction<T> action = item.action;
|
ItemAction<T> action = item.action;
|
||||||
action.onEvent(referenced, event);
|
action.onEvent(referenced, event);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -243,8 +243,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<SortedMap<CriterionType, List<Criterion>>> calculateCriterionsMap() {
|
private Callable<SortedMap<CriterionType, List<Criterion>>> calculateCriterionsMap() {
|
||||||
return new Callable<SortedMap<CriterionType, List<Criterion>>>() {
|
return new Callable<SortedMap<CriterionType, List<Criterion>>>() {
|
||||||
@Override
|
@Override
|
||||||
public SortedMap<CriterionType, List<Criterion>> call()
|
public SortedMap<CriterionType, List<Criterion>> call() {
|
||||||
throws Exception {
|
|
||||||
SortedMap<CriterionType, List<Criterion>> result = new TreeMap<CriterionType, List<Criterion>>(
|
SortedMap<CriterionType, List<Criterion>> result = new TreeMap<CriterionType, List<Criterion>>(
|
||||||
getComparatorByName());
|
getComparatorByName());
|
||||||
for (CriterionType criterionType : criterionTypeDAO
|
for (CriterionType criterionType : criterionTypeDAO
|
||||||
|
|
@ -278,7 +277,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<Map<LabelType, List<Label>>> calculateLabelsMap() {
|
private Callable<Map<LabelType, List<Label>>> calculateLabelsMap() {
|
||||||
return new Callable<Map<LabelType,List<Label>>>() {
|
return new Callable<Map<LabelType,List<Label>>>() {
|
||||||
@Override
|
@Override
|
||||||
public Map<LabelType, List<Label>> call() throws Exception {
|
public Map<LabelType, List<Label>> call() {
|
||||||
Map<LabelType, List<Label>> result = new HashMap<LabelType, List<Label>>();
|
Map<LabelType, List<Label>> result = new HashMap<LabelType, List<Label>>();
|
||||||
for (LabelType labelType : labelTypeDAO.getAll()) {
|
for (LabelType labelType : labelTypeDAO.getAll()) {
|
||||||
List<Label> labels = new ArrayList<Label>(
|
List<Label> labels = new ArrayList<Label>(
|
||||||
|
|
@ -297,7 +296,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
return new Callable<List<Worker>>() {
|
return new Callable<List<Worker>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Worker> call() throws Exception {
|
public List<Worker> call() {
|
||||||
return workerDAO.getAll();
|
return workerDAO.getAll();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -309,7 +308,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<CostCategory>> calculateListCostCategories() {
|
private Callable<List<CostCategory>> calculateListCostCategories() {
|
||||||
return new Callable<List<CostCategory>>() {
|
return new Callable<List<CostCategory>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<CostCategory> call() throws Exception {
|
public List<CostCategory> call() {
|
||||||
return costCategoryDAO.findActive();
|
return costCategoryDAO.findActive();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -318,7 +317,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<Criterion>> calculateListCriterion() {
|
private Callable<List<Criterion>> calculateListCriterion() {
|
||||||
return new Callable<List<Criterion>>() {
|
return new Callable<List<Criterion>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<Criterion> call() throws Exception {
|
public List<Criterion> call() {
|
||||||
return criterionDAO.getAll();
|
return criterionDAO.getAll();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -331,7 +330,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
return new Callable<Map<Class<?>, List<Resource>>>() {
|
return new Callable<Map<Class<?>, List<Resource>>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<Class<?>, List<Resource>> call() throws Exception {
|
public Map<Class<?>, List<Resource>> call() {
|
||||||
Map<Class<?>, List<Resource>> result = new HashMap<Class<?>, List<Resource>>();
|
Map<Class<?>, List<Resource>> result = new HashMap<Class<?>, List<Resource>>();
|
||||||
result.put(Worker.class, Resource
|
result.put(Worker.class, Resource
|
||||||
.sortByName(new ArrayList<Resource>(resourceDAO
|
.sortByName(new ArrayList<Resource>(resourceDAO
|
||||||
|
|
@ -354,7 +353,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<ExternalCompany>> calculateExternalCompanies() {
|
private Callable<List<ExternalCompany>> calculateExternalCompanies() {
|
||||||
return new Callable<List<ExternalCompany>>() {
|
return new Callable<List<ExternalCompany>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<ExternalCompany> call() throws Exception {
|
public List<ExternalCompany> call() {
|
||||||
return externalCompanyDAO.getExternalCompaniesAreClient();
|
return externalCompanyDAO.getExternalCompaniesAreClient();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -366,7 +365,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<String>> calculateCustomerReferences() {
|
private Callable<List<String>> calculateCustomerReferences() {
|
||||||
return new Callable<List<String>>() {
|
return new Callable<List<String>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<String> call() throws Exception {
|
public List<String> call() {
|
||||||
// FIXME replace by a HQL query, for god's sake!
|
// FIXME replace by a HQL query, for god's sake!
|
||||||
List<String> result = new ArrayList<String>();
|
List<String> result = new ArrayList<String>();
|
||||||
for (Order order : orderDAO.getOrders()) {
|
for (Order order : orderDAO.getOrders()) {
|
||||||
|
|
@ -383,7 +382,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<String>> calculateOrdersCodes() {
|
private Callable<List<String>> calculateOrdersCodes() {
|
||||||
return new Callable<List<String>>() {
|
return new Callable<List<String>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<String> call() throws Exception {
|
public List<String> call() {
|
||||||
List<String> result = new ArrayList<String>();
|
List<String> result = new ArrayList<String>();
|
||||||
for (Order order : orderDAO.getOrders()) {
|
for (Order order : orderDAO.getOrders()) {
|
||||||
result.add(order.getCode());
|
result.add(order.getCode());
|
||||||
|
|
@ -402,8 +401,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<ResourceLoadChartData> calculateResourceLoadChartData() {
|
private Callable<ResourceLoadChartData> calculateResourceLoadChartData() {
|
||||||
return new Callable<ResourceLoadChartData>() {
|
return new Callable<ResourceLoadChartData>() {
|
||||||
@Override
|
@Override
|
||||||
public ResourceLoadChartData call()
|
public ResourceLoadChartData call() {
|
||||||
throws Exception {
|
|
||||||
|
|
||||||
List<DayAssignment> dayAssignments = dayAssignmentDAO.getAllFor(
|
List<DayAssignment> dayAssignments = dayAssignmentDAO.getAllFor(
|
||||||
scenarioManager.getCurrent(), null, null);
|
scenarioManager.getCurrent(), null, null);
|
||||||
|
|
@ -420,8 +418,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<List<WorkReportLine>> calculateWorkReportLines() {
|
private Callable<List<WorkReportLine>> calculateWorkReportLines() {
|
||||||
return new Callable<List<WorkReportLine>>() {
|
return new Callable<List<WorkReportLine>>() {
|
||||||
@Override
|
@Override
|
||||||
public List<WorkReportLine> call()
|
public List<WorkReportLine> call() {
|
||||||
throws Exception {
|
|
||||||
return workReportLineDAO.list(WorkReportLine.class);
|
return workReportLineDAO.list(WorkReportLine.class);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -436,8 +433,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>> calculateEstimatedCostPerTask() {
|
private Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>> calculateEstimatedCostPerTask() {
|
||||||
return new Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>>() {
|
return new Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>>() {
|
||||||
@Override
|
@Override
|
||||||
public Map<TaskElement, SortedMap<LocalDate, BigDecimal>> call()
|
public Map<TaskElement, SortedMap<LocalDate, BigDecimal>> call() {
|
||||||
throws Exception {
|
|
||||||
Map<TaskElement, SortedMap<LocalDate, BigDecimal>> map =
|
Map<TaskElement, SortedMap<LocalDate, BigDecimal>> map =
|
||||||
new HashMap<TaskElement, SortedMap<LocalDate,BigDecimal>>();
|
new HashMap<TaskElement, SortedMap<LocalDate,BigDecimal>>();
|
||||||
for(TaskElement task : taskElementDAO.list(TaskElement.class)) {
|
for(TaskElement task : taskElementDAO.list(TaskElement.class)) {
|
||||||
|
|
@ -453,8 +449,7 @@ public class PredefinedDatabaseSnapshots {
|
||||||
private Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>> calculateAdvanceCostPerTask() {
|
private Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>> calculateAdvanceCostPerTask() {
|
||||||
return new Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>>() {
|
return new Callable<Map<TaskElement, SortedMap<LocalDate, BigDecimal>>>() {
|
||||||
@Override
|
@Override
|
||||||
public Map<TaskElement, SortedMap<LocalDate, BigDecimal>> call()
|
public Map<TaskElement, SortedMap<LocalDate, BigDecimal>> call() {
|
||||||
throws Exception {
|
|
||||||
Map<TaskElement, SortedMap<LocalDate, BigDecimal>> map =
|
Map<TaskElement, SortedMap<LocalDate, BigDecimal>> map =
|
||||||
new HashMap<TaskElement, SortedMap<LocalDate,BigDecimal>>();
|
new HashMap<TaskElement, SortedMap<LocalDate,BigDecimal>>();
|
||||||
for(TaskElement task : taskElementDAO.list(TaskElement.class)) {
|
for(TaskElement task : taskElementDAO.list(TaskElement.class)) {
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateActiveEntitySequence() throws Exception {
|
public void testCreateActiveEntitySequence() {
|
||||||
try {
|
try {
|
||||||
entitySequenceDAO.save(givenEntitySequence("prefix-"
|
entitySequenceDAO.save(givenEntitySequence("prefix-"
|
||||||
+ UUID.randomUUID(), EntityNameEnum.CALENDAR, true));
|
+ UUID.randomUUID(), EntityNameEnum.CALENDAR, true));
|
||||||
|
|
@ -80,7 +80,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateEntitySequenceWithEmptyPrefix() throws Exception {
|
public void testCreateEntitySequenceWithEmptyPrefix() {
|
||||||
try {
|
try {
|
||||||
entitySequenceDAO.save(givenEntitySequence("",
|
entitySequenceDAO.save(givenEntitySequence("",
|
||||||
EntityNameEnum.CALENDAR, true));
|
EntityNameEnum.CALENDAR, true));
|
||||||
|
|
@ -92,8 +92,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateEntitySequenceWithPrefixWithWhiteSpace()
|
public void testCreateEntitySequenceWithPrefixWithWhiteSpace() {
|
||||||
throws Exception {
|
|
||||||
try {
|
try {
|
||||||
entitySequenceDAO.save(givenEntitySequence(
|
entitySequenceDAO.save(givenEntitySequence(
|
||||||
"prefix with white spaces", EntityNameEnum.CALENDAR, true));
|
"prefix with white spaces", EntityNameEnum.CALENDAR, true));
|
||||||
|
|
@ -105,7 +104,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateEntitySequenceWithEmptyEntityName() throws Exception {
|
public void testCreateEntitySequenceWithEmptyEntityName() {
|
||||||
try {
|
try {
|
||||||
entitySequenceDAO.save(givenEntitySequence("prefix-"
|
entitySequenceDAO.save(givenEntitySequence("prefix-"
|
||||||
+ UUID.randomUUID(), null, false));
|
+ UUID.randomUUID(), null, false));
|
||||||
|
|
@ -117,8 +116,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateEntitySequenceWithNumberOfDigitsNotSpecified()
|
public void testCreateEntitySequenceWithNumberOfDigitsNotSpecified() {
|
||||||
throws Exception {
|
|
||||||
try {
|
try {
|
||||||
EntitySequence entitySequence = givenEntitySequence("prefix-"
|
EntitySequence entitySequence = givenEntitySequence("prefix-"
|
||||||
+ UUID.randomUUID(), EntityNameEnum.CRITERION, true);
|
+ UUID.randomUUID(), EntityNameEnum.CRITERION, true);
|
||||||
|
|
@ -132,8 +130,7 @@ public class EntitySequenceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreateEntitySequenceWithNumberOfDigitsOutRange()
|
public void testCreateEntitySequenceWithNumberOfDigitsOutRange() {
|
||||||
throws Exception {
|
|
||||||
try {
|
try {
|
||||||
EntitySequence entitySequence = givenEntitySequence("prefix-"
|
EntitySequence entitySequence = givenEntitySequence("prefix-"
|
||||||
+ UUID.randomUUID(), EntityNameEnum.CRITERION, true);
|
+ UUID.randomUUID(), EntityNameEnum.CRITERION, true);
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@ import javax.sql.DataSource;
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
import org.dbunit.DatabaseUnitException;
|
||||||
import org.dbunit.database.DatabaseConfig;
|
import org.dbunit.database.DatabaseConfig;
|
||||||
import org.dbunit.database.DatabaseConnection;
|
import org.dbunit.database.DatabaseConnection;
|
||||||
import org.dbunit.database.IDatabaseConnection;
|
import org.dbunit.database.IDatabaseConnection;
|
||||||
|
|
@ -77,7 +78,7 @@ public class DBUnitTestExecutionListener extends
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private DataSource getDataSource(TestContext context) throws Exception {
|
private DataSource getDataSource(TestContext context) {
|
||||||
DataSource dataSource;
|
DataSource dataSource;
|
||||||
Map beans = context.getApplicationContext().getBeansOfType(
|
Map beans = context.getApplicationContext().getBeansOfType(
|
||||||
DataSource.class);
|
DataSource.class);
|
||||||
|
|
@ -94,7 +95,8 @@ public class DBUnitTestExecutionListener extends
|
||||||
}
|
}
|
||||||
|
|
||||||
private IDatabaseConnection getDBUnitConnection(Connection c)
|
private IDatabaseConnection getDBUnitConnection(Connection c)
|
||||||
throws Exception {
|
throws DatabaseUnitException
|
||||||
|
{
|
||||||
IDatabaseConnection conn = new DatabaseConnection(c);
|
IDatabaseConnection conn = new DatabaseConnection(c);
|
||||||
DatabaseConfig config = conn.getConfig();
|
DatabaseConfig config = conn.getConfig();
|
||||||
config.setFeature("http://www.dbunit.org/features/qualifiedTableNames",
|
config.setFeature("http://www.dbunit.org/features/qualifiedTableNames",
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void savingTheOrderSavesAlsoTheAddedAssignments() throws Exception {
|
public void savingTheOrderSavesAlsoTheAddedAssignments()
|
||||||
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order order = createValidOrder();
|
Order order = createValidOrder();
|
||||||
OrderElement orderLine = createValidLeaf("OrderLineA", "1k1k1k1k");
|
OrderElement orderLine = createValidLeaf("OrderLineA", "1k1k1k1k");
|
||||||
|
|
||||||
|
|
@ -188,7 +190,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void addingSeveralAssignmentsOfDifferentTypes() throws Exception {
|
public void addingSeveralAssignmentsOfDifferentTypes()
|
||||||
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order order = createValidOrder();
|
Order order = createValidOrder();
|
||||||
OrderLine orderLine = createValidLeaf("OrderLineA", "1111111");
|
OrderLine orderLine = createValidLeaf("OrderLineA", "1111111");
|
||||||
|
|
||||||
|
|
@ -210,7 +214,8 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void cannotAddDuplicatedAssignment()
|
public void cannotAddDuplicatedAssignment()
|
||||||
throws Exception {
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
OrderLine orderLine = createValidLeaf("OrderLineA", "22222222");
|
OrderLine orderLine = createValidLeaf("OrderLineA", "22222222");
|
||||||
|
|
||||||
AdvanceType advanceTypeA = createAndSaveType("tipoA");
|
AdvanceType advanceTypeA = createAndSaveType("tipoA");
|
||||||
|
|
@ -232,7 +237,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void cannotAddTwoAssignmetsWithGlobalReportValue() throws Exception {
|
public void cannotAddTwoAssignmetsWithGlobalReportValue()
|
||||||
|
throws DuplicateAdvanceAssignmentForOrderElementException,
|
||||||
|
DuplicateValueTrueReportGlobalAdvanceException {
|
||||||
OrderLine orderLine = createValidLeaf("OrderLineA", "101010101");
|
OrderLine orderLine = createValidLeaf("OrderLineA", "101010101");
|
||||||
|
|
||||||
AdvanceType advanceTypeA = createAndSaveType("tipoA");
|
AdvanceType advanceTypeA = createAndSaveType("tipoA");
|
||||||
|
|
@ -255,7 +262,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void addingAssignmentsOfAnotherTypeToSon() throws Exception {
|
public void addingAssignmentsOfAnotherTypeToSon()
|
||||||
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order validOrder = createValidOrder();
|
Order validOrder = createValidOrder();
|
||||||
OrderLineGroup container = OrderLineGroup.create();
|
OrderLineGroup container = OrderLineGroup.create();
|
||||||
validOrder.add(container);
|
validOrder.add(container);
|
||||||
|
|
@ -286,7 +295,8 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void addingAnAdvanceAssignmentIncreasesTheNumberOfAdvanceAssignments()
|
public void addingAnAdvanceAssignmentIncreasesTheNumberOfAdvanceAssignments()
|
||||||
throws Exception {
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order validOrder = createValidOrder();
|
Order validOrder = createValidOrder();
|
||||||
final OrderLineGroup container = OrderLineGroup.create();
|
final OrderLineGroup container = OrderLineGroup.create();
|
||||||
validOrder.add(container);
|
validOrder.add(container);
|
||||||
|
|
@ -306,7 +316,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void cannotAddDuplicatedAssignmentToSon() throws Exception {
|
public void cannotAddDuplicatedAssignmentToSon()
|
||||||
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order validOrder = createValidOrder();
|
Order validOrder = createValidOrder();
|
||||||
final OrderLineGroup father = OrderLineGroup.create();
|
final OrderLineGroup father = OrderLineGroup.create();
|
||||||
validOrder.add(father);
|
validOrder.add(father);
|
||||||
|
|
@ -334,7 +346,9 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void cannotAddDuplicateAssignmentToGrandParent() throws Exception {
|
public void cannotAddDuplicateAssignmentToGrandParent()
|
||||||
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
Order validOrder = createValidOrder();
|
Order validOrder = createValidOrder();
|
||||||
OrderLineGroup parent = OrderLineGroup.create();
|
OrderLineGroup parent = OrderLineGroup.create();
|
||||||
validOrder.add(parent);
|
validOrder.add(parent);
|
||||||
|
|
@ -369,7 +383,8 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
|
|
||||||
@Test(expected = DuplicateAdvanceAssignmentForOrderElementException.class)
|
@Test(expected = DuplicateAdvanceAssignmentForOrderElementException.class)
|
||||||
public void addingAnotherAdvanceAssignmentWithAnEquivalentTypeButDifferentInstance()
|
public void addingAnotherAdvanceAssignmentWithAnEquivalentTypeButDifferentInstance()
|
||||||
throws Exception {
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
|
|
||||||
final Order order = createValidOrder();
|
final Order order = createValidOrder();
|
||||||
final OrderLine line = createValidLeaf("GranSon", "75757");
|
final OrderLine line = createValidLeaf("GranSon", "75757");
|
||||||
|
|
@ -406,7 +421,8 @@ public class AddAdvanceAssignmentsToOrderElementTest {
|
||||||
|
|
||||||
@Test(expected = DuplicateValueTrueReportGlobalAdvanceException.class)
|
@Test(expected = DuplicateValueTrueReportGlobalAdvanceException.class)
|
||||||
public void cannotAddTwoAssignmetsDirectAndIndirectWithGlobalReportValue()
|
public void cannotAddTwoAssignmetsDirectAndIndirectWithGlobalReportValue()
|
||||||
throws Exception {
|
throws DuplicateValueTrueReportGlobalAdvanceException,
|
||||||
|
DuplicateAdvanceAssignmentForOrderElementException {
|
||||||
OrderLineGroup orderLineGroup = OrderLineGroup.create();
|
OrderLineGroup orderLineGroup = OrderLineGroup.create();
|
||||||
orderLineGroup.setName("test");
|
orderLineGroup.setName("test");
|
||||||
orderLineGroup.setCode("1");
|
orderLineGroup.setCode("1");
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ public class OrderTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testAddingOrderElement() throws Exception {
|
public void testAddingOrderElement() {
|
||||||
Order order = Order.create();
|
Order order = Order.create();
|
||||||
order.useSchedulingDataFor(mockedOrderVersion);
|
order.useSchedulingDataFor(mockedOrderVersion);
|
||||||
OrderLineGroup container = OrderLineGroup.create();
|
OrderLineGroup container = OrderLineGroup.create();
|
||||||
|
|
@ -74,7 +74,7 @@ public class OrderTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testPreservesOrder() throws Exception {
|
public void testPreservesOrder() {
|
||||||
OrderLineGroup container = OrderLineGroup.create();
|
OrderLineGroup container = OrderLineGroup.create();
|
||||||
container.useSchedulingDataFor(mockedOrderVersion);
|
container.useSchedulingDataFor(mockedOrderVersion);
|
||||||
OrderLine[] created = new OrderLine[100];
|
OrderLine[] created = new OrderLine[100];
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ public class CriterionsBootstrapTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testBootstrap() throws Exception {
|
public void testBootstrap() {
|
||||||
givenNoSomePredefinedCriterionExists();
|
givenNoSomePredefinedCriterionExists();
|
||||||
criterionsBootstrap.loadRequiredData();
|
criterionsBootstrap.loadRequiredData();
|
||||||
thenAllSomePredefinedCriterionsExist();
|
thenAllSomePredefinedCriterionsExist();
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ public class CriterionDAOTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void afterSavingACriterionItExists() throws Exception {
|
public void afterSavingACriterionItExists() {
|
||||||
givenACriterionWithAnExistentType();
|
givenACriterionWithAnExistentType();
|
||||||
criterionDAO.save(criterion);
|
criterionDAO.save(criterion);
|
||||||
assertTrue(criterionDAO.exists(criterion.getId()));
|
assertTrue(criterionDAO.exists(criterion.getId()));
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ public class CriterionSatisfactionDAOTest {
|
||||||
private IWorkerDAO workerDAO;
|
private IWorkerDAO workerDAO;
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSaveCriterions() throws Exception {
|
public void testSaveCriterions() {
|
||||||
CriterionSatisfaction criterionSatisfaction = createValidCriterionSatisfaction(2007);
|
CriterionSatisfaction criterionSatisfaction = createValidCriterionSatisfaction(2007);
|
||||||
satisfactionDAO.save(criterionSatisfaction);
|
satisfactionDAO.save(criterionSatisfaction);
|
||||||
assertNotNull(criterionSatisfaction.getId());
|
assertNotNull(criterionSatisfaction.getId());
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ public class CriterionTypeDAOTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSaveCriterionType() throws Exception {
|
public void testSaveCriterionType() {
|
||||||
CriterionType criterionType = createValidCriterionType();
|
CriterionType criterionType = createValidCriterionType();
|
||||||
criterionTypeDAO.save(criterionType);
|
criterionTypeDAO.save(criterionType);
|
||||||
assertTrue(criterionTypeDAO.exists(criterionType.getId()));
|
assertTrue(criterionTypeDAO.exists(criterionType.getId()));
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ public class CriterionSatisfactionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void canFinishWhenItStarted() throws Exception {
|
public void canFinishWhenItStarted() {
|
||||||
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Worker worker = Worker.create("firstName", "surName", "2333232");
|
Worker worker = Worker.create("firstName", "surName", "2333232");
|
||||||
LocalDate start = year(2000);
|
LocalDate start = year(2000);
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ import org.navalplanner.business.resources.entities.Worker;
|
||||||
|
|
||||||
public class CriterionTest {
|
public class CriterionTest {
|
||||||
@Test
|
@Test
|
||||||
public void testCreateWithAType() throws Exception {
|
public void testCreateWithAType() {
|
||||||
Criterion firedCriterion = PredefinedCriterionTypes.WORK_RELATIONSHIP
|
Criterion firedCriterion = PredefinedCriterionTypes.WORK_RELATIONSHIP
|
||||||
.createCriterion("fired");
|
.createCriterion("fired");
|
||||||
assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
|
assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
|
||||||
|
|
@ -55,7 +55,7 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCompounding() throws Exception {
|
public void testCompounding() {
|
||||||
Worker worker1 = Worker.create();
|
Worker worker1 = Worker.create();
|
||||||
Worker worker2 = Worker.create();
|
Worker worker2 = Worker.create();
|
||||||
|
|
||||||
|
|
@ -122,12 +122,12 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testEmptyMatchesAll() throws Exception {
|
public void testEmptyMatchesAll() {
|
||||||
assertTrue(build().getResult().isSatisfiedBy(Worker.create()));
|
assertTrue(build().getResult().isSatisfiedBy(Worker.create()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSimpleNegation() throws Exception {
|
public void testSimpleNegation() {
|
||||||
Worker worker1 = Worker.create();
|
Worker worker1 = Worker.create();
|
||||||
Worker worker2 = Worker.create();
|
Worker worker2 = Worker.create();
|
||||||
Worker worker3 = Worker.create();
|
Worker worker3 = Worker.create();
|
||||||
|
|
@ -144,7 +144,7 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testNegateAnd() throws Exception {
|
public void testNegateAnd() {
|
||||||
Worker worker1 = Worker.create();
|
Worker worker1 = Worker.create();
|
||||||
Worker worker2 = Worker.create();
|
Worker worker2 = Worker.create();
|
||||||
Worker worker3 = Worker.create();
|
Worker worker3 = Worker.create();
|
||||||
|
|
@ -157,7 +157,7 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testOr() throws Exception {
|
public void testOr() {
|
||||||
Worker worker1 = Worker.create();
|
Worker worker1 = Worker.create();
|
||||||
Worker worker2 = Worker.create();
|
Worker worker2 = Worker.create();
|
||||||
Worker worker3 = Worker.create();
|
Worker worker3 = Worker.create();
|
||||||
|
|
@ -173,7 +173,7 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testOrHasLessPrecendenceThanAnd() throws Exception {
|
public void testOrHasLessPrecendenceThanAnd() {
|
||||||
Worker worker1 = Worker.create();
|
Worker worker1 = Worker.create();
|
||||||
Worker worker2 = Worker.create();
|
Worker worker2 = Worker.create();
|
||||||
Worker worker3 = Worker.create();
|
Worker worker3 = Worker.create();
|
||||||
|
|
@ -189,7 +189,7 @@ public class CriterionTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCanBeRelatedTo() throws Exception {
|
public void testCanBeRelatedTo() {
|
||||||
assertTrue(PredefinedCriterionTypes.LOCATION_GROUP
|
assertTrue(PredefinedCriterionTypes.LOCATION_GROUP
|
||||||
.criterionCanBeRelatedTo(Worker.class));
|
.criterionCanBeRelatedTo(Worker.class));
|
||||||
assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
|
assertTrue(PredefinedCriterionTypes.WORK_RELATIONSHIP
|
||||||
|
|
|
||||||
|
|
@ -33,18 +33,18 @@ import org.navalplanner.business.test.resources.daos.CriterionSatisfactionDAOTes
|
||||||
public class IntervalTest {
|
public class IntervalTest {
|
||||||
|
|
||||||
@Test(expected = IllegalArgumentException.class)
|
@Test(expected = IllegalArgumentException.class)
|
||||||
public void testStartDateMustBeBeforeThanEndDate() throws Exception {
|
public void testStartDateMustBeBeforeThanEndDate() {
|
||||||
Interval.range(CriterionSatisfactionDAOTest.year(2000),
|
Interval.range(CriterionSatisfactionDAOTest.year(2000),
|
||||||
CriterionSatisfactionDAOTest.year(1999));
|
CriterionSatisfactionDAOTest.year(1999));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = IllegalArgumentException.class)
|
@Test(expected = IllegalArgumentException.class)
|
||||||
public void testStartDateMustBeNotNull() throws Exception {
|
public void testStartDateMustBeNotNull() {
|
||||||
Interval.range(null, CriterionSatisfactionDAOTest.year(1999));
|
Interval.range(null, CriterionSatisfactionDAOTest.year(1999));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void intervalCanBeOpenEnded() throws Exception {
|
public void intervalCanBeOpenEnded() {
|
||||||
Interval.range(CriterionSatisfactionDAOTest.year(1990), null);
|
Interval.range(CriterionSatisfactionDAOTest.year(1990), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,7 +68,7 @@ public class IntervalTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testPointsOnlyContainsThemselves() throws Exception {
|
public void testPointsOnlyContainsThemselves() {
|
||||||
Interval point = Interval
|
Interval point = Interval
|
||||||
.point(CriterionSatisfactionDAOTest.year(1990));
|
.point(CriterionSatisfactionDAOTest.year(1990));
|
||||||
assertTrue(point.contains(CriterionSatisfactionDAOTest.year(1990)));
|
assertTrue(point.contains(CriterionSatisfactionDAOTest.year(1990)));
|
||||||
|
|
@ -77,7 +77,7 @@ public class IntervalTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testIntervalsAreStartInclusiveAndEndExclusive()
|
public void testIntervalsAreStartInclusiveAndEndExclusive()
|
||||||
throws Exception {
|
{
|
||||||
Interval range = Interval.range(year(1990), year(2000));
|
Interval range = Interval.range(year(1990), year(2000));
|
||||||
assertTrue(range.contains(year(1990)));
|
assertTrue(range.contains(year(1990)));
|
||||||
assertFalse(range.contains(year(2000)));
|
assertFalse(range.contains(year(2000)));
|
||||||
|
|
@ -86,7 +86,7 @@ public class IntervalTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testIncludes() throws Exception {
|
public void testIncludes() {
|
||||||
Interval bigRange = Interval.range(year(1990), year(2000));
|
Interval bigRange = Interval.range(year(1990), year(2000));
|
||||||
Interval included = Interval.range(year(1990), year(1998));
|
Interval included = Interval.range(year(1990), year(1998));
|
||||||
Interval point = Interval.point(year(1996));
|
Interval point = Interval.point(year(1996));
|
||||||
|
|
@ -96,7 +96,7 @@ public class IntervalTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testStartPointDoesntOverlapsWithRange() throws Exception {
|
public void testStartPointDoesntOverlapsWithRange() {
|
||||||
Interval range = Interval.range(year(1990), year(2005));
|
Interval range = Interval.range(year(1990), year(2005));
|
||||||
Interval openEndedRange = Interval.from(year(1990));
|
Interval openEndedRange = Interval.from(year(1990));
|
||||||
Interval point = Interval.point(year(1990));
|
Interval point = Interval.point(year(1990));
|
||||||
|
|
@ -136,7 +136,7 @@ public class IntervalTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testIntervalFinishingAtTheStartOfOtherDontOverlap()
|
public void testIntervalFinishingAtTheStartOfOtherDontOverlap()
|
||||||
throws Exception {
|
{
|
||||||
Interval range = Interval.range(year(2000), year(2005));
|
Interval range = Interval.range(year(2000), year(2005));
|
||||||
Interval from = Interval.from(year(2000));
|
Interval from = Interval.from(year(2000));
|
||||||
Interval before = Interval.range(year(1995), year(2000));
|
Interval before = Interval.range(year(1995), year(2000));
|
||||||
|
|
@ -159,7 +159,7 @@ public class IntervalTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testCreatingPointWithRange() throws Exception {
|
public void testCreatingPointWithRange() {
|
||||||
Interval point = Interval.point(year(1990));
|
Interval point = Interval.point(year(1990));
|
||||||
Interval range = Interval.range(year(1990), year(1990));
|
Interval range = Interval.range(year(1990), year(1990));
|
||||||
assertEquals(point, range);
|
assertEquals(point, range);
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ public class ResourceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testRetrieveActiveCriterionsForCriterionType() throws Exception {
|
public void testRetrieveActiveCriterionsForCriterionType() {
|
||||||
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
||||||
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
||||||
|
|
@ -136,7 +136,7 @@ public class ResourceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testActiveCriterions() throws Exception {
|
public void testActiveCriterions() {
|
||||||
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
final Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
||||||
ICriterionType<Criterion> type = createTypeThatMatches(criterion,
|
ICriterionType<Criterion> type = createTypeThatMatches(criterion,
|
||||||
|
|
@ -196,7 +196,7 @@ public class ResourceTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testRetrieveSatisfactionsInIntervalForCriterionType()
|
public void testRetrieveSatisfactionsInIntervalForCriterionType()
|
||||||
throws Exception {
|
{
|
||||||
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
||||||
CriterionWithItsType criterionWithItsType = new CriterionWithItsType(
|
CriterionWithItsType criterionWithItsType = new CriterionWithItsType(
|
||||||
|
|
@ -226,7 +226,7 @@ public class ResourceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(expected = IllegalArgumentException.class)
|
@Test(expected = IllegalArgumentException.class)
|
||||||
public void invalidadCriterionWithItsTypeNotAllowd() throws Exception {
|
public void invalidadCriterionWithItsTypeNotAllowd() {
|
||||||
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
||||||
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
ICriterionType<Criterion> criterionType = createTypeThatMatches(criterion);
|
||||||
|
|
@ -272,7 +272,7 @@ public class ResourceTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testAddAtDate() throws Exception {
|
public void testAddAtDate() {
|
||||||
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
|
||||||
Worker worker = Worker.create("firstName", "surName", "2333232");
|
Worker worker = Worker.create("firstName", "surName", "2333232");
|
||||||
|
|
@ -441,7 +441,7 @@ public class ResourceTest {
|
||||||
criterionType, criterion), intervalE));
|
criterionType, criterion), intervalE));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testAddCriterionSatisfaction() throws Exception {
|
public void testAddCriterionSatisfaction() {
|
||||||
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
Criterion criterion = CriterionDAOTest.createValidCriterion();
|
||||||
Worker worker = Worker.create("firstName", "surName", "2333232");
|
Worker worker = Worker.create("firstName", "surName", "2333232");
|
||||||
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
|
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
|
||||||
|
|
|
||||||
|
|
@ -285,7 +285,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
|
||||||
return new RowRenderer() {
|
return new RowRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
final AdvanceType advanceType = (AdvanceType) data;
|
final AdvanceType advanceType = (AdvanceType) data;
|
||||||
appendLabelName(row, advanceType);
|
appendLabelName(row, advanceType);
|
||||||
appendCheckboxEnabled(row, advanceType);
|
appendCheckboxEnabled(row, advanceType);
|
||||||
|
|
@ -293,7 +293,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
|
||||||
appendOperations(row, advanceType);
|
appendOperations(row, advanceType);
|
||||||
row.addEventListener(Events.ON_CLICK, new EventListener() {
|
row.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(advanceType);
|
goToEditForm(advanceType);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -324,7 +324,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
|
||||||
hbox.appendChild(Util.createEditButton(new EventListener() {
|
hbox.appendChild(Util.createEditButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(advanceType);
|
goToEditForm(advanceType);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
@ -333,7 +333,7 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
|
||||||
.createRemoveButton(new EventListener() {
|
.createRemoveButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(advanceType);
|
confirmRemove(advanceType);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -280,7 +280,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
||||||
public class BaseCalendarsTreeitemRenderer implements TreeitemRenderer {
|
public class BaseCalendarsTreeitemRenderer implements TreeitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem item, Object data) throws Exception {
|
public void render(Treeitem item, Object data) {
|
||||||
SimpleTreeNode simpleTreeNode = (SimpleTreeNode) data;
|
SimpleTreeNode simpleTreeNode = (SimpleTreeNode) data;
|
||||||
final BaseCalendar baseCalendar = (BaseCalendar) simpleTreeNode
|
final BaseCalendar baseCalendar = (BaseCalendar) simpleTreeNode
|
||||||
.getData();
|
.getData();
|
||||||
|
|
@ -305,7 +305,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToCreateDerivedForm(baseCalendar);
|
goToCreateDerivedForm(baseCalendar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -321,7 +321,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToCreateCopyForm(baseCalendar);
|
goToCreateCopyForm(baseCalendar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -337,7 +337,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
||||||
editButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
editButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(baseCalendar);
|
goToEditForm(baseCalendar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -353,7 +353,7 @@ public class BaseCalendarCRUDController extends GenericForwardComposer {
|
||||||
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(baseCalendar);
|
confirmRemove(baseCalendar);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -233,7 +233,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
exceptionTypes.addEventListener(Events.ON_SELECT, new EventListener() {
|
exceptionTypes.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Comboitem selectedItem = getSelectedItem((SelectEvent) event);
|
Comboitem selectedItem = getSelectedItem((SelectEvent) event);
|
||||||
if (selectedItem != null) {
|
if (selectedItem != null) {
|
||||||
updateWithCapacityFrom(getValue(selectedItem));
|
updateWithCapacityFrom(getValue(selectedItem));
|
||||||
|
|
@ -301,7 +301,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
parentCalendars.addEventListener(Events.ON_SELECT, new EventListener() {
|
parentCalendars.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
BaseCalendar selected = (BaseCalendar) parentCalendars
|
BaseCalendar selected = (BaseCalendar) parentCalendars
|
||||||
.getSelectedItem().getValue();
|
.getSelectedItem().getValue();
|
||||||
baseCalendarModel.setParent(selected);
|
baseCalendarModel.setParent(selected);
|
||||||
|
|
@ -341,7 +341,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
public class HoursPerDayRenderer implements ListitemRenderer {
|
public class HoursPerDayRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
final Days day = (Days) data;
|
final Days day = (Days) data;
|
||||||
|
|
||||||
addLabelCell(item, day);
|
addLabelCell(item, day);
|
||||||
|
|
@ -396,7 +396,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
reloadCurrentWindow();
|
reloadCurrentWindow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -710,7 +710,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
public class HistoryVersionsRenderer implements ListitemRenderer {
|
public class HistoryVersionsRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
CalendarData calendarData = (CalendarData) data;
|
CalendarData calendarData = (CalendarData) data;
|
||||||
item.setValue(calendarData);
|
item.setValue(calendarData);
|
||||||
|
|
||||||
|
|
@ -786,7 +786,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
baseCalendarModel.removeCalendarData(calendarData);
|
baseCalendarModel.removeCalendarData(calendarData);
|
||||||
reloadCurrentWindow();
|
reloadCurrentWindow();
|
||||||
}
|
}
|
||||||
|
|
@ -814,7 +814,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
private void addEventListener(Listitem item) {
|
private void addEventListener(Listitem item) {
|
||||||
item.addEventListener(Events.ON_CLICK, new EventListener() {
|
item.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Listitem item = (Listitem) event.getTarget();
|
Listitem item = (Listitem) event.getTarget();
|
||||||
CalendarData calendarData = (CalendarData) item.getValue();
|
CalendarData calendarData = (CalendarData) item.getValue();
|
||||||
|
|
||||||
|
|
@ -928,7 +928,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
public class CalendarExceptionRenderer implements ListitemRenderer {
|
public class CalendarExceptionRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
CalendarException calendarException = (CalendarException) data;
|
CalendarException calendarException = (CalendarException) data;
|
||||||
item.setValue(calendarException);
|
item.setValue(calendarException);
|
||||||
|
|
||||||
|
|
@ -1044,7 +1044,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
baseCalendarModel
|
baseCalendarModel
|
||||||
.removeException(calendarException
|
.removeException(calendarException
|
||||||
.getDate());
|
.getDate());
|
||||||
|
|
@ -1144,7 +1144,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
public class CalendarAvailabilityRenderer implements ListitemRenderer {
|
public class CalendarAvailabilityRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
CalendarAvailability calendarAvailability = (CalendarAvailability) data;
|
CalendarAvailability calendarAvailability = (CalendarAvailability) data;
|
||||||
item.setValue(calendarAvailability);
|
item.setValue(calendarAvailability);
|
||||||
|
|
||||||
|
|
@ -1295,7 +1295,7 @@ public abstract class BaseCalendarEditionController extends
|
||||||
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
_("Delete"), "/common/img/ico_borrar.png", "icono",
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
baseCalendarModel
|
baseCalendarModel
|
||||||
.removeCalendarAvailability(calendarAvailability);
|
.removeCalendarAvailability(calendarAvailability);
|
||||||
reloadDayInformation();
|
reloadDayInformation();
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
defaultCalendarBandboxSearch.setListboxEventListener(Events.ON_SELECT,
|
defaultCalendarBandboxSearch.setListboxEventListener(Events.ON_SELECT,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Listitem selectedItem = (Listitem) ((SelectEvent) event)
|
Listitem selectedItem = (Listitem) ((SelectEvent) event)
|
||||||
.getSelectedItems().iterator().next();
|
.getSelectedItems().iterator().next();
|
||||||
setDefaultCalendar((BaseCalendar) selectedItem
|
setDefaultCalendar((BaseCalendar) selectedItem
|
||||||
|
|
@ -131,7 +131,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
lbTypeProgress.addEventListener(Events.ON_SELECT, new EventListener() {
|
lbTypeProgress.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Listitem selectedItem = getSelectedItem((SelectEvent) event);
|
Listitem selectedItem = getSelectedItem((SelectEvent) event);
|
||||||
if (selectedItem != null) {
|
if (selectedItem != null) {
|
||||||
ProgressType progressType = (ProgressType) selectedItem.getValue();
|
ProgressType progressType = (ProgressType) selectedItem.getValue();
|
||||||
|
|
@ -447,7 +447,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
private static class ProgressTypeRenderer implements ListitemRenderer {
|
private static class ProgressTypeRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
ProgressType progressType = (ProgressType) data;
|
ProgressType progressType = (ProgressType) data;
|
||||||
item.setLabel(_(progressType.getValue()));
|
item.setLabel(_(progressType.getValue()));
|
||||||
}
|
}
|
||||||
|
|
@ -456,7 +456,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
|
|
||||||
public class EntitySequenceGroupRenderer implements RowRenderer {
|
public class EntitySequenceGroupRenderer implements RowRenderer {
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
|
|
||||||
EntitySequence entitySequence = (EntitySequence) data;
|
EntitySequence entitySequence = (EntitySequence) data;
|
||||||
final EntityNameEnum entityName = entitySequence.getEntityName();
|
final EntityNameEnum entityName = entitySequence.getEntityName();
|
||||||
|
|
@ -472,7 +472,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
.getSequenceLiteral())));
|
.getSequenceLiteral())));
|
||||||
group.addEventListener(Events.ON_OPEN, new EventListener() {
|
group.addEventListener(Events.ON_OPEN, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
onOpenGroup(entityName, group.isOpen());
|
onOpenGroup(entityName, group.isOpen());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -607,7 +607,7 @@ public class ConfigurationController extends GenericForwardComposer {
|
||||||
.createRemoveButton(new EventListener() {
|
.createRemoveButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (isLastOne(entitySequence)) {
|
if (isLastOne(entitySequence)) {
|
||||||
showMessageNotDelete();
|
showMessageNotDelete();
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ import org.zkoss.zul.ListitemRenderer;
|
||||||
public class EnumsListitemRenderer implements ListitemRenderer {
|
public class EnumsListitemRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
item.appendChild(new Listcell(_(data.toString())));
|
item.appendChild(new Listcell(_(data.toString())));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ public class MessagesForUser extends GenericForwardComposer implements
|
||||||
messageEntry.addEventListener(DETACH_EVENT_NAME, new EventListener() {
|
messageEntry.addEventListener(DETACH_EVENT_NAME, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
pendingToDetach.offer(new ComponentHolderTimestamped(
|
pendingToDetach.offer(new ComponentHolderTimestamped(
|
||||||
messageEntry));
|
messageEntry));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ public class OnTabSelection {
|
||||||
tabBox.addEventListener(Events.ON_SELECT, new EventListener() {
|
tabBox.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
SelectEvent e = (SelectEvent) event;
|
SelectEvent e = (SelectEvent) event;
|
||||||
for (Object each : e.getSelectedItems()) {
|
for (Object each : e.getSelectedItems()) {
|
||||||
if (tabs.get(each) != null) {
|
if (tabs.get(each) != null) {
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ public class Util {
|
||||||
textBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
textBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
InputEvent newInput = (InputEvent) event;
|
InputEvent newInput = (InputEvent) event;
|
||||||
String value = newInput.getValue();
|
String value = newInput.getValue();
|
||||||
setter.set(value);
|
setter.set(value);
|
||||||
|
|
@ -205,7 +205,7 @@ public class Util {
|
||||||
comboBox.addEventListener("onSelect", new EventListener() {
|
comboBox.addEventListener("onSelect", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(comboBox.getSelectedItem());
|
setter.set(comboBox.getSelectedItem());
|
||||||
comboBox.setSelectedItem(getter.get());
|
comboBox.setSelectedItem(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -247,7 +247,7 @@ public class Util {
|
||||||
intBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
intBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
InputEvent newInput = (InputEvent) event;
|
InputEvent newInput = (InputEvent) event;
|
||||||
String value = newInput.getValue().trim();
|
String value = newInput.getValue().trim();
|
||||||
if (value.isEmpty()) {
|
if (value.isEmpty()) {
|
||||||
|
|
@ -294,7 +294,7 @@ public class Util {
|
||||||
dateBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
dateBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(dateBox.getValue());
|
setter.set(dateBox.getValue());
|
||||||
dateBox.setValue(getter.get());
|
dateBox.setValue(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -336,7 +336,7 @@ public class Util {
|
||||||
timeBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
timeBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(timeBox.getValue());
|
setter.set(timeBox.getValue());
|
||||||
timeBox.setValue(getter.get());
|
timeBox.setValue(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -380,7 +380,7 @@ public class Util {
|
||||||
decimalBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
decimalBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(decimalBox.getValue());
|
setter.set(decimalBox.getValue());
|
||||||
decimalBox.setValue(getter.get());
|
decimalBox.setValue(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -423,7 +423,7 @@ public class Util {
|
||||||
checkBox.addEventListener(Events.ON_CHECK, new EventListener() {
|
checkBox.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(checkBox.isChecked());
|
setter.set(checkBox.isChecked());
|
||||||
checkBox.setChecked(getter.get());
|
checkBox.setChecked(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -466,7 +466,7 @@ public class Util {
|
||||||
radio.addEventListener(Events.ON_CHECK, new EventListener() {
|
radio.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setter.set(radio.isSelected());
|
setter.set(radio.isSelected());
|
||||||
radio.setChecked(getter.get());
|
radio.setChecked(getter.get());
|
||||||
}
|
}
|
||||||
|
|
@ -510,7 +510,7 @@ public class Util {
|
||||||
bandBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
bandBox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
InputEvent newInput = (InputEvent) event;
|
InputEvent newInput = (InputEvent) event;
|
||||||
String value = newInput.getValue();
|
String value = newInput.getValue();
|
||||||
setter.set(value);
|
setter.set(value);
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ public class ViewSwitcher implements Composer {
|
||||||
private boolean isInPlanningOrder = false;
|
private boolean isInPlanningOrder = false;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
|
public void doAfterCompose(org.zkoss.zk.ui.Component comp) {
|
||||||
this.parent = comp;
|
this.parent = comp;
|
||||||
isInPlanningOrder = true;
|
isInPlanningOrder = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ public class Autocomplete extends Combobox {
|
||||||
autocomplete.addEventListener("onChange", new EventListener() {
|
autocomplete.addEventListener("onChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
String text = autocomplete.getValue();
|
String text = autocomplete.getValue();
|
||||||
Object object = getItemByText(text);
|
Object object = getItemByText(text);
|
||||||
autocomplete.setSelectedItem(object);
|
autocomplete.setSelectedItem(object);
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ public class EffortDurationPicker extends Hbox {
|
||||||
Spinner... spinners) {
|
Spinner... spinners) {
|
||||||
EventListener listener = new EventListener() {
|
EventListener listener = new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
notifySetterOfChange(setter);
|
notifySetterOfChange(setter);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ public class NewDataSortableGrid extends Grid implements AfterCompose {
|
||||||
public NewDataSortableGrid() {
|
public NewDataSortableGrid() {
|
||||||
addEventListener(Events.ON_SORT, new EventListener() {
|
addEventListener(Events.ON_SORT, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
sortByLastColumn();
|
sortByLastColumn();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
|
||||||
listbox.addEventListener(Events.ON_CLICK, new EventListener() {
|
listbox.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
pickElementFromListAndCloseBandbox();
|
pickElementFromListAndCloseBandbox();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
listbox.addEventListener(Events.ON_OK, new EventListener() {
|
listbox.addEventListener(Events.ON_OK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
pickElementFromListAndCloseBandbox();
|
pickElementFromListAndCloseBandbox();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -116,7 +116,7 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
|
||||||
bandbox.addEventListener("onChanging", new EventListener() {
|
bandbox.addEventListener("onChanging", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final String inputText = ((InputEvent) event).getValue();
|
final String inputText = ((InputEvent) event).getValue();
|
||||||
if ((inputText == null) || (inputText.isEmpty())) {
|
if ((inputText == null) || (inputText.isEmpty())) {
|
||||||
clear();
|
clear();
|
||||||
|
|
@ -130,7 +130,7 @@ public class BandboxMultipleSearch extends HtmlMacroComponent {
|
||||||
bandbox.addEventListener(Events.ON_CTRL_KEY, new EventListener() {
|
bandbox.addEventListener(Events.ON_CTRL_KEY, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
List<Listitem> items = listbox.getItems();
|
List<Listitem> items = listbox.getItems();
|
||||||
if (!items.isEmpty()) {
|
if (!items.isEmpty()) {
|
||||||
listbox.setSelectedIndex(0);
|
listbox.setSelectedIndex(0);
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ public class BandboxSearch extends HtmlMacroComponent {
|
||||||
bandbox.addEventListener("onChanging", new EventListener() {
|
bandbox.addEventListener("onChanging", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
clearSelectedElement();
|
clearSelectedElement();
|
||||||
final String inputText = ((InputEvent) event).getValue();
|
final String inputText = ((InputEvent) event).getValue();
|
||||||
listbox.setModel(getSubModel(inputText));
|
listbox.setModel(getSubModel(inputText));
|
||||||
|
|
@ -106,7 +106,7 @@ public class BandboxSearch extends HtmlMacroComponent {
|
||||||
bandbox.addEventListener(Events.ON_CTRL_KEY, new EventListener() {
|
bandbox.addEventListener(Events.ON_CTRL_KEY, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
int selectedItemIndex = listbox.getSelectedIndex();
|
int selectedItemIndex = listbox.getSelectedIndex();
|
||||||
if (selectedItemIndex != -1) {
|
if (selectedItemIndex != -1) {
|
||||||
listbox.getItemAtIndexApi(selectedItemIndex).setFocus(true);
|
listbox.getItemAtIndexApi(selectedItemIndex).setFocus(true);
|
||||||
|
|
@ -127,7 +127,7 @@ public class BandboxSearch extends HtmlMacroComponent {
|
||||||
listbox.addEventListener(Events.ON_SELECT, new EventListener() {
|
listbox.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
pickElementFromList();
|
pickElementFromList();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -136,14 +136,14 @@ public class BandboxSearch extends HtmlMacroComponent {
|
||||||
listbox.addEventListener(Events.ON_CLICK, new EventListener() {
|
listbox.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
listbox.addEventListener(Events.ON_OK, new EventListener() {
|
listbox.addEventListener(Events.ON_OK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
pickElementFromList();
|
pickElementFromList();
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ public abstract class BandboxFinder implements IBandboxFinder {
|
||||||
private final ListitemRenderer _defRend = new ListitemRenderer() {
|
private final ListitemRenderer _defRend = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
item.setLabel(objectToString(data));
|
item.setLabel(objectToString(data));
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ public class BaseCalendarBandboxFinder extends BandboxFinder implements IBandbox
|
||||||
private final ListitemRenderer baseCalendarRenderer = new ListitemRenderer() {
|
private final ListitemRenderer baseCalendarRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
BaseCalendar baseCalendar = (BaseCalendar) data;
|
BaseCalendar baseCalendar = (BaseCalendar) data;
|
||||||
item.setValue(baseCalendar);
|
item.setValue(baseCalendar);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin
|
||||||
private final ListitemRenderer orderRenderer = new ListitemRenderer() {
|
private final ListitemRenderer orderRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Criterion criterion = (Criterion)data;
|
Criterion criterion = (Criterion)data;
|
||||||
item.setValue(criterion);
|
item.setValue(criterion);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ public class ExternalCompanyBandboxFinder extends BandboxFinder implements
|
||||||
private final ListitemRenderer externalCompanyRenderer = new ListitemRenderer() {
|
private final ListitemRenderer externalCompanyRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
ExternalCompany externalCompany = (ExternalCompany) data;
|
ExternalCompany externalCompany = (ExternalCompany) data;
|
||||||
|
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ public abstract class Finder implements IFinder {
|
||||||
private class ComboWorkerRenderer implements ComboitemRenderer {
|
private class ComboWorkerRenderer implements ComboitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Comboitem item, Object data) throws Exception {
|
public void render(Comboitem item, Object data) {
|
||||||
item.setLabel(_toString(data));
|
item.setLabel(_toString(data));
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ public class LabelBandboxFinder extends BandboxFinder implements IBandboxFinder
|
||||||
private final ListitemRenderer labelRenderer = new ListitemRenderer() {
|
private final ListitemRenderer labelRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Label label = (Label) data;
|
Label label = (Label) data;
|
||||||
|
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,7 @@ public abstract class MultipleFiltersFinder implements IMultipleFiltersFinder {
|
||||||
private final ListitemRenderer filterPairRenderer = new ListitemRenderer() {
|
private final ListitemRenderer filterPairRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
FilterPair filterPair = (FilterPair) data;
|
FilterPair filterPair = (FilterPair) data;
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder
|
||||||
private final ListitemRenderer orderRenderer = new ListitemRenderer() {
|
private final ListitemRenderer orderRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Order order = (Order) data;
|
Order order = (Order) data;
|
||||||
item.setValue(order);
|
item.setValue(order);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ public class OrderElementBandboxFinder extends BandboxFinder implements IBandbox
|
||||||
private final ListitemRenderer orderElementRenderer = new ListitemRenderer() {
|
private final ListitemRenderer orderElementRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
OrderElement orderElement = (OrderElement) data;
|
OrderElement orderElement = (OrderElement) data;
|
||||||
item.setValue(orderElement);
|
item.setValue(orderElement);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ public class QualityFormBandboxFinder extends BandboxFinder implements
|
||||||
private final ListitemRenderer qualityFormRenderer = new ListitemRenderer() {
|
private final ListitemRenderer qualityFormRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
QualityForm qualityForm = (QualityForm) data;
|
QualityForm qualityForm = (QualityForm) data;
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ public class ScenarioBandboxFinder extends BandboxFinder implements IBandboxFind
|
||||||
private final ListitemRenderer scenarioRenderer = new ListitemRenderer() {
|
private final ListitemRenderer scenarioRenderer = new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Scenario scenario = (Scenario) data;
|
Scenario scenario = (Scenario) data;
|
||||||
item.setValue(scenario);
|
item.setValue(scenario);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ public abstract class TemplateFinder<T extends OrderElementTemplate> extends
|
||||||
return new ListitemRenderer() {
|
return new ListitemRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
T template = type.cast(data);
|
T template = type.cast(data);
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
generateColumnsForRenderer(item, template);
|
generateColumnsForRenderer(item, template);
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,7 @@ public class EntryPointsHandler<T> {
|
||||||
page.addEventListener("onBookmarkChange", new EventListener() {
|
page.addEventListener("onBookmarkChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
BookmarkEvent bookmarkEvent = (BookmarkEvent) event;
|
BookmarkEvent bookmarkEvent = (BookmarkEvent) event;
|
||||||
String bookmark = bookmarkEvent.getBookmark();
|
String bookmark = bookmarkEvent.getBookmark();
|
||||||
applyIfMatches(controller, bookmark);
|
applyIfMatches(controller, bookmark);
|
||||||
|
|
|
||||||
|
|
@ -114,7 +114,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
|
||||||
listCostCategories.addEventListener("onInitRender", new EventListener() {
|
listCostCategories.addEventListener("onInitRender", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
listCostCategories.renderAll();
|
listCostCategories.renderAll();
|
||||||
|
|
||||||
final Rows rows = listCostCategories.getRows();
|
final Rows rows = listCostCategories.getRows();
|
||||||
|
|
@ -320,7 +320,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
|
||||||
lbHoursType.addEventListener(Events.ON_SELECT, new EventListener() {
|
lbHoursType.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Listitem item = lbHoursType.getSelectedItem();
|
Listitem item = lbHoursType.getSelectedItem();
|
||||||
if (item != null) {
|
if (item != null) {
|
||||||
setHoursType((HourCost) row.getValue(), item);
|
setHoursType((HourCost) row.getValue(), item);
|
||||||
|
|
@ -362,7 +362,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
|
||||||
delete.setTooltiptext(_("Delete"));
|
delete.setTooltiptext(_("Delete"));
|
||||||
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove((HourCost) row.getValue());
|
confirmRemove((HourCost) row.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -422,7 +422,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
|
||||||
initDateBox.addEventListener("onChange", new EventListener() {
|
initDateBox.addEventListener("onChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
// Updates the constraint of the endDate box with the new date
|
// Updates the constraint of the endDate box with the new date
|
||||||
LocalDate initDate = ((HourCost)row.getValue()).getInitDate();
|
LocalDate initDate = ((HourCost)row.getValue()).getInitDate();
|
||||||
Datebox endDateBox = (Datebox) row.getChildren().get(4);
|
Datebox endDateBox = (Datebox) row.getChildren().get(4);
|
||||||
|
|
@ -602,7 +602,7 @@ public class CostCategoryCRUDController extends GenericForwardComposer
|
||||||
public class HourCostListRenderer implements RowRenderer {
|
public class HourCostListRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
HourCost hourCost = (HourCost) data;
|
HourCost hourCost = (HourCost) data;
|
||||||
|
|
||||||
row.setValue(hourCost);
|
row.setValue(hourCost);
|
||||||
|
|
|
||||||
|
|
@ -123,7 +123,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
|
||||||
autocomplete.addEventListener("onSelect", new EventListener() {
|
autocomplete.addEventListener("onSelect", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final Comboitem comboitem = autocomplete.getSelectedItem();
|
final Comboitem comboitem = autocomplete.getSelectedItem();
|
||||||
|
|
||||||
if(comboitem != null) {
|
if(comboitem != null) {
|
||||||
|
|
@ -163,7 +163,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
|
||||||
delete.setTooltiptext(_("Delete"));
|
delete.setTooltiptext(_("Delete"));
|
||||||
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove((ResourcesCostCategoryAssignment) row.getValue());
|
confirmRemove((ResourcesCostCategoryAssignment) row.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -184,7 +184,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
|
||||||
initDateBox.addEventListener("onChange", new EventListener() {
|
initDateBox.addEventListener("onChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
// Updates the constraint of the endDate box with the new date
|
// Updates the constraint of the endDate box with the new date
|
||||||
LocalDate initDate = ((ResourcesCostCategoryAssignment)row.getValue()).getInitDate();
|
LocalDate initDate = ((ResourcesCostCategoryAssignment)row.getValue()).getInitDate();
|
||||||
Datebox endDateBox = (Datebox) row.getChildren().get(2);
|
Datebox endDateBox = (Datebox) row.getChildren().get(2);
|
||||||
|
|
@ -297,7 +297,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
|
||||||
public class CostCategoryAssignmentRenderer implements RowRenderer {
|
public class CostCategoryAssignmentRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
ResourcesCostCategoryAssignment assignment =
|
ResourcesCostCategoryAssignment assignment =
|
||||||
(ResourcesCostCategoryAssignment) data;
|
(ResourcesCostCategoryAssignment) data;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
|
||||||
gridLabels.addEventListener("onInitRender", new EventListener() {
|
gridLabels.addEventListener("onInitRender", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
gridLabels.renderAll();
|
gridLabels.renderAll();
|
||||||
|
|
||||||
final Rows rows = gridLabels.getRows();
|
final Rows rows = gridLabels.getRows();
|
||||||
|
|
@ -141,7 +141,7 @@ public class LabelTypeCRUDController extends GenericForwardComposer {
|
||||||
gridLabelTypes.addEventListener("onInitRender", new EventListener() {
|
gridLabelTypes.addEventListener("onInitRender", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
gridLabelTypes.renderAll();
|
gridLabelTypes.renderAll();
|
||||||
|
|
||||||
final Rows rows = gridLabelTypes.getRows();
|
final Rows rows = gridLabelTypes.getRows();
|
||||||
|
|
|
||||||
|
|
@ -415,7 +415,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
|
||||||
private class LimitingResourceQueueElementsRenderer implements RowRenderer {
|
private class LimitingResourceQueueElementsRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
LimitingResourceQueueElementDTO element = (LimitingResourceQueueElementDTO) data;
|
LimitingResourceQueueElementDTO element = (LimitingResourceQueueElementDTO) data;
|
||||||
|
|
||||||
row.setValue(data);
|
row.setValue(data);
|
||||||
|
|
@ -446,7 +446,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
LimitingResourceQueueElement queueElement = element.getOriginal();
|
LimitingResourceQueueElement queueElement = element.getOriginal();
|
||||||
|
|
||||||
editResourceAllocation(queueElement);
|
editResourceAllocation(queueElement);
|
||||||
|
|
@ -465,7 +465,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
showManualAllocationWindow(element.getOriginal());
|
showManualAllocationWindow(element.getOriginal());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -480,7 +480,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
removeUnassignedLimitingResourceQueueElement(element);
|
removeUnassignedLimitingResourceQueueElement(element);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -504,7 +504,7 @@ public class LimitingResourcesController extends GenericForwardComposer {
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
assignLimitingResourceQueueElement(element);
|
assignLimitingResourceQueueElement(element);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ public class LimitingResourcesLeftPane extends HtmlMacroComponent {
|
||||||
return new TreeitemRenderer() {
|
return new TreeitemRenderer() {
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem item, Object data)
|
public void render(Treeitem item, Object data)
|
||||||
throws Exception {
|
{
|
||||||
LimitingResourceQueue line = (LimitingResourceQueue) data;
|
LimitingResourceQueue line = (LimitingResourceQueue) data;
|
||||||
item.setOpen(false);
|
item.setOpen(false);
|
||||||
item.setValue(line);
|
item.setValue(line);
|
||||||
|
|
|
||||||
|
|
@ -213,7 +213,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent {
|
||||||
Button result = new Button();
|
Button result = new Button();
|
||||||
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
result.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
c.doAction();
|
c.doAction();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ public class ManualAllocationController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
|
public void doAfterCompose(org.zkoss.zk.ui.Component comp) {
|
||||||
this.self = comp;
|
this.self = comp;
|
||||||
self.setVariable("manualAllocationController", this, true);
|
self.setVariable("manualAllocationController", this, true);
|
||||||
listAssignableQueues = (Listbox) self.getFellowIfAny("listAssignableQueues");
|
listAssignableQueues = (Listbox) self.getFellowIfAny("listAssignableQueues");
|
||||||
|
|
@ -234,7 +234,7 @@ public class ManualAllocationController extends GenericForwardComposer {
|
||||||
listAssignableQueues.addEventListener(Events.ON_SELECT, new EventListener() {
|
listAssignableQueues.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
SelectEvent se = (SelectEvent) event;
|
SelectEvent se = (SelectEvent) event;
|
||||||
|
|
||||||
LimitingResourceQueue queue = getSelectedQueue(se);
|
LimitingResourceQueue queue = getSelectedQueue(se);
|
||||||
|
|
@ -476,7 +476,7 @@ public class ManualAllocationController extends GenericForwardComposer {
|
||||||
private static class CandidateGapRenderer implements ListitemRenderer {
|
private static class CandidateGapRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Gap gap = (Gap) data;
|
Gap gap = (Gap) data;
|
||||||
|
|
||||||
item.setValue(gap);
|
item.setValue(gap);
|
||||||
|
|
@ -532,7 +532,7 @@ public class ManualAllocationController extends GenericForwardComposer {
|
||||||
private static class QueueRenderer implements ListitemRenderer {
|
private static class QueueRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
final LimitingResourceQueue queue = (LimitingResourceQueue) data;
|
final LimitingResourceQueue queue = (LimitingResourceQueue) data;
|
||||||
item.setValue(queue);
|
item.setValue(queue);
|
||||||
// item.setLabel("test1");
|
// item.setLabel("test1");
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ public class QueueTask extends Div {
|
||||||
final String taskUid = this.getUuid();
|
final String taskUid = this.getUuid();
|
||||||
this.addEventListener(Events.ON_CLICK, new EventListener() {
|
this.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Clients
|
Clients
|
||||||
.evalJavaScript("zkLimitingDependencies.toggleDependenciesForQueueElement('"
|
.evalJavaScript("zkLimitingDependencies.toggleDependenciesForQueueElement('"
|
||||||
+ taskUid + "')");
|
+ taskUid + "')");
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ public class MaterialsController extends
|
||||||
gridMaterials.addEventListener("onInitRender", new EventListener() {
|
gridMaterials.addEventListener("onInitRender", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
gridMaterials.renderAll();
|
gridMaterials.renderAll();
|
||||||
|
|
||||||
final Rows rows = gridMaterials.getRows();
|
final Rows rows = gridMaterials.getRows();
|
||||||
|
|
@ -177,21 +177,21 @@ public class MaterialsController extends
|
||||||
* Copied verbatim from org.zkoss.zul.Tree;
|
* Copied verbatim from org.zkoss.zul.Tree;
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem ti, Object node) throws Exception {
|
public void render(Treeitem ti, Object node) {
|
||||||
final MaterialCategory materialCategory = (MaterialCategory) node;
|
final MaterialCategory materialCategory = (MaterialCategory) node;
|
||||||
|
|
||||||
final Textbox tb = new Textbox(materialCategory.getName());
|
final Textbox tb = new Textbox(materialCategory.getName());
|
||||||
tb.setWidth("90%");
|
tb.setWidth("90%");
|
||||||
tb.addEventListener("onChange", new EventListener() {
|
tb.addEventListener("onChange", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final InputEvent ie = (InputEvent) event;
|
final InputEvent ie = (InputEvent) event;
|
||||||
materialCategory.setName(ie.getValue());
|
materialCategory.setName(ie.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
tb.addEventListener("onFocus", new EventListener() {
|
tb.addEventListener("onFocus", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
((Treeitem)tb.getParent().getParent().getParent()).setSelected(true);
|
((Treeitem)tb.getParent().getParent().getParent()).setSelected(true);
|
||||||
refreshMaterials();
|
refreshMaterials();
|
||||||
}
|
}
|
||||||
|
|
@ -216,14 +216,14 @@ public class MaterialsController extends
|
||||||
codeTb.setDisabled(materialCategory.isCodeAutogenerated());
|
codeTb.setDisabled(materialCategory.isCodeAutogenerated());
|
||||||
codeTb.addEventListener("onChange", new EventListener() {
|
codeTb.addEventListener("onChange", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final InputEvent ie = (InputEvent) event;
|
final InputEvent ie = (InputEvent) event;
|
||||||
materialCategory.setCode(ie.getValue());
|
materialCategory.setCode(ie.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
codeTb.addEventListener("onFocus", new EventListener() {
|
codeTb.addEventListener("onFocus", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
((Treeitem)codeTb.getParent().getParent().getParent()).setSelected(true);
|
((Treeitem)codeTb.getParent().getParent().getParent()).setSelected(true);
|
||||||
refreshMaterials();
|
refreshMaterials();
|
||||||
}
|
}
|
||||||
|
|
@ -236,7 +236,7 @@ public class MaterialsController extends
|
||||||
cb.setChecked(materialCategory.isCodeAutogenerated());
|
cb.setChecked(materialCategory.isCodeAutogenerated());
|
||||||
cb.addEventListener("onCheck", new EventListener() {
|
cb.addEventListener("onCheck", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final CheckEvent ce = (CheckEvent) event;
|
final CheckEvent ce = (CheckEvent) event;
|
||||||
materialCategory.setCodeAutogenerated(ce.isChecked());
|
materialCategory.setCodeAutogenerated(ce.isChecked());
|
||||||
if (ce.isChecked()) {
|
if (ce.isChecked()) {
|
||||||
|
|
@ -271,7 +271,7 @@ public class MaterialsController extends
|
||||||
btnDelete.setTooltiptext(_("Delete"));
|
btnDelete.setTooltiptext(_("Delete"));
|
||||||
btnDelete.addEventListener(Events.ON_CLICK, new EventListener() {
|
btnDelete.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(materialCategory);
|
confirmRemove(materialCategory);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -537,7 +537,7 @@ public class MaterialsController extends
|
||||||
*/
|
*/
|
||||||
public static class UnitTypeListRenderer implements ListitemRenderer {
|
public static class UnitTypeListRenderer implements ListitemRenderer {
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem listItem, Object data) throws Exception {
|
public void render(Listitem listItem, Object data) {
|
||||||
final UnitType unitType = (UnitType) data;
|
final UnitType unitType = (UnitType) data;
|
||||||
listItem.setValue(unitType);
|
listItem.setValue(unitType);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,14 +95,14 @@ public class UnitTypeController extends GenericForwardComposer {
|
||||||
|
|
||||||
return new RowRenderer() {
|
return new RowRenderer() {
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
final UnitType unitType = (UnitType) data;
|
final UnitType unitType = (UnitType) data;
|
||||||
|
|
||||||
appendUnitTypeName(row, unitType);
|
appendUnitTypeName(row, unitType);
|
||||||
appendOperations(row, unitType);
|
appendOperations(row, unitType);
|
||||||
row.addEventListener(Events.ON_CLICK, new EventListener() {
|
row.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditFormInEditionMode(unitType);
|
goToEditFormInEditionMode(unitType);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -118,7 +118,7 @@ public class UnitTypeController extends GenericForwardComposer {
|
||||||
hbox.appendChild(Util.createEditButton(new EventListener() {
|
hbox.appendChild(Util.createEditButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditFormInEditionMode(unitType);
|
goToEditFormInEditionMode(unitType);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
@ -126,7 +126,7 @@ public class UnitTypeController extends GenericForwardComposer {
|
||||||
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(unitType);
|
confirmRemove(unitType);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
@ -184,8 +184,7 @@ public class UnitTypeController extends GenericForwardComposer {
|
||||||
return new Constraint() {
|
return new Constraint() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void validate(Component comp, Object value)
|
public void validate(Component comp, Object value) {
|
||||||
throws WrongValueException {
|
|
||||||
String strValue = (String) value;
|
String strValue = (String) value;
|
||||||
if (StringUtils.isBlank(strValue)) {
|
if (StringUtils.isBlank(strValue)) {
|
||||||
throw new WrongValueException(comp,
|
throw new WrongValueException(comp,
|
||||||
|
|
@ -207,8 +206,7 @@ public class UnitTypeController extends GenericForwardComposer {
|
||||||
return new Constraint() {
|
return new Constraint() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void validate(Component comp, Object value)
|
public void validate(Component comp, Object value) {
|
||||||
throws WrongValueException {
|
|
||||||
String strValue = (String) value;
|
String strValue = (String) value;
|
||||||
if (StringUtils.isBlank(strValue)) {
|
if (StringUtils.isBlank(strValue)) {
|
||||||
throw new WrongValueException(comp,
|
throw new WrongValueException(comp,
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ public class MonteCarloController extends GenericForwardComposer {
|
||||||
lbCriticalPaths.addEventListener(Events.ON_SELECT, new EventListener() {
|
lbCriticalPaths.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
reloadGridCritialPathTasks();
|
reloadGridCritialPathTasks();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,7 +113,7 @@ public class MonteCarloController extends GenericForwardComposer {
|
||||||
btnRunMonteCarlo.addEventListener(Events.ON_CLICK, new EventListener() {
|
btnRunMonteCarlo.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
validateRowsPercentages();
|
validateRowsPercentages();
|
||||||
IBackGroundOperation<IDesktopUpdate> operation = new IBackGroundOperation<IDesktopUpdate>() {
|
IBackGroundOperation<IDesktopUpdate> operation = new IBackGroundOperation<IDesktopUpdate>() {
|
||||||
|
|
||||||
|
|
@ -306,7 +306,7 @@ public class MonteCarloController extends GenericForwardComposer {
|
||||||
private static class CriticalPathTasksRender implements RowRenderer {
|
private static class CriticalPathTasksRender implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
row.setValue(data);
|
row.setValue(data);
|
||||||
|
|
||||||
MonteCarloTask task = (MonteCarloTask) data;
|
MonteCarloTask task = (MonteCarloTask) data;
|
||||||
|
|
|
||||||
|
|
@ -269,7 +269,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
|
||||||
public class TaskQualityFormsRowRenderer implements RowRenderer {
|
public class TaskQualityFormsRowRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
TaskQualityForm taskQualityForm = (TaskQualityForm) data;
|
TaskQualityForm taskQualityForm = (TaskQualityForm) data;
|
||||||
row.setValue(taskQualityForm);
|
row.setValue(taskQualityForm);
|
||||||
|
|
||||||
|
|
@ -406,7 +406,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
|
||||||
|
|
||||||
buttonRemove.addEventListener(Events.ON_CLICK, new EventListener() {
|
buttonRemove.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove((TaskQualityForm) row.getValue());
|
confirmRemove((TaskQualityForm) row.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -419,7 +419,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
|
||||||
public class TaskQualityFormItemsRowRenderer implements RowRenderer {
|
public class TaskQualityFormItemsRowRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
TaskQualityFormItem item = (TaskQualityFormItem) data;
|
TaskQualityFormItem item = (TaskQualityFormItem) data;
|
||||||
row.setValue(item);
|
row.setValue(item);
|
||||||
|
|
||||||
|
|
@ -490,7 +490,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
|
||||||
if (!taskQualityForm.isByItems()) {
|
if (!taskQualityForm.isByItems()) {
|
||||||
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
assignedTaskQualityFormsToOrderElementModel
|
assignedTaskQualityFormsToOrderElementModel
|
||||||
.updatePassedTaskQualityFormItems(taskQualityForm);
|
.updatePassedTaskQualityFormItems(taskQualityForm);
|
||||||
Grid gridItems = row.getGrid();
|
Grid gridItems = row.getGrid();
|
||||||
|
|
|
||||||
|
|
@ -149,7 +149,7 @@ public class DynamicDatebox extends GenericForwardComposer {
|
||||||
component.addEventListener("onChange", new EventListener() {
|
component.addEventListener("onChange", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
updateBean();
|
updateBean();
|
||||||
updateComponents();
|
updateComponents();
|
||||||
}
|
}
|
||||||
|
|
@ -160,7 +160,7 @@ public class DynamicDatebox extends GenericForwardComposer {
|
||||||
textBox.addEventListener("onOK", new EventListener() {
|
textBox.addEventListener("onOK", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
userWantsDateBox(textBox);
|
userWantsDateBox(textBox);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -170,7 +170,7 @@ public class DynamicDatebox extends GenericForwardComposer {
|
||||||
currentDatebox.addEventListener("onOK", new EventListener() {
|
currentDatebox.addEventListener("onOK", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
currentDatebox.setOpen(true);
|
currentDatebox.setOpen(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -180,7 +180,7 @@ public class DynamicDatebox extends GenericForwardComposer {
|
||||||
currentDatebox.addEventListener("onBlur", new EventListener() {
|
currentDatebox.addEventListener("onBlur", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
dateBoxHasLostFocus(currentDatebox);
|
dateBoxHasLostFocus(currentDatebox);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -356,7 +356,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
|
|
||||||
public class AdvanceTypeListRenderer implements ListitemRenderer {
|
public class AdvanceTypeListRenderer implements ListitemRenderer {
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem listItem, Object data) throws Exception {
|
public void render(Listitem listItem, Object data) {
|
||||||
final AdvanceAssignment advance = (AdvanceAssignment) data;
|
final AdvanceAssignment advance = (AdvanceAssignment) data;
|
||||||
listItem.setValue(advance);
|
listItem.setValue(advance);
|
||||||
listItem.setDraggable("true");
|
listItem.setDraggable("true");
|
||||||
|
|
@ -414,7 +414,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
comboAdvanceTypes.addEventListener(Events.ON_SELECT,
|
comboAdvanceTypes.addEventListener(Events.ON_SELECT,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
setMaxValue(listItem, comboAdvanceTypes);
|
setMaxValue(listItem, comboAdvanceTypes);
|
||||||
cleanFields(advance);
|
cleanFields(advance);
|
||||||
setPercentage();
|
setPercentage();
|
||||||
|
|
@ -495,7 +495,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
maxValue.addEventListener(Events.ON_CHANGE,
|
maxValue.addEventListener(Events.ON_CHANGE,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (manageOrderElementAdvancesModel
|
if (manageOrderElementAdvancesModel
|
||||||
.hasConsolidatedAdvances(advanceAssignment)) {
|
.hasConsolidatedAdvances(advanceAssignment)) {
|
||||||
showMessagesConsolidation(1);
|
showMessagesConsolidation(1);
|
||||||
|
|
@ -653,7 +653,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
chartCheckbox.setChecked(selectedAdvances.contains(advance));
|
chartCheckbox.setChecked(selectedAdvances.contains(advance));
|
||||||
chartCheckbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
chartCheckbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (chartCheckbox.isChecked()) {
|
if (chartCheckbox.isChecked()) {
|
||||||
selectedAdvances.add(advance);
|
selectedAdvances.add(advance);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -686,7 +686,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
addMeasurementButton.addEventListener(Events.ON_CLICK,
|
addMeasurementButton.addEventListener(Events.ON_CLICK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (!listItem.equals(editAdvances.getSelectedItem())) {
|
if (!listItem.equals(editAdvances.getSelectedItem())) {
|
||||||
selectAdvanceLine(listItem);
|
selectAdvanceLine(listItem);
|
||||||
}
|
}
|
||||||
|
|
@ -716,7 +716,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
|
|
||||||
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToRemoveLineAdvanceAssignment(listItem);
|
goToRemoveLineAdvanceAssignment(listItem);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -1024,7 +1024,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
private class AdvanceMeasurementRenderer implements ListitemRenderer {
|
private class AdvanceMeasurementRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
AdvanceMeasurement advanceMeasurement = (AdvanceMeasurement) data;
|
AdvanceMeasurement advanceMeasurement = (AdvanceMeasurement) data;
|
||||||
|
|
||||||
item.setValue(advanceMeasurement);
|
item.setValue(advanceMeasurement);
|
||||||
|
|
@ -1048,7 +1048,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
value.addEventListener(Events.ON_CHANGE, new EventListener() {
|
value.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (manageOrderElementAdvancesModel
|
if (manageOrderElementAdvancesModel
|
||||||
.canRemoveOrChange(advanceMeasurement)) {
|
.canRemoveOrChange(advanceMeasurement)) {
|
||||||
updatesValue(value);
|
updatesValue(value);
|
||||||
|
|
@ -1104,7 +1104,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
date.addEventListener(Events.ON_CHANGE, new EventListener() {
|
date.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (manageOrderElementAdvancesModel
|
if (manageOrderElementAdvancesModel
|
||||||
.canRemoveOrChange(advanceMeasurement)) {
|
.canRemoveOrChange(advanceMeasurement)) {
|
||||||
validateMeasurementDate(date, date.getValue());
|
validateMeasurementDate(date, date.getValue());
|
||||||
|
|
@ -1180,7 +1180,7 @@ public class ManageOrderElementAdvancesController extends
|
||||||
|
|
||||||
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
removeButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToRemoveLineAdvanceMeasurement(listItem);
|
goToRemoveLineAdvanceMeasurement(listItem);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -332,7 +332,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
schedulingMode.addEventListener(Events.ON_SELECT,
|
schedulingMode.addEventListener(Events.ON_SELECT,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
SchedulingMode chosen = (SchedulingMode) schedulingMode
|
SchedulingMode chosen = (SchedulingMode) schedulingMode
|
||||||
.getSelectedItem().getValue();
|
.getSelectedItem().getValue();
|
||||||
if (chosen != null) {
|
if (chosen != null) {
|
||||||
|
|
@ -372,7 +372,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
.getFellow("listOrderStatus");
|
.getFellow("listOrderStatus");
|
||||||
listOrderStatus.addEventListener(Events.ON_SELECT, new EventListener() {
|
listOrderStatus.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
updateDisabilitiesOnInterface();
|
updateDisabilitiesOnInterface();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -416,7 +416,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
tree.setModel(orderElementTreeController.getTreeModel());
|
tree.setModel(orderElementTreeController.getTreeModel());
|
||||||
tree.addEventListener(Events.ON_SELECT, new EventListener() {
|
tree.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
//undo the work done by this event
|
//undo the work done by this event
|
||||||
//to be able to control it from the ON_CLICK event
|
//to be able to control it from the ON_CLICK event
|
||||||
tree.clearSelection();
|
tree.clearSelection();
|
||||||
|
|
@ -454,7 +454,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private AssignedHoursToOrderElementController assignedHoursController;
|
private AssignedHoursToOrderElementController assignedHoursController;
|
||||||
|
|
||||||
public void setupAssignedHoursToOrderElementController() throws Exception {
|
public void setupAssignedHoursToOrderElementController() {
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -473,7 +473,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
|
private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
|
||||||
|
|
||||||
public void setupManageOrderElementAdvancesController() throws Exception {
|
public void setupManageOrderElementAdvancesController() {
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -495,8 +495,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private AssignedLabelsToOrderElementController assignedLabelsController;
|
private AssignedLabelsToOrderElementController assignedLabelsController;
|
||||||
|
|
||||||
public void setupAssignedLabelsToOrderElementController()
|
public void setupAssignedLabelsToOrderElementController() {
|
||||||
throws Exception {
|
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -514,8 +513,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private AssignedCriterionRequirementToOrderElementController assignedCriterionRequirementController;
|
private AssignedCriterionRequirementToOrderElementController assignedCriterionRequirementController;
|
||||||
|
|
||||||
public void setupAssignedCriterionRequirementsToOrderElementController()
|
public void setupAssignedCriterionRequirementsToOrderElementController() {
|
||||||
throws Exception {
|
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -537,8 +535,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private AssignedMaterialsToOrderElementController assignedMaterialsController;
|
private AssignedMaterialsToOrderElementController assignedMaterialsController;
|
||||||
|
|
||||||
public void setupAssignedMaterialsToOrderElementController()
|
public void setupAssignedMaterialsToOrderElementController() {
|
||||||
throws Exception {
|
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -557,7 +554,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
|
|
||||||
private AssignedTaskQualityFormsToOrderElementController assignedTaskQualityFormController;
|
private AssignedTaskQualityFormsToOrderElementController assignedTaskQualityFormController;
|
||||||
|
|
||||||
public void setupAssignedTaskQualityFormsToOrderElementController() throws Exception {
|
public void setupAssignedTaskQualityFormsToOrderElementController() {
|
||||||
if (!confirmLastTab()) {
|
if (!confirmLastTab()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -995,7 +992,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
bdExternalCompanies.setListboxEventListener(
|
bdExternalCompanies.setListboxEventListener(
|
||||||
Events.ON_SELECT, new EventListener() {
|
Events.ON_SELECT, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final Object object = bdExternalCompanies
|
final Object object = bdExternalCompanies
|
||||||
.getSelectedElement();
|
.getSelectedElement();
|
||||||
orderModel.setExternalCompany((ExternalCompany) object);
|
orderModel.setExternalCompany((ExternalCompany) object);
|
||||||
|
|
@ -1004,7 +1001,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
bdExternalCompanies.setListboxEventListener(Events.ON_OK,
|
bdExternalCompanies.setListboxEventListener(Events.ON_OK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final Object object = bdExternalCompanies
|
final Object object = bdExternalCompanies
|
||||||
.getSelectedElement();
|
.getSelectedElement();
|
||||||
orderModel.setExternalCompany((ExternalCompany) object);
|
orderModel.setExternalCompany((ExternalCompany) object);
|
||||||
|
|
@ -1128,7 +1125,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Comboitem item, Object data) throws Exception {
|
public void render(Comboitem item, Object data) {
|
||||||
BaseCalendar calendar = (BaseCalendar) data;
|
BaseCalendar calendar = (BaseCalendar) data;
|
||||||
item.setLabel(calendar.getName());
|
item.setLabel(calendar.getName());
|
||||||
item.setValue(calendar);
|
item.setValue(calendar);
|
||||||
|
|
@ -1181,7 +1178,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
public class OrdersRowRenderer implements RowRenderer {
|
public class OrdersRowRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
|
|
||||||
final Order order = (Order) data;
|
final Order order = (Order) data;
|
||||||
row.setValue(order);
|
row.setValue(order);
|
||||||
|
|
@ -1199,7 +1196,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
row.setTooltiptext(getTooltipText(order));
|
row.setTooltiptext(getTooltipText(order));
|
||||||
row.addEventListener("onClick", new EventListener() {
|
row.addEventListener("onClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(order);
|
goToEditForm(order);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -1252,7 +1249,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
buttonEdit.setTooltiptext(_("Edit"));
|
buttonEdit.setTooltiptext(_("Edit"));
|
||||||
buttonEdit.addEventListener("onClick",new EventListener() {
|
buttonEdit.addEventListener("onClick",new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(order);
|
goToEditForm(order);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -1268,7 +1265,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
buttonDelete.setTooltiptext(_("Delete"));
|
buttonDelete.setTooltiptext(_("Delete"));
|
||||||
buttonDelete.addEventListener("onClick",new EventListener() {
|
buttonDelete.addEventListener("onClick",new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(order);
|
confirmRemove(order);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -1284,7 +1281,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
buttonPlan.setTooltiptext(_("See scheduling"));
|
buttonPlan.setTooltiptext(_("See scheduling"));
|
||||||
buttonPlan.addEventListener("onClick",new EventListener() {
|
buttonPlan.addEventListener("onClick",new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
schedule(order);
|
schedule(order);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -1299,7 +1296,7 @@ public class OrderCRUDController extends GenericForwardComposer {
|
||||||
buttonDerived.setTooltiptext(_("Create Template"));
|
buttonDerived.setTooltiptext(_("Create Template"));
|
||||||
buttonDerived.addEventListener("onClick", new EventListener() {
|
buttonDerived.addEventListener("onClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
createTemplate(order);
|
createTemplate(order);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
setupDetailsOrderElementController();
|
setupDetailsOrderElementController();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupDetailsOrderElementController() throws Exception {
|
private void setupDetailsOrderElementController() {
|
||||||
detailsController = (DetailsOrderElementController)
|
detailsController = (DetailsOrderElementController)
|
||||||
orderElementDetails.getVariable("detailsController", true);
|
orderElementDetails.getVariable("detailsController", true);
|
||||||
}
|
}
|
||||||
|
|
@ -102,7 +102,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
Util.reloadBindings(comp);
|
Util.reloadBindings(comp);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupAssignedHoursToOrderElementController() throws Exception {
|
public void setupAssignedHoursToOrderElementController() {
|
||||||
if (assignedHoursToOrderElementController == null) {
|
if (assignedHoursToOrderElementController == null) {
|
||||||
assignedHoursToOrderElementController = (AssignedHoursToOrderElementController) orderElementHours
|
assignedHoursToOrderElementController = (AssignedHoursToOrderElementController) orderElementHours
|
||||||
.getVariable("assignedHoursToOrderElementController", true);
|
.getVariable("assignedHoursToOrderElementController", true);
|
||||||
|
|
@ -122,7 +122,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupManageOrderElementAdvancesController()
|
public void setupManageOrderElementAdvancesController()
|
||||||
throws Exception {
|
{
|
||||||
if (manageOrderElementAdvancesController == null) {
|
if (manageOrderElementAdvancesController == null) {
|
||||||
manageOrderElementAdvancesController = (ManageOrderElementAdvancesController) orderElementAdvances
|
manageOrderElementAdvancesController = (ManageOrderElementAdvancesController) orderElementAdvances
|
||||||
.getVariable("manageOrderElementAdvancesController", true);
|
.getVariable("manageOrderElementAdvancesController", true);
|
||||||
|
|
@ -135,7 +135,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupAssignedLabelsToOrderElementController()throws Exception {
|
public void setupAssignedLabelsToOrderElementController(){
|
||||||
if (assignedLabelsController == null) {
|
if (assignedLabelsController == null) {
|
||||||
assignedLabelsController = orderElementLabels.getController();
|
assignedLabelsController = orderElementLabels.getController();
|
||||||
assignedLabelsController.openWindow(orderElementModel);
|
assignedLabelsController.openWindow(orderElementModel);
|
||||||
|
|
@ -145,7 +145,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupAssignedCriterionRequirementToOrderElementController()
|
public void setupAssignedCriterionRequirementToOrderElementController()
|
||||||
throws Exception {
|
{
|
||||||
if (assignedCriterionRequirementController == null) {
|
if (assignedCriterionRequirementController == null) {
|
||||||
assignedCriterionRequirementController = (AssignedCriterionRequirementToOrderElementController) orderElementCriterionRequirements
|
assignedCriterionRequirementController = (AssignedCriterionRequirementToOrderElementController) orderElementCriterionRequirements
|
||||||
.getVariable("assignedCriterionRequirementController", true);
|
.getVariable("assignedCriterionRequirementController", true);
|
||||||
|
|
@ -157,7 +157,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupAssignedMaterialsToOrderElementController()
|
public void setupAssignedMaterialsToOrderElementController()
|
||||||
throws Exception {
|
{
|
||||||
if (assignedMaterialsController == null) {
|
if (assignedMaterialsController == null) {
|
||||||
assignedMaterialsController = orderElementMaterials.getController();
|
assignedMaterialsController = orderElementMaterials.getController();
|
||||||
assignedMaterialsController.openWindow(getOrderElement());
|
assignedMaterialsController.openWindow(getOrderElement());
|
||||||
|
|
@ -167,7 +167,7 @@ public class OrderElementController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setupAssignedTaskQualityFormsToOrderElementController()
|
public void setupAssignedTaskQualityFormsToOrderElementController()
|
||||||
throws Exception {
|
{
|
||||||
if (assignedTaskQualityFormsController == null) {
|
if (assignedTaskQualityFormsController == null) {
|
||||||
assignedTaskQualityFormsController = (AssignedTaskQualityFormsToOrderElementController) orderElementTaskQualityForms
|
assignedTaskQualityFormsController = (AssignedTaskQualityFormsToOrderElementController) orderElementTaskQualityForms
|
||||||
.getVariable("assignedTaskQualityFormsController", true);
|
.getVariable("assignedTaskQualityFormsController", true);
|
||||||
|
|
|
||||||
|
|
@ -282,7 +282,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
|
||||||
expandAllButton.setImage("/common/img/ico_expand.png");
|
expandAllButton.setImage("/common/img/ico_expand.png");
|
||||||
expandAllButton.addEventListener("onClick", new EventListener() {
|
expandAllButton.addEventListener("onClick", new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (expandAllButton.getSclass().equals("planner-command")) {
|
if (expandAllButton.getSclass().equals("planner-command")) {
|
||||||
expandAll();
|
expandAll();
|
||||||
expandAllButton.setSclass("planner-command clicked");
|
expandAllButton.setSclass("planner-command clicked");
|
||||||
|
|
@ -472,7 +472,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
|
||||||
_("Edit"), "/common/img/ico_editar.png", "icono",
|
_("Edit"), "/common/img/ico_editar.png", "icono",
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
showEditionOrderElement(item);
|
showEditionOrderElement(item);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -238,7 +238,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
|
||||||
bdExternalCompanies.setListboxEventListener(Events.ON_SELECT,
|
bdExternalCompanies.setListboxEventListener(Events.ON_SELECT,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final Object object = bdExternalCompanies
|
final Object object = bdExternalCompanies
|
||||||
.getSelectedElement();
|
.getSelectedElement();
|
||||||
getOrder().setCustomer((ExternalCompany) object);
|
getOrder().setCustomer((ExternalCompany) object);
|
||||||
|
|
@ -247,7 +247,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
|
||||||
bdExternalCompanies.setListboxEventListener(Events.ON_OK,
|
bdExternalCompanies.setListboxEventListener(Events.ON_OK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
final Object object = bdExternalCompanies
|
final Object object = bdExternalCompanies
|
||||||
.getSelectedElement();
|
.getSelectedElement();
|
||||||
getOrder().setCustomer((ExternalCompany) object);
|
getOrder().setCustomer((ExternalCompany) object);
|
||||||
|
|
@ -256,7 +256,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
|
||||||
});
|
});
|
||||||
txtName.addEventListener(Events.ON_OK, new EventListener() {
|
txtName.addEventListener(Events.ON_OK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ public class TemplateFinderPopup extends
|
||||||
acceptButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
acceptButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
onAccept();
|
onAccept();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -154,7 +154,7 @@ public class TemplateFinderPopup extends
|
||||||
cancelButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
cancelButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
onCancel();
|
onCancel();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -619,7 +619,7 @@ public abstract class AssignedCriterionRequirementController<T, M> extends
|
||||||
public class HoursGroupListitemRender implements ListitemRenderer {
|
public class HoursGroupListitemRender implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
final HoursGroup hoursGroup = (HoursGroup) data;
|
final HoursGroup hoursGroup = (HoursGroup) data;
|
||||||
|
|
||||||
// Criterion Requirements hours Group
|
// Criterion Requirements hours Group
|
||||||
|
|
|
||||||
|
|
@ -293,7 +293,7 @@ public abstract class AssignedMaterialsController<T, A> extends GenericForwardCo
|
||||||
* Copied verbatim from org.zkoss.zul.Tree;
|
* Copied verbatim from org.zkoss.zul.Tree;
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem ti, Object node) throws Exception {
|
public void render(Treeitem ti, Object node) {
|
||||||
final MaterialCategory materialCategory = (MaterialCategory) node;
|
final MaterialCategory materialCategory = (MaterialCategory) node;
|
||||||
|
|
||||||
Label lblName = new Label(materialCategory.getName());
|
Label lblName = new Label(materialCategory.getName());
|
||||||
|
|
@ -313,7 +313,7 @@ public abstract class AssignedMaterialsController<T, A> extends GenericForwardCo
|
||||||
cellName.addEventListener("onClick", new EventListener() {
|
cellName.addEventListener("onClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().searchMaterials("", materialCategory);
|
getModel().searchMaterials("", materialCategory);
|
||||||
Util.reloadBindings(lbFoundMaterials);
|
Util.reloadBindings(lbFoundMaterials);
|
||||||
}
|
}
|
||||||
|
|
@ -333,7 +333,7 @@ public abstract class AssignedMaterialsController<T, A> extends GenericForwardCo
|
||||||
* Copied verbatim from org.zkoss.zul.Tree;
|
* Copied verbatim from org.zkoss.zul.Tree;
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem ti, Object node) throws Exception {
|
public void render(Treeitem ti, Object node) {
|
||||||
final MaterialCategory materialCategory = (MaterialCategory) node;
|
final MaterialCategory materialCategory = (MaterialCategory) node;
|
||||||
|
|
||||||
Label lblName = new Label(materialCategory.getName());
|
Label lblName = new Label(materialCategory.getName());
|
||||||
|
|
@ -537,7 +537,7 @@ public abstract class AssignedMaterialsController<T, A> extends GenericForwardCo
|
||||||
*/
|
*/
|
||||||
public class UnitTypeListRenderer implements ListitemRenderer {
|
public class UnitTypeListRenderer implements ListitemRenderer {
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem listItem, Object data) throws Exception {
|
public void render(Listitem listItem, Object data) {
|
||||||
final UnitType unitType = (UnitType) data;
|
final UnitType unitType = (UnitType) data;
|
||||||
listItem.setValue(unitType);
|
listItem.setValue(unitType);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1001,7 +1001,7 @@ public class AdvancedAllocationController extends GenericForwardComposer {
|
||||||
return new Callable<PairOfLists<Row, Row>>() {
|
return new Callable<PairOfLists<Row, Row>>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PairOfLists<Row, Row> call() throws Exception {
|
public PairOfLists<Row, Row> call() {
|
||||||
List<Row> rows = getRows();
|
List<Row> rows = getRows();
|
||||||
return new PairOfLists<Row, Row>(rows, rows);
|
return new PairOfLists<Row, Row>(rows, rows);
|
||||||
}
|
}
|
||||||
|
|
@ -1183,7 +1183,7 @@ class Row {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
EffortDuration value = effortDurationBox
|
EffortDuration value = effortDurationBox
|
||||||
.getEffortDurationValue();
|
.getEffortDurationValue();
|
||||||
|
|
||||||
|
|
@ -1252,7 +1252,8 @@ class Row {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event)
|
||||||
|
throws InterruptedException {
|
||||||
final String currentValue = assignmentFunctionsCombo.getValue();
|
final String currentValue = assignmentFunctionsCombo.getValue();
|
||||||
if (currentValue.equals(getPreviousValue())) {
|
if (currentValue.equals(getPreviousValue())) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -1467,7 +1468,7 @@ class Row {
|
||||||
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
IAssignmentFunctionConfiguration configuration = (IAssignmentFunctionConfiguration) assignmentFunctionsCombo
|
IAssignmentFunctionConfiguration configuration = (IAssignmentFunctionConfiguration) assignmentFunctionsCombo
|
||||||
.getSelectedItem().getValue();
|
.getSelectedItem().getValue();
|
||||||
configuration.goToConfigure();
|
configuration.goToConfigure();
|
||||||
|
|
@ -1558,7 +1559,7 @@ class Row {
|
||||||
component.addEventListener(Events.ON_CHANGE, new EventListener() {
|
component.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
EffortDuration value = effortBox.getEffortDurationValue();
|
EffortDuration value = effortBox.getEffortDurationValue();
|
||||||
LocalDate startDate = restriction.limitStartDate(item
|
LocalDate startDate = restriction.limitStartDate(item
|
||||||
.getStartDate().toLocalDate());
|
.getStartDate().toLocalDate());
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ public class AllocationConfiguration extends HtmlMacroComponent {
|
||||||
calculationTypeSelector.addEventListener(Events.ON_CHECK, new EventListener() {
|
calculationTypeSelector.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
taskWorkableDays.clearErrorMessage(true);
|
taskWorkableDays.clearErrorMessage(true);
|
||||||
setCalculationTypeSelected(calculationTypeSelector
|
setCalculationTypeSelected(calculationTypeSelector
|
||||||
.getSelectedItem().getValue());
|
.getSelectedItem().getValue());
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ public class FormBinder {
|
||||||
private EventListener onChangeEnableApply = new EventListener() {
|
private EventListener onChangeEnableApply = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Component target = event.getTarget();
|
Component target = event.getTarget();
|
||||||
if (target instanceof InputElement) {
|
if (target instanceof InputElement) {
|
||||||
InputElement inputElement = (InputElement) target;
|
InputElement inputElement = (InputElement) target;
|
||||||
|
|
@ -137,7 +137,7 @@ public class FormBinder {
|
||||||
private EventListener hoursRowInputChange = new EventListener() {
|
private EventListener hoursRowInputChange = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (effortInput.isDisabled()) {
|
if (effortInput.isDisabled()) {
|
||||||
effortInput.setValue(sumAllEffortFromInputs(rows));
|
effortInput.setValue(sumAllEffortFromInputs(rows));
|
||||||
}
|
}
|
||||||
|
|
@ -147,7 +147,7 @@ public class FormBinder {
|
||||||
private EventListener resourcesPerDayRowInputChange = new EventListener() {
|
private EventListener resourcesPerDayRowInputChange = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (allResourcesPerDay.isDisabled()) {
|
if (allResourcesPerDay.isDisabled()) {
|
||||||
sumResourcesPerDayFromRowsAndAssignToAllResourcesPerDay();
|
sumResourcesPerDayFromRowsAndAssignToAllResourcesPerDay();
|
||||||
}
|
}
|
||||||
|
|
@ -157,7 +157,7 @@ public class FormBinder {
|
||||||
private EventListener allHoursInputChange = new EventListener() {
|
private EventListener allHoursInputChange = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (!effortInput.isDisabled()) {
|
if (!effortInput.isDisabled()) {
|
||||||
distributeHoursFromTotalToRows();
|
distributeHoursFromTotalToRows();
|
||||||
}
|
}
|
||||||
|
|
@ -167,7 +167,7 @@ public class FormBinder {
|
||||||
private EventListener allResourcesPerDayChange = new EventListener() {
|
private EventListener allResourcesPerDayChange = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (!allResourcesPerDay.isDisabled()) {
|
if (!allResourcesPerDay.isDisabled()) {
|
||||||
distributeResourcesPerDayToRows();
|
distributeResourcesPerDayToRows();
|
||||||
}
|
}
|
||||||
|
|
@ -295,7 +295,7 @@ public class FormBinder {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Task task = getTask();
|
Task task = getTask();
|
||||||
Integer workableDays = taskWorkableDays.getValue();
|
Integer workableDays = taskWorkableDays.getValue();
|
||||||
if (allocationRowsHandler.isForwardsAllocation()) {
|
if (allocationRowsHandler.isForwardsAllocation()) {
|
||||||
|
|
@ -550,7 +550,7 @@ public class FormBinder {
|
||||||
applyButtonListener = new EventListener() {
|
applyButtonListener = new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
doApply();
|
doApply();
|
||||||
FormBinder.this.applyButton.setDisabled(true);
|
FormBinder.this.applyButton.setDisabled(true);
|
||||||
}
|
}
|
||||||
|
|
@ -575,7 +575,7 @@ public class FormBinder {
|
||||||
deleteButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
deleteButton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
applyButton.setDisabled(false);
|
applyButton.setDisabled(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -661,7 +661,7 @@ public class FormBinder {
|
||||||
Util.ensureUniqueListener(recommendedAllocation, Events.ON_CLICK,
|
Util.ensureUniqueListener(recommendedAllocation, Events.ON_CLICK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
activatingRecommendedAllocation();
|
activatingRecommendedAllocation();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -670,7 +670,7 @@ public class FormBinder {
|
||||||
public EventListener getRecommendedAllocationListener() {
|
public EventListener getRecommendedAllocationListener() {
|
||||||
return new EventListener() {
|
return new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
activatingRecommendedAllocation();
|
activatingRecommendedAllocation();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -616,7 +616,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
|
||||||
private class ResourceAllocationRenderer implements RowRenderer {
|
private class ResourceAllocationRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row item, Object data) throws Exception {
|
public void render(Row item, Object data) {
|
||||||
if (data instanceof AllocationRow) {
|
if (data instanceof AllocationRow) {
|
||||||
AllocationRow row = (AllocationRow) data;
|
AllocationRow row = (AllocationRow) data;
|
||||||
renderResourceAllocation(item, row);
|
renderResourceAllocation(item, row);
|
||||||
|
|
@ -626,7 +626,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderResourceAllocation(Row row, final AllocationRow data)
|
private void renderResourceAllocation(Row row, final AllocationRow data)
|
||||||
throws Exception {
|
{
|
||||||
row.setValue(data);
|
row.setValue(data);
|
||||||
append(row, data.createDetail());
|
append(row, data.createDetail());
|
||||||
append(row, new Label(data.getName()));
|
append(row, new Label(data.getName()));
|
||||||
|
|
@ -653,7 +653,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
|
||||||
deleteButton.addEventListener("onClick", new EventListener() {
|
deleteButton.addEventListener("onClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
removeAllocation(data);
|
removeAllocation(data);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -270,7 +270,7 @@ public class StretchesFunctionController extends GenericForwardComposer {
|
||||||
private final BigDecimal ONE_HUNDRED = BigDecimal.valueOf(100);
|
private final BigDecimal ONE_HUNDRED = BigDecimal.valueOf(100);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
Stretch stretch = (Stretch) data;
|
Stretch stretch = (Stretch) data;
|
||||||
|
|
||||||
item.setValue(stretch);
|
item.setValue(stretch);
|
||||||
|
|
@ -409,7 +409,7 @@ public class StretchesFunctionController extends GenericForwardComposer {
|
||||||
|
|
||||||
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
stretchesFunctionModel.removeStretch(stretch);
|
stretchesFunctionModel.removeStretch(stretch);
|
||||||
reloadStretchesListAndCharts();
|
reloadStretchesListAndCharts();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ public class CompanyPlanningController implements Composer {
|
||||||
cbProgressTypes.addEventListener(Events.ON_SELECT, new EventListener() {
|
cbProgressTypes.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
planner.updateCompletion(getSelectedProgressType().toString());
|
planner.updateCompletion(getSelectedProgressType().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -175,7 +175,7 @@ public class CompanyPlanningController implements Composer {
|
||||||
private static class ProgressTypeRenderer implements ComboitemRenderer {
|
private static class ProgressTypeRenderer implements ComboitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Comboitem item, Object data) throws Exception {
|
public void render(Comboitem item, Object data) {
|
||||||
ProgressType progressType = (ProgressType) data;
|
ProgressType progressType = (ProgressType) data;
|
||||||
item.setValue(progressType);
|
item.setValue(progressType);
|
||||||
item.setLabel(_(progressType.getValue()));
|
item.setLabel(_(progressType.getValue()));
|
||||||
|
|
|
||||||
|
|
@ -303,7 +303,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
||||||
((South) planner.getFellow("graphics")).addEventListener("onOpen",
|
((South) planner.getFellow("graphics")).addEventListener("onOpen",
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
transactionService
|
transactionService
|
||||||
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -378,7 +378,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
||||||
datebox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
datebox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
LocalDate date = new LocalDate(datebox.getValue());
|
LocalDate date = new LocalDate(datebox.getValue());
|
||||||
org.zkoss.zk.ui.Component child = vbox
|
org.zkoss.zk.ui.Component child = vbox
|
||||||
.getFellow("indicatorsTable");
|
.getFellow("indicatorsTable");
|
||||||
|
|
@ -559,7 +559,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
|
||||||
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
transactionService
|
transactionService
|
||||||
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ public class LimitingResourceAllocationController extends GenericForwardComposer
|
||||||
public class GridLimitingAllocationRenderer implements RowRenderer {
|
public class GridLimitingAllocationRenderer implements RowRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
LimitingAllocationRow resourceAllocation = (LimitingAllocationRow) data;
|
LimitingAllocationRow resourceAllocation = (LimitingAllocationRow) data;
|
||||||
|
|
||||||
row.appendChild(label(resourceAllocation.getAllocationTypeStr()));
|
row.appendChild(label(resourceAllocation.getAllocationTypeStr()));
|
||||||
|
|
@ -248,7 +248,7 @@ public class LimitingResourceAllocationController extends GenericForwardComposer
|
||||||
listbox.addEventListener("onSelect", new EventListener() {
|
listbox.addEventListener("onSelect", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
String priority = getSelectedValue((Listbox) event.getTarget());
|
String priority = getSelectedValue((Listbox) event.getTarget());
|
||||||
resourceAllocation.setPriorityStr(priority);
|
resourceAllocation.setPriorityStr(priority);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -157,7 +157,7 @@ public class OrderPlanningController implements Composer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
|
public void doAfterCompose(org.zkoss.zk.ui.Component comp) {
|
||||||
this.planner = (Planner) comp;
|
this.planner = (Planner) comp;
|
||||||
String zoomLevelParameter = null;
|
String zoomLevelParameter = null;
|
||||||
if ((parameters != null) && (parameters.get("zoom") != null)
|
if ((parameters != null) && (parameters.get("zoom") != null)
|
||||||
|
|
@ -245,7 +245,7 @@ public class OrderPlanningController implements Composer {
|
||||||
LongOperationFeedback.execute(orderElementFilter, new ILongOperation() {
|
LongOperationFeedback.execute(orderElementFilter, new ILongOperation() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
model.forceLoadLabelsAndCriterionRequirements();
|
model.forceLoadLabelsAndCriterionRequirements();
|
||||||
|
|
||||||
final IContext<?> context = planner.getContext();
|
final IContext<?> context = planner.getContext();
|
||||||
|
|
|
||||||
|
|
@ -788,7 +788,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
||||||
datebox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
datebox.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
LocalDate date = new LocalDate(datebox.getValue());
|
LocalDate date = new LocalDate(datebox.getValue());
|
||||||
org.zkoss.zk.ui.Component child = vbox
|
org.zkoss.zk.ui.Component child = vbox
|
||||||
.getFellow("indicatorsTable");
|
.getFellow("indicatorsTable");
|
||||||
|
|
@ -897,7 +897,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
|
||||||
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
checkbox.addEventListener(Events.ON_CHECK, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
transactionService
|
transactionService
|
||||||
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
.runOnReadOnlyTransaction(new IOnTransaction<Void>() {
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -133,7 +133,7 @@ public class ReassignCommand implements IReassignCommand {
|
||||||
new Callable<String>() {
|
new Callable<String>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String call() throws Exception {
|
public String call() {
|
||||||
return _("{0} reassignations finished",
|
return _("{0} reassignations finished",
|
||||||
reassignations.size());
|
reassignations.size());
|
||||||
}
|
}
|
||||||
|
|
@ -144,7 +144,7 @@ public class ReassignCommand implements IReassignCommand {
|
||||||
new Callable<String>() {
|
new Callable<String>() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String call() throws Exception {
|
public String call() {
|
||||||
return _("It couldn't complete all the reassignations");
|
return _("It couldn't complete all the reassignations");
|
||||||
}
|
}
|
||||||
})));
|
})));
|
||||||
|
|
@ -248,7 +248,7 @@ public class ReassignCommand implements IReassignCommand {
|
||||||
relativeTo.addEventListener(eventName, new EventListener() {
|
relativeTo.addEventListener(eventName, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
relativeTo.removeEventListener(eventName, this);
|
relativeTo.removeEventListener(eventName, this);
|
||||||
try {
|
try {
|
||||||
Messagebox.show(resolve(message),
|
Messagebox.show(resolve(message),
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ public class ReassignController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Radio selectedItem = reassigningTypeSelector
|
Radio selectedItem = reassigningTypeSelector
|
||||||
.getSelectedItem();
|
.getSelectedItem();
|
||||||
newTypeChoosen(Type.fromRadio(selectedItem));
|
newTypeChoosen(Type.fromRadio(selectedItem));
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ public class MultipleTabsPlannerController implements Composer,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAction() throws Exception {
|
public void doAction() {
|
||||||
proxiedTab.show();
|
proxiedTab.show();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -313,7 +313,7 @@ public class MultipleTabsPlannerController implements Composer,
|
||||||
private EventListener showPlanningTab() {
|
private EventListener showPlanningTab() {
|
||||||
return new EventListener() {
|
return new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getTabsRegistry().show(planningTab);
|
getTabsRegistry().show(planningTab);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -367,7 +367,7 @@ public class MultipleTabsPlannerController implements Composer,
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(readOnly=true)
|
@Transactional(readOnly=true)
|
||||||
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
|
public void doAfterCompose(org.zkoss.zk.ui.Component comp) {
|
||||||
Planner.registerNeededScripts();
|
Planner.registerNeededScripts();
|
||||||
tabsSwitcher = (TabSwitcher) comp;
|
tabsSwitcher = (TabSwitcher) comp;
|
||||||
breadcrumbs = comp.getPage().getFellow("breadcrumbs");
|
breadcrumbs = comp.getPage().getFellow("breadcrumbs");
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@ import org.navalplanner.business.planner.entities.Task;
|
||||||
import org.navalplanner.business.planner.entities.TaskElement;
|
import org.navalplanner.business.planner.entities.TaskElement;
|
||||||
import org.navalplanner.business.workingday.EffortDuration;
|
import org.navalplanner.business.workingday.EffortDuration;
|
||||||
import org.navalplanner.business.workingday.IntraDayDate;
|
import org.navalplanner.business.workingday.IntraDayDate;
|
||||||
import org.navalplanner.web.common.EffortDurationBox;
|
|
||||||
import org.navalplanner.web.common.IMessagesForUser;
|
import org.navalplanner.web.common.IMessagesForUser;
|
||||||
import org.navalplanner.web.common.Level;
|
import org.navalplanner.web.common.Level;
|
||||||
import org.navalplanner.web.common.MessagesForUser;
|
import org.navalplanner.web.common.MessagesForUser;
|
||||||
|
|
|
||||||
|
|
@ -293,7 +293,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
PositionConstraintType constraint = (PositionConstraintType) startConstraintTypes
|
PositionConstraintType constraint = (PositionConstraintType) startConstraintTypes
|
||||||
.getSelectedItemApi().getValue();
|
.getSelectedItemApi().getValue();
|
||||||
constraintTypeChoosen(constraint);
|
constraintTypeChoosen(constraint);
|
||||||
|
|
@ -303,7 +303,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
|
||||||
lbResourceAllocationType.addEventListener(Events.ON_SELECT, new EventListener() {
|
lbResourceAllocationType.addEventListener(Events.ON_SELECT, new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
SelectEvent se = (SelectEvent) event;
|
SelectEvent se = (SelectEvent) event;
|
||||||
|
|
||||||
final ResourceAllocationTypeEnum oldState = getOldState();
|
final ResourceAllocationTypeEnum oldState = getOldState();
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,7 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
|
||||||
public class ResourceListRenderer implements ListitemRenderer {
|
public class ResourceListRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
final Resource resource = (Resource) data;
|
final Resource resource = (Resource) data;
|
||||||
item.setValue(resource);
|
item.setValue(resource);
|
||||||
|
|
||||||
|
|
@ -233,7 +233,7 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
|
||||||
delete.setTooltiptext(_("Delete"));
|
delete.setTooltiptext(_("Delete"));
|
||||||
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
delete.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
onRemoveResource((Resource) item.getValue());
|
onRemoveResource((Resource) item.getValue());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -258,7 +258,7 @@ public class TimeLineRequiredMaterialController extends
|
||||||
* Copied verbatim from org.zkoss.zul.Tree;
|
* Copied verbatim from org.zkoss.zul.Tree;
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem ti, Object node) throws Exception {
|
public void render(Treeitem ti, Object node) {
|
||||||
Label lblName = null;
|
Label lblName = null;
|
||||||
if (node instanceof MaterialCategory) {
|
if (node instanceof MaterialCategory) {
|
||||||
final MaterialCategory materialCategory = (MaterialCategory) node;
|
final MaterialCategory materialCategory = (MaterialCategory) node;
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ public class ResourceLoadController implements Composer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception {
|
public void doAfterCompose(org.zkoss.zk.ui.Component comp) {
|
||||||
this.parent = comp;
|
this.parent = comp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -328,7 +328,7 @@ public class ResourceLoadController implements Composer {
|
||||||
button.setTooltip(_("Filter by worker"));
|
button.setTooltip(_("Filter by worker"));
|
||||||
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
button.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if(currentFilterByResources) {
|
if(currentFilterByResources) {
|
||||||
filterResourcesFromBandbox();
|
filterResourcesFromBandbox();
|
||||||
}
|
}
|
||||||
|
|
@ -354,7 +354,7 @@ public class ResourceLoadController implements Composer {
|
||||||
initDate.setWidth("75px");
|
initDate.setWidth("75px");
|
||||||
initDate.addEventListener(Events.ON_CHANGE, new EventListener() {
|
initDate.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
resourceLoadModel.setInitDateFilter(LocalDate
|
resourceLoadModel.setInitDateFilter(LocalDate
|
||||||
.fromDateFields(initDate.getValue()));
|
.fromDateFields(initDate.getValue()));
|
||||||
reload(currentFilterByResources);
|
reload(currentFilterByResources);
|
||||||
|
|
@ -365,7 +365,7 @@ public class ResourceLoadController implements Composer {
|
||||||
endDate.setWidth("75px");
|
endDate.setWidth("75px");
|
||||||
endDate.addEventListener(Events.ON_CHANGE, new EventListener() {
|
endDate.addEventListener(Events.ON_CHANGE, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
resourceLoadModel.setEndDateFilter(LocalDate
|
resourceLoadModel.setEndDateFilter(LocalDate
|
||||||
.fromDateFields(endDate.getValue()));
|
.fromDateFields(endDate.getValue()));
|
||||||
reload(currentFilterByResources);
|
reload(currentFilterByResources);
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem item, Object data) throws Exception {
|
public void render(Treeitem item, Object data) {
|
||||||
final CriterionDTO criterionForThisRow = (CriterionDTO) data;
|
final CriterionDTO criterionForThisRow = (CriterionDTO) data;
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
||||||
|
|
@ -156,7 +156,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
|
|
||||||
checkboxActive.addEventListener(Events.ON_CHECK,new EventListener() {
|
checkboxActive.addEventListener(Events.ON_CHECK,new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().updateEnabledCriterions(criterionForThisRow.isActive(),criterionForThisRow);
|
getModel().updateEnabledCriterions(criterionForThisRow.isActive(),criterionForThisRow);
|
||||||
reloadTree();
|
reloadTree();
|
||||||
}
|
}
|
||||||
|
|
@ -210,7 +210,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
upbutton.setSclass("icono");
|
upbutton.setSclass("icono");
|
||||||
upbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
upbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().down(criterionForThisRow);
|
getModel().down(criterionForThisRow);
|
||||||
reloadTree();
|
reloadTree();
|
||||||
}
|
}
|
||||||
|
|
@ -222,7 +222,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
downbutton.setSclass("icono");
|
downbutton.setSclass("icono");
|
||||||
downbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
downbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().up(criterionForThisRow);
|
getModel().up(criterionForThisRow);
|
||||||
reloadTree();
|
reloadTree();
|
||||||
}
|
}
|
||||||
|
|
@ -233,7 +233,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
if(getModel().getCriterionType().allowHierarchy()){
|
if(getModel().getCriterionType().allowHierarchy()){
|
||||||
indentbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
indentbutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().indent(criterionForThisRow);
|
getModel().indent(criterionForThisRow);
|
||||||
reloadTree();
|
reloadTree();
|
||||||
}
|
}
|
||||||
|
|
@ -246,7 +246,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
unindentbutton.addEventListener(Events.ON_CLICK,
|
unindentbutton.addEventListener(Events.ON_CLICK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().unindent(criterionForThisRow);
|
getModel().unindent(criterionForThisRow);
|
||||||
reloadTree();
|
reloadTree();
|
||||||
}
|
}
|
||||||
|
|
@ -258,7 +258,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
if (criterionsModel.isDeletable(criterionForThisRow.getCriterion())) {
|
if (criterionsModel.isDeletable(criterionForThisRow.getCriterion())) {
|
||||||
removebutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
removebutton.addEventListener(Events.ON_CLICK, new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
getModel().removeNode(criterionForThisRow);
|
getModel().removeNode(criterionForThisRow);
|
||||||
if (!criterionForThisRow.isNewObject()) {
|
if (!criterionForThisRow.isNewObject()) {
|
||||||
criterionsModel
|
criterionsModel
|
||||||
|
|
@ -275,7 +275,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(org.zkoss.zk.ui.event.Event arg0)
|
public void onEvent(org.zkoss.zk.ui.event.Event arg0)
|
||||||
throws Exception {
|
{
|
||||||
DropEvent dropEvent = (DropEvent) arg0;
|
DropEvent dropEvent = (DropEvent) arg0;
|
||||||
move((Component) dropEvent.getTarget(),
|
move((Component) dropEvent.getTarget(),
|
||||||
(Component) dropEvent.getDragged());
|
(Component) dropEvent.getDragged());
|
||||||
|
|
@ -407,7 +407,7 @@ public class CriterionTreeController extends GenericForwardComposer {
|
||||||
Util.reloadBindings(tree);
|
Util.reloadBindings(tree);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getName() throws ValidationException{
|
private String getName() {
|
||||||
String name = criterionName.getValue();
|
String name = criterionName.getValue();
|
||||||
getModel().thereIsOtherWithSameNameAndType(name);
|
getModel().thereIsOtherWithSameNameAndType(name);
|
||||||
getModel().validateNameNotEmpty(name);
|
getModel().validateNameNotEmpty(name);
|
||||||
|
|
|
||||||
|
|
@ -178,14 +178,14 @@ public class MachineCRUDController extends GenericForwardComposer {
|
||||||
criterionsController.doAfterCompose(comp);
|
criterionsController.doAfterCompose(comp);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupConfigurationController() throws Exception {
|
private void setupConfigurationController() {
|
||||||
configurationUnits = editWindow.getFellow("configurationUnits");
|
configurationUnits = editWindow.getFellow("configurationUnits");
|
||||||
configurationController = (MachineConfigurationController) configurationUnits
|
configurationController = (MachineConfigurationController) configurationUnits
|
||||||
.getVariable("configurationController", true);
|
.getVariable("configurationController", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupResourcesCostCategoryAssignmentController(Component comp)
|
private void setupResourcesCostCategoryAssignmentController(Component comp)
|
||||||
throws Exception {
|
{
|
||||||
Component costCategoryAssignmentContainer =
|
Component costCategoryAssignmentContainer =
|
||||||
editWindow.getFellowIfAny("costCategoryAssignmentContainer");
|
editWindow.getFellowIfAny("costCategoryAssignmentContainer");
|
||||||
resourcesCostCategoryAssignmentController = (ResourcesCostCategoryAssignmentController)
|
resourcesCostCategoryAssignmentController = (ResourcesCostCategoryAssignmentController)
|
||||||
|
|
@ -459,7 +459,7 @@ public class MachineCRUDController extends GenericForwardComposer {
|
||||||
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Comboitem item, Object data) throws Exception {
|
public void render(Comboitem item, Object data) {
|
||||||
BaseCalendar calendar = (BaseCalendar) data;
|
BaseCalendar calendar = (BaseCalendar) data;
|
||||||
item.setLabel(calendar.getName());
|
item.setLabel(calendar.getName());
|
||||||
item.setValue(calendar);
|
item.setValue(calendar);
|
||||||
|
|
@ -649,14 +649,14 @@ public class MachineCRUDController extends GenericForwardComposer {
|
||||||
return new RowRenderer() {
|
return new RowRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
final Machine machine = (Machine) data;
|
final Machine machine = (Machine) data;
|
||||||
row.setValue(machine);
|
row.setValue(machine);
|
||||||
|
|
||||||
row.addEventListener(Events.ON_CLICK,
|
row.addEventListener(Events.ON_CLICK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(machine);
|
goToEditForm(machine);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -670,13 +670,13 @@ public class MachineCRUDController extends GenericForwardComposer {
|
||||||
Hbox hbox = new Hbox();
|
Hbox hbox = new Hbox();
|
||||||
hbox.appendChild(Util.createEditButton(new EventListener() {
|
hbox.appendChild(Util.createEditButton(new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(machine);
|
goToEditForm(machine);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(machine);
|
confirmRemove(machine);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ public class NewAllocationSelectorController extends
|
||||||
// Whenever an element of the tree is selected, a search query
|
// Whenever an element of the tree is selected, a search query
|
||||||
// is executed, refreshing the results into the workers listbox
|
// is executed, refreshing the results into the workers listbox
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
searchResources("", getSelectedCriterions());
|
searchResources("", getSelectedCriterions());
|
||||||
showSelectedAllocations();
|
showSelectedAllocations();
|
||||||
}
|
}
|
||||||
|
|
@ -127,7 +127,7 @@ public class NewAllocationSelectorController extends
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
if (isGenericType()) {
|
if (isGenericType()) {
|
||||||
returnToSpecificDueToResourceSelection();
|
returnToSpecificDueToResourceSelection();
|
||||||
}
|
}
|
||||||
|
|
@ -144,7 +144,7 @@ public class NewAllocationSelectorController extends
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Radio radio = (Radio) event.getTarget();
|
Radio radio = (Radio) event.getTarget();
|
||||||
if (radio == null) {
|
if (radio == null) {
|
||||||
return;
|
return;
|
||||||
|
|
@ -474,7 +474,7 @@ public class NewAllocationSelectorController extends
|
||||||
private static class ResourceListRenderer implements ListitemRenderer {
|
private static class ResourceListRenderer implements ListitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Listitem item, Object data) throws Exception {
|
public void render(Listitem item, Object data) {
|
||||||
item.setValue((Resource) data);
|
item.setValue((Resource) data);
|
||||||
|
|
||||||
appendLabelResource(item);
|
appendLabelResource(item);
|
||||||
|
|
@ -517,7 +517,7 @@ public class NewAllocationSelectorController extends
|
||||||
* Copied verbatim from org.zkoss.zul.Tree;
|
* Copied verbatim from org.zkoss.zul.Tree;
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void render(Treeitem ti, Object node) throws Exception {
|
public void render(Treeitem ti, Object node) {
|
||||||
Treecell tc = new Treecell(Objects.toString(node));
|
Treecell tc = new Treecell(Objects.toString(node));
|
||||||
Treerow tr = null;
|
Treerow tr = null;
|
||||||
ti.setValue(node);
|
ti.setValue(node);
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ public class LocalizationsController extends GenericForwardComposer {
|
||||||
unassignButton.addEventListener("onClick", new EventListener() {
|
unassignButton.addEventListener("onClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
workerModel.unassignSatisfactions(
|
workerModel.unassignSatisfactions(
|
||||||
extractValuesOf(activeSatisfactions.getSelectedItems(),
|
extractValuesOf(activeSatisfactions.getSelectedItems(),
|
||||||
CriterionSatisfaction.class));
|
CriterionSatisfaction.class));
|
||||||
|
|
@ -103,7 +103,7 @@ public class LocalizationsController extends GenericForwardComposer {
|
||||||
assignButton.addEventListener("onClick", new EventListener() {
|
assignButton.addEventListener("onClick", new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
Set<Listitem> selectedItems = criterionsNotAssigned
|
Set<Listitem> selectedItems = criterionsNotAssigned
|
||||||
.getSelectedItems();
|
.getSelectedItems();
|
||||||
workerModel.assignCriteria(
|
workerModel.assignCriteria(
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@ import org.navalplanner.web.common.OnlyOneVisible;
|
||||||
import org.navalplanner.web.common.Util;
|
import org.navalplanner.web.common.Util;
|
||||||
import org.navalplanner.web.common.components.bandboxsearch.BandboxMultipleSearch;
|
import org.navalplanner.web.common.components.bandboxsearch.BandboxMultipleSearch;
|
||||||
import org.navalplanner.web.common.components.finders.FilterPair;
|
import org.navalplanner.web.common.components.finders.FilterPair;
|
||||||
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
|
|
||||||
import org.navalplanner.web.common.entrypoints.EntryPointsHandler;
|
import org.navalplanner.web.common.entrypoints.EntryPointsHandler;
|
||||||
|
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
|
||||||
import org.navalplanner.web.costcategories.ResourcesCostCategoryAssignmentController;
|
import org.navalplanner.web.costcategories.ResourcesCostCategoryAssignmentController;
|
||||||
import org.navalplanner.web.resources.search.ResourcePredicate;
|
import org.navalplanner.web.resources.search.ResourcePredicate;
|
||||||
import org.zkoss.zk.ui.Component;
|
import org.zkoss.zk.ui.Component;
|
||||||
|
|
@ -365,15 +365,14 @@ public class WorkerCRUDController extends GenericForwardComposer implements
|
||||||
clearFilterDates();
|
clearFilterDates();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupResourcesCostCategoryAssignmentController(Component comp)
|
private void setupResourcesCostCategoryAssignmentController(Component comp) {
|
||||||
throws Exception {
|
|
||||||
Component costCategoryAssignmentContainer =
|
Component costCategoryAssignmentContainer =
|
||||||
editWindow.getFellowIfAny("costCategoryAssignmentContainer");
|
editWindow.getFellowIfAny("costCategoryAssignmentContainer");
|
||||||
resourcesCostCategoryAssignmentController = (ResourcesCostCategoryAssignmentController)
|
resourcesCostCategoryAssignmentController = (ResourcesCostCategoryAssignmentController)
|
||||||
costCategoryAssignmentContainer.getVariable("assignmentController", true);
|
costCategoryAssignmentContainer.getVariable("assignmentController", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void editAsignedCriterions(){
|
private void editAsignedCriterions() {
|
||||||
try{
|
try{
|
||||||
setupCriterionsController();
|
setupCriterionsController();
|
||||||
criterionsController.prepareForEdit( workerModel.getWorker());
|
criterionsController.prepareForEdit( workerModel.getWorker());
|
||||||
|
|
@ -391,7 +390,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setupCriterionsController()throws Exception {
|
private void setupCriterionsController() throws Exception {
|
||||||
criterionsController = new CriterionsController(workerModel);
|
criterionsController = new CriterionsController(workerModel);
|
||||||
criterionsController.doAfterCompose(getCurrentWindow().
|
criterionsController.doAfterCompose(getCurrentWindow().
|
||||||
getFellow("criterionsContainer"));
|
getFellow("criterionsContainer"));
|
||||||
|
|
@ -543,7 +542,7 @@ public class WorkerCRUDController extends GenericForwardComposer implements
|
||||||
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
private class BaseCalendarsComboitemRenderer implements ComboitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Comboitem item, Object data) throws Exception {
|
public void render(Comboitem item, Object data) {
|
||||||
BaseCalendar calendar = (BaseCalendar) data;
|
BaseCalendar calendar = (BaseCalendar) data;
|
||||||
item.setLabel(calendar.getName());
|
item.setLabel(calendar.getName());
|
||||||
item.setValue(calendar);
|
item.setValue(calendar);
|
||||||
|
|
@ -842,14 +841,14 @@ public class WorkerCRUDController extends GenericForwardComposer implements
|
||||||
return new RowRenderer() {
|
return new RowRenderer() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(Row row, Object data) throws Exception {
|
public void render(Row row, Object data) {
|
||||||
final Worker worker = (Worker) data;
|
final Worker worker = (Worker) data;
|
||||||
row.setValue(worker);
|
row.setValue(worker);
|
||||||
|
|
||||||
row.addEventListener(Events.ON_CLICK,
|
row.addEventListener(Events.ON_CLICK,
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(worker);
|
goToEditForm(worker);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -864,13 +863,13 @@ public class WorkerCRUDController extends GenericForwardComposer implements
|
||||||
Hbox hbox = new Hbox();
|
Hbox hbox = new Hbox();
|
||||||
hbox.appendChild(Util.createEditButton(new EventListener() {
|
hbox.appendChild(Util.createEditButton(new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(worker);
|
goToEditForm(worker);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
hbox.appendChild(Util.createRemoveButton(new EventListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
confirmRemove(worker);
|
confirmRemove(worker);
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
|
||||||
|
|
@ -156,7 +156,7 @@ public class ScenarioCRUDController extends GenericForwardComposer {
|
||||||
public class ScenariosTreeitemRenderer implements TreeitemRenderer {
|
public class ScenariosTreeitemRenderer implements TreeitemRenderer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(final Treeitem item, Object data) throws Exception {
|
public void render(final Treeitem item, Object data) {
|
||||||
SimpleTreeNode simpleTreeNode = (SimpleTreeNode) data;
|
SimpleTreeNode simpleTreeNode = (SimpleTreeNode) data;
|
||||||
final Scenario scenario = (Scenario) simpleTreeNode.getData();
|
final Scenario scenario = (Scenario) simpleTreeNode.getData();
|
||||||
item.setValue(data);
|
item.setValue(data);
|
||||||
|
|
@ -184,7 +184,7 @@ public class ScenarioCRUDController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToCreateDerivedForm(scenario);
|
goToCreateDerivedForm(scenario);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -194,7 +194,7 @@ public class ScenarioCRUDController extends GenericForwardComposer {
|
||||||
Button editButton = Util.createEditButton(new EventListener() {
|
Button editButton = Util.createEditButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
goToEditForm(scenario);
|
goToEditForm(scenario);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -204,7 +204,7 @@ public class ScenarioCRUDController extends GenericForwardComposer {
|
||||||
Button removeButton = Util.createRemoveButton(new EventListener() {
|
Button removeButton = Util.createRemoveButton(new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
scenarioModel.remove(scenario);
|
scenarioModel.remove(scenario);
|
||||||
Util.reloadBindings(listWindow);
|
Util.reloadBindings(listWindow);
|
||||||
}
|
}
|
||||||
|
|
@ -226,7 +226,7 @@ public class ScenarioCRUDController extends GenericForwardComposer {
|
||||||
new EventListener() {
|
new EventListener() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEvent(Event event) throws Exception {
|
public void onEvent(Event event) {
|
||||||
connectTo(scenario);
|
connectTo(scenario);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue