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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #594] Moved ICriterionsModel_V2 and CriterionsModel_V2 to ICriterionsModel and CriterionsModel.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-08-17 15:13:18 +02:00
parent 8c6fc0f25d
commit 2cd3bc22f3
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
View file

@ -55,7 +55,7 @@ public class CriterionAdminController extends GenericForwardComposer {
private static final Log log = LogFactory
.getLog(CriterionAdminController.class);
private ICriterionsModel_V2 criterionsModel_V2;
private ICriterionsModel criterionsModel_V2;
private Component messagesContainer;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
View file

@ -62,7 +62,7 @@ public class CriterionTreeController extends GenericForwardComposer {
private IMessagesForUser messagesForUser;
private final ICriterionsModel_V2 criterionsModel;
private final ICriterionsModel criterionsModel;
private Textbox criterionName;
@ -72,7 +72,7 @@ public class CriterionTreeController extends GenericForwardComposer {
return renderer;
}
public CriterionTreeController(ICriterionsModel_V2 _criterionsModel) {
public CriterionTreeController(ICriterionsModel _criterionsModel) {
Validate.notNull(_criterionsModel);
this.criterionsModel = _criterionsModel;
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java → navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java
View file

@ -54,9 +54,9 @@ import org.springframework.transaction.annotation.Transactional;
@Component("criterionsModel_V2")
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
@OnConcurrentModification(goToPage = "/resources/criterions/criterions-V2.zul")
public class CriterionsModel_V2 implements ICriterionsModel_V2 {
public class CriterionsModel implements ICriterionsModel {
private static final Log log = LogFactory.getLog(CriterionsModel_V2.class);
private static final Log log = LogFactory.getLog(CriterionsModel.class);
@Autowired
private ICriterionDAO criterionDAO;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel_V2.java → navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel.java
View file

@ -34,7 +34,7 @@ import org.navalplanner.business.resources.entities.Worker;
* CriterionsModel contract <br />
* @author Óscar González Fernández <ogonzalez@igalia.com>
*/
public interface ICriterionsModel_V2 {
public interface ICriterionsModel {
boolean getAllowHierarchy();