opendev/gerrit
Code Issues Proposed changes

SideBySide2: Clarify diffChunkNav direction

Browse Source 
Instead of abusing a boolean true as previous and false as next,
define an enum with symbols PREV and NEXT, making it more clear
which direction navigation will go in the file.

Change-Id: I61f2279aa1239ce88727235d88e125fc0cec1ee9
This commit is contained in:
Shawn Pearce
2013-12-19 08:29:23 -08:00
parent 52f9f55ba9
commit 08ff593446
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Direction.java Normal file
View File

@@ -0,0 +1,20 @@
// Copyright (C) 2013 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.client.diff;
/** Direction of traversal in an ordered list. */
public enum Direction {
PREV, NEXT
}

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
View File

@@ -353,7 +353,7 @@ public class SideBySide2 extends Screen {
.on("Enter", toggleOpenBox(cm))
.on("'c'", insertNewDraft(cm))
.on("N", maybeNextVimSearch(cm))
.on("P", diffChunkNav(cm, true))
.on("P", diffChunkNav(cm, Direction.PREV))
.on("Shift-O", openClosePublished(cm))
.on("Shift-Left", moveCursorToSide(cm, DisplaySide.A))
.on("Shift-Right", moveCursorToSide(cm, DisplaySide.B))
@@ -1467,13 +1467,13 @@ public class SideBySide2 extends Screen {
if (cm.hasVimSearchHighlight()) {
CodeMirror.handleVimKey(cm, "n");
} else {
diffChunkNav(cm, false).run();
diffChunkNav(cm, Direction.NEXT).run();
}
}
};
}
private Runnable diffChunkNav(final CodeMirror cm, final boolean prev) {
private Runnable diffChunkNav(final CodeMirror cm, final Direction dir) {
return new Runnable() {
@Override
public void run() {
@@ -1483,9 +1483,9 @@ public class SideBySide2 extends Screen {
new DiffChunkInfo(getSideFromCm(cm), line, 0, false),
getDiffChunkComparator());
if (res < 0) {
res = -res - (prev ? 1 : 2);
res = -res - (dir == Direction.PREV ? 1 : 2);
}
res = res + (prev ? -1 : 1);
res = res + (dir == Direction.PREV ? -1 : 1);
if (res < 0 || diffChunks.size() <= res) {
return;
}
@@ -1493,7 +1493,7 @@ public class SideBySide2 extends Screen {
DiffChunkInfo lookUp = diffChunks.get(res);
// If edit, skip the deletion chunk and set focus on the insertion one.
if (lookUp.isEdit() && lookUp.getSide() == DisplaySide.A) {
res = res + (prev ? -1 : 1);
res = res + (dir == Direction.PREV ? -1 : 1);
if (res < 0 || diffChunks.size() <= res) {
return;
}