opendev/gerrit
Code Issues Proposed changes

Merge "Refactor NavLinks to use an enum"

Browse Source
This commit is contained in:
Shawn Pearce
2010-10-12 21:21:31 -07:00
committed by Android Code Review
parent 8100029b44 9a50d4df79
commit 249c3ec3e1
1 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/NavLinks.java
View File

@@ -30,15 +30,28 @@ import com.google.gwtexpui.globalkey.client.KeyCommandSet;
import com.google.gwtexpui.safehtml.client.SafeHtml; import com.google.gwtexpui.safehtml.client.SafeHtml;
class NavLinks extends Composite { class NavLinks extends Composite {
public enum Nav {
PREV (0, '[', PatchUtil.C.previousFileHelp(), 0),
NEXT (2, ']', PatchUtil.C.nextFileHelp(), 1);
public int col; // Table Cell column to display link in
public int key; // key code shortcut to activate link
public String help; // help string for '?' popup
public int cmd; // index into cmds array
Nav(int c, int k, String h, int i) {
this.col = c;
this.key = k;
this.help = h;
this.cmd = i;
}
}
private final Change.Id changeId; private final Change.Id changeId;
private final KeyCommandSet keys; private final KeyCommandSet keys;
private final Grid table; private final Grid table;
private InlineHyperlink prev; private KeyCommand cmds[] = new KeyCommand[2];
private InlineHyperlink next;
private KeyCommand prevKey;
private KeyCommand nextKey;
NavLinks(KeyCommandSet kcs, Change.Id forChange) { NavLinks(KeyCommandSet kcs, Change.Id forChange) {
changeId = forChange; changeId = forChange;
@@ -58,60 +71,43 @@ class NavLinks extends Composite {
} }
void display(int patchIndex, PatchScreen.Type type, PatchTable fileList) { void display(int patchIndex, PatchScreen.Type type, PatchTable fileList) {
if (keys != null && prevKey != null) {
keys.remove(prevKey);
prevKey = null;
}
if (keys != null && nextKey != null) {
keys.remove(nextKey);
nextKey = null;
}
if (fileList != null) { if (fileList != null) {
prev = fileList.getPreviousPatchLink(patchIndex, type); setupNav(Nav.PREV, fileList.getPreviousPatchLink(patchIndex, type));
next = fileList.getNextPatchLink(patchIndex, type); setupNav(Nav.NEXT, fileList.getNextPatchLink(patchIndex, type));
} else { } else {
prev = null; setupNav(Nav.PREV, null);
next = null; setupNav(Nav.NEXT, null);
}
} }
if (prev != null) { protected void setupNav(final Nav nav, final InlineHyperlink link) {
if (keys != null) {
prevKey = new KeyCommand(0, '[', PatchUtil.C.previousFileHelp()) { /* setup the cells */
@Override if (link != null) {
public void onKeyPress(KeyPressEvent event) { table.setWidget(0, nav.col, link);
prev.go();
}
};
keys.add(prevKey);
}
table.setWidget(0, 0, prev);
} else { } else {
if (keys != null) { table.clearCell(0, nav.col);
prevKey = new UpToChangeCommand(changeId, 0, '[');
keys.add(prevKey);
}
table.clearCell(0, 0);
} }
if (next != null) { /* setup the keys */
if (keys != null) { if (keys != null) {
nextKey = new KeyCommand(0, ']', PatchUtil.C.nextFileHelp()) {
if (cmds[nav.cmd] != null) {
keys.remove(cmds[nav.cmd]);
}
if (link != null) {
cmds[nav.cmd] = new KeyCommand(0, nav.key, nav.help) {
@Override @Override
public void onKeyPress(KeyPressEvent event) { public void onKeyPress(KeyPressEvent event) {
next.go(); link.go();
} }
}; };
keys.add(nextKey);
}
table.setWidget(0, 2, next);
} else { } else {
if (keys != null) { cmds[nav.cmd] = new UpToChangeCommand(changeId, 0, nav.key);
nextKey = new UpToChangeCommand(changeId, 0, ']');
keys.add(nextKey);
} }
table.clearCell(0, 2);
keys.add(cmds[nav.cmd]);
} }
} }
} }