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

ConcurrenetModificationException shouldn't happen

Browse source 
FEA: ItEr75S11PreventLooseChanges
This commit is contained in:
Óscar González Fernández 2011-09-20 15:54:11 +02:00
parent 6236bda2da
commit e2c489e904
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderModel.java
View file

@ -21,7 +21,6 @@
package org.navalplanner.web.orders;
import java.util.ConcurrentModificationException;
import java.util.List;
import java.util.Map;
@ -84,7 +83,7 @@ public interface IOrderModel extends IIntegrationEntityModel {
void initEdit(Order order);
void prepareForCreate() throws ConcurrentModificationException;
void prepareForCreate();
void remove(Order order);

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -1062,12 +1062,8 @@ public class OrderCRUDController extends GenericForwardComposer {
}
public void goToCreateForm() {
try {
prepareForCreate();
getCreationPopup().showWindow(this, null);
} catch (ConcurrentModificationException e) {
messagesForUser.showMessage(Level.ERROR, e.getMessage());
}
prepareForCreate();
getCreationPopup().showWindow(this, null);
}
public void prepareForCreate() {

7
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -25,7 +25,6 @@ import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@ -89,6 +88,7 @@ import org.navalplanner.business.users.entities.UserRole;
import org.navalplanner.web.common.IntegrationEntityModel;
import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
import org.navalplanner.web.orders.labels.LabelsOnConversation;
import org.navalplanner.web.planner.order.PlanningStateCreator;
import org.navalplanner.web.security.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
@ -109,6 +109,9 @@ import org.zkoss.zul.Messagebox;
@OnConcurrentModification(goToPage = "/planner/index.zul;orders_list")
public class OrderModel extends IntegrationEntityModel implements IOrderModel {
@Autowired
private PlanningStateCreator planningStateCreator;
@Autowired
private ICriterionTypeDAO criterionTypeDAO;
@ -412,7 +415,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
@Override
@Transactional(readOnly = true)
public void prepareForCreate() throws ConcurrentModificationException {
public void prepareForCreate() {
loadNeededDataForConversation();
this.order = Order.create();
initializeOrder();