DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests7 Actions Projects1 Releases Wiki Activity

Refactored "heavy" method implementation.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-24 11:02:30 +01:00
parent 61d6c0a8bf
commit e9a064bf0c
2 changed files with 16 additions and 8 deletions
src/main/java/se/su/dsv/scipro/admin/panels
ManualMatchPanel.javaManualSetReviewerPanel.java

12
src/main/java/se/su/dsv/scipro/admin/panels/ManualMatchPanel.java

@ -59,6 +59,13 @@ public class ManualMatchPanel extends Panel {
alternateFragment.setOutputMarkupId(true);
add(currentFragment);
}
private boolean testACInputString(AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return autocompleteReviewerField.getModelObject() == null ||
autocompleteReviewerField.getInput() == null ||
autocompleteReviewerField.getInput().isEmpty() ||
!autocompleteReviewerField.getInput().equals(autocompleteReviewerField.getModelObject().getNameAsString());
}
private ConfirmerAjaxSubmitLink createSubmitLink(final IModel<Match> matchModel, final Component feedbackPanel, final Match.Status status,
final Component localFeedback, final AutoCompleteObjectField<Employee, Long> autoCompleteObjectField) {
@ -66,10 +73,7 @@ public class ManualMatchPanel extends Panel {
private static final long serialVersionUID = -1820883998549197409L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
if(autoCompleteObjectField.getModelObject() == null ||
autoCompleteObjectField.getInput() == null ||
autoCompleteObjectField.getInput().isEmpty() ||
!autoCompleteObjectField.getInput().equals(autoCompleteObjectField.getModelObject().getNameAsString())) {
if(testACInputString(autoCompleteObjectField)) {
Session.get().error("No match could be created because the data was invalid.");
target.addComponent(localFeedback);
} else {

12
src/main/java/se/su/dsv/scipro/admin/panels/ManualSetReviewerPanel.java

@ -48,6 +48,13 @@ public class ManualSetReviewerPanel extends Panel {
add(currentFragment);
}
private boolean testACInputString(AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return autocompleteReviewerField.getModelObject() == null ||
autocompleteReviewerField.getInput() == null ||
autocompleteReviewerField.getInput().isEmpty() ||
!autocompleteReviewerField.getInput().equals(autocompleteReviewerField.getModelObject().getNameAsString());
}
private ConfirmerAjaxSubmitLink createSubmitLink(final IModel<ProjectIdea> projectIdeaModel, final Component feedbackPanel,
final Component localFeedback, final AutoCompleteObjectField<Employee, Long> autocompleteReviewerField) {
return new ConfirmerAjaxSubmitLink("saveButton") {
@ -56,10 +63,7 @@ public class ManualSetReviewerPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
if(autocompleteReviewerField.getModelObject() == null ||
autocompleteReviewerField.getInput() == null ||
autocompleteReviewerField.getInput().isEmpty() ||
!autocompleteReviewerField.getInput().equals(autocompleteReviewerField.getModelObject().getNameAsString())) {
if(testACInputString(autocompleteReviewerField) ) {
Session.get().error("No reviewer could be selected because the data was invalid.");
target.addComponent(localFeedback);
} else {