opendev/gerrit
Code Issues Proposed changes

Merge "Make cells for up/down navigation for 'My' menu items accept clicks"

Browse Source
This commit is contained in:
Edwin Kempin 2014-03-27 00:06:36 +00:00 committed by Gerrit Code Review
commit 1ec7f1b55f
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
gerrit-gwtui/src/main/java/com/google/gerrit/client/StringListPanel.java
View File

@ -24,6 +24,7 @@ import com.google.gwt.event.dom.client.KeyPressEvent;
import com.google.gwt.event.dom.client.KeyPressHandler; import com.google.gwt.event.dom.client.KeyPressHandler;
import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.CheckBox;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
@ -154,12 +155,13 @@ public class StringListPanel extends FlowPanel {
List<List<String>> getValues() { List<List<String>> getValues() {
List<List<String>> values = new ArrayList<>(); List<List<String>> values = new ArrayList<>();
for (int row = 2; row < table.getRowCount(); row++) { for (int row = 2; row < table.getRowCount(); row++) {
values.add(getValues(row)); values.add(getRowItem(row));
} }
return values; return values;
} }
List<String> getValues(int row) { @Override
protected List<String> getRowItem(int row) {
List<String> v = new ArrayList<>(); List<String> v = new ArrayList<>();
for (int i = 0; i < inputs.size(); i++) { for (int i = 0; i < inputs.size(); i++) {
v.add(table.getText(row, i + 1)); v.add(table.getText(row, i + 1));
@ -193,11 +195,7 @@ public class StringListPanel extends FlowPanel {
down.addClickHandler(new ClickHandler() { down.addClickHandler(new ClickHandler() {
@Override @Override
public void onClick(ClickEvent event) { public void onClick(ClickEvent event) {
List<String> value = getValues(row); moveDown(row);
List<String> nextValue = getValues(row + 1);
populate(row, nextValue, false);
populate(row + 1, value, row + 1 == table.getRowCount() - 1);
widget.setEnabled(true);
} }
}); });
table.setWidget(row, values.size() + 1, down); table.setWidget(row, values.size() + 1, down);
@ -209,11 +207,7 @@ public class StringListPanel extends FlowPanel {
up.addClickHandler(new ClickHandler() { up.addClickHandler(new ClickHandler() {
@Override @Override
public void onClick(ClickEvent event) { public void onClick(ClickEvent event) {
List<String> previousValue = getValues(row - 1); moveUp(row);
List<String> value = getValues(row);
populate(row - 1, value, false);
populate(row, previousValue, row == table.getRowCount() - 1);
widget.setEnabled(true);
} }
}); });
table.setWidget(row, values.size() + 2, up); table.setWidget(row, values.size() + 2, up);
@ -221,6 +215,32 @@ public class StringListPanel extends FlowPanel {
} }
} }
@Override
protected void onCellSingleClick(Event event, int row, int column) {
if (column == inputs.size() + 1 && row >= 2
&& row < table.getRowCount() - 2) {
moveDown(row);
} else if (column == inputs.size() + 2 && row > 2) {
moveUp(row);
}
}
void moveDown(int row) {
swap(row, row + 1);
}
void moveUp(int row) {
swap(row - 1, row);
}
void swap(int row1, int row2) {
List<String> value = getRowItem(row1);
List<String> nextValue = getRowItem(row2);
populate(row1, nextValue, false);
populate(row2, value, row2 == table.getRowCount() - 1);
widget.setEnabled(true);
}
void add() { void add() {
List<String> values = new ArrayList<>(); List<String> values = new ArrayList<>();
for (NpTextBox input : inputs) { for (NpTextBox input : inputs) {