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

Refactored incorrect method implementation.

Browse Source
This commit is contained in:
Tom Vahlman 2012-03-24 10:54:00 +01:00
parent 84e86658db
commit 61d6c0a8bf
2 changed files with 12 additions and 9 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

@ -109,7 +109,8 @@ public class ManualMatchPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
swapAndAddToTarget(target, autoCompleteObjectField);
swapFragment();
clearInputAndAddToTarget(target, autoCompleteObjectField);
}
@Override
public boolean isVisible() {
@ -122,7 +123,8 @@ public class ManualMatchPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
swapAndAddToTarget(target, autoCompleteObjectField);
swapFragment();
clearInputAndAddToTarget(target, autoCompleteObjectField);
}
@Override
public boolean isVisible() {
@ -135,8 +137,7 @@ public class ManualMatchPanel extends Panel {
}
private void swapAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
swapFragment();
private void clearInputAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
if (target != null) {
//noinspection unchecked
autoCompleteObjectField.setModelObject(null);
@ -174,7 +175,8 @@ public class ManualMatchPanel extends Panel {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget target) {
swapAndAddToTarget(target, autoCompleteObjectField);
swapFragment();
clearInputAndAddToTarget(target, autoCompleteObjectField);
}
});
matchFragment.add(matchForm);

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

@ -98,15 +98,15 @@ public class ManualSetReviewerPanel extends Panel {
private static final long serialVersionUID = 5843396419011530582L;
@Override
public void onClick(AjaxRequestTarget target) {
swapAndAddToTarget(target, autocompleteReviewerField);
swapFragment();
clearInputAndAddToTarget(target, autocompleteReviewerField);
}
});
buttonFragment.setOutputMarkupPlaceholderTag(true);
return buttonFragment;
}
private void swapAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
swapFragment();
private void clearInputAndAddToTarget(AjaxRequestTarget target, final AutoCompleteObjectField autoCompleteObjectField) {
if (target != null) {
//noinspection unchecked
autoCompleteObjectField.setModelObject(null);
@ -140,7 +140,8 @@ public class ManualSetReviewerPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
swapAndAddToTarget(target, autocompleteReviewerField);
swapFragment();
clearInputAndAddToTarget(target, autocompleteReviewerField);
}
});
reviewerFragment.add(reviewerForm);