opendev/gerrit
Code Issues Proposed changes

Drop '2' suffix from CS2, SBS2

Browse Source 
Now that CS1 and SBS1 have been deleted, the suffixes of "2" on
a lot of classes is unncessary and confusing. Drop the suffix.

Change-Id: Icb8c4797f59f259601f4e436bd2f04a13a904bbc
This commit is contained in:
Shawn Pearce
2015-01-15 10:33:22 -08:00
parent e89a887d19
commit 0ddfb83db9
34 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/dev-eclipse.txt
View File

@@ -63,7 +63,7 @@ link:http://www.gwtproject.org/articles/superdevmode.html[Super Dev Mode].
as a bookmarklet).
* Navigate on the left to: sourcemaps/gerrit_ui folder (`Ctrl+O` key shortcut
can be used)
* Select a file, for example com.google.gerrit.client.change.ChangeScreen2
* Select a file, for example com.google.gerrit.client.change.ChangeScreen
and put a breakpoint
* Navigate in application in change screen and confirm hitting the breakpoint
* Select `Dev Mode Off` when the debugging session is finished

24
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -65,7 +65,7 @@ import com.google.gerrit.client.admin.ProjectInfoScreen;
import com.google.gerrit.client.admin.ProjectListScreen;
import com.google.gerrit.client.admin.ProjectScreen;
import com.google.gerrit.client.api.ExtensionScreen;
import com.google.gerrit.client.change.ChangeScreen2;
import com.google.gerrit.client.change.ChangeScreen;
import com.google.gerrit.client.change.FileTable;
import com.google.gerrit.client.changes.AccountDashboardScreen;
import com.google.gerrit.client.changes.CustomDashboardScreen;
@@ -74,7 +74,7 @@ import com.google.gerrit.client.changes.QueryScreen;
import com.google.gerrit.client.dashboards.DashboardInfo;
import com.google.gerrit.client.dashboards.DashboardList;
import com.google.gerrit.client.diff.DisplaySide;
import com.google.gerrit.client.diff.SideBySide2;
import com.google.gerrit.client.diff.SideBySide;
import com.google.gerrit.client.documentation.DocScreen;
import com.google.gerrit.client.editor.EditScreen;
import com.google.gerrit.client.groups.GroupApi;
@@ -518,7 +518,7 @@ public class Dispatcher {
panel = null;
}
Gerrit.display(token, panel == null
? new ChangeScreen2(id, null, null, false, mode)
? new ChangeScreen(id, null, null, false, mode)
: new NotFoundScreen());
return;
}
@@ -560,7 +560,7 @@ public class Dispatcher {
} else {
if (panel == null) {
Gerrit.display(token,
new ChangeScreen2(id,
new ChangeScreen(id,
base != null
? String.valueOf(base.get())
: null,
@@ -600,16 +600,16 @@ public class Dispatcher {
if ("".equals(panel) || /* DEPRECATED URL */"cm".equals(panel)) {
if (preferUnified()) {
unified1(token, baseId, id);
unified(token, baseId, id);
} else {
sbs2(token, baseId, id, side, line, false);
sbs(token, baseId, id, side, line, false);
}
} else if ("sidebyside".equals(panel)) {
sbs2(token, null, id, side, line, false);
sbs(token, null, id, side, line, false);
} else if ("unified".equals(panel)) {
unified1(token, baseId, id);
unified(token, baseId, id);
} else if ("edit".equals(panel)) {
sbs2(token, null, id, side, line, true);
sbs(token, null, id, side, line, true);
} else {
Gerrit.display(token, new NotFoundScreen());
}
@@ -622,7 +622,7 @@ public class Dispatcher {
.getDiffView());
}
private static void unified1(final String token,
private static void unified(final String token,
final PatchSet.Id baseId,
final Patch.Key id) {
GWT.runAsync(new AsyncSplit(token) {
@@ -634,7 +634,7 @@ public class Dispatcher {
});
}
private static void sbs2(final String token, final PatchSet.Id baseId,
private static void sbs(final String token, final PatchSet.Id baseId,
final Patch.Key id, final DisplaySide side, final int line,
final boolean edit) {
GWT.runAsync(new AsyncSplit(token) {
@@ -642,7 +642,7 @@ public class Dispatcher {
public void onSuccess() {
Gerrit.display(token, edit
? new EditScreen(id)
: new SideBySide2(baseId, id.getParentKey(), id.get(), side, line));
: new SideBySide(baseId, id.getParentKey(), id.get(), side, line));
}
});
}

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/AddFileAction.java
View File

@@ -26,14 +26,14 @@ import com.google.gwtexpui.user.client.PluginSafePopupPanel;
class AddFileAction {
private final Change.Id changeId;
private final RevisionInfo revision;
private final ChangeScreen2.Style style;
private final ChangeScreen.Style style;
private final Widget addButton;
private AddFileBox addBox;
private PopupPanel popup;
AddFileAction(Change.Id changeId, RevisionInfo revision,
ChangeScreen2.Style style, Widget addButton) {
ChangeScreen.Style style, Widget addButton) {
this.changeId = changeId;
this.revision = revision;
this.style = style;

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.java → gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -99,8 +99,8 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
public class ChangeScreen2 extends Screen {
interface Binder extends UiBinder<HTMLPanel, ChangeScreen2> {}
public class ChangeScreen extends Screen {
interface Binder extends UiBinder<HTMLPanel, ChangeScreen> {}
private static final Binder uiBinder = GWT.create(Binder.class);
interface Style extends CssResource {
@@ -116,12 +116,12 @@ public class ChangeScreen2 extends Screen {
String hashtagName();
}
static ChangeScreen2 get(NativeEvent in) {
static ChangeScreen get(NativeEvent in) {
Element e = in.getEventTarget().cast();
for (e = DOM.getParent(e); e != null; e = DOM.getParent(e)) {
EventListener l = DOM.getEventListener(e);
if (l instanceof ChangeScreen2) {
return (ChangeScreen2) l;
if (l instanceof ChangeScreen) {
return (ChangeScreen) l;
}
}
return null;
@@ -201,7 +201,7 @@ public class ChangeScreen2 extends Screen {
private DownloadAction downloadAction;
private AddFileAction addFileAction;
public ChangeScreen2(Change.Id changeId, String base, String revision,
public ChangeScreen(Change.Id changeId, String base, String revision,
boolean openReplyBox, FileTable.Mode mode) {
this.changeId = changeId;
this.base = normalize(base);

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml → gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.ui.xml
View File

@@ -21,7 +21,7 @@ limitations under the License.
xmlns:x='urn:import:com.google.gerrit.client.ui'>
<ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
<ui:with field='res' type='com.google.gerrit.client.change.Resources'/>
<ui:style type='com.google.gerrit.client.change.ChangeScreen2.Style'>
<ui:style type='com.google.gerrit.client.change.ChangeScreen.Style'>
@eval textColor com.google.gerrit.client.Gerrit.getTheme().textColor;
@eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/DownloadAction.java
View File

@@ -25,7 +25,7 @@ class DownloadAction extends RightSidePopdownAction {
DownloadAction(
ChangeInfo info,
String revision,
ChangeScreen2.Style style,
ChangeScreen.Style style,
UIObject relativeTo,
Widget downloadButton) {
super(style, relativeTo, downloadButton);

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
View File

@@ -179,7 +179,7 @@ public class FileTable extends FlowPanel {
private boolean register;
private JsArrayString reviewed;
private String scrollToPath;
private ChangeScreen2.Style style;
private ChangeScreen.Style style;
private Widget replyButton;
private boolean editExists;
private Mode mode;
@@ -190,7 +190,7 @@ public class FileTable extends FlowPanel {
R.css().ensureInjected();
}
public void set(PatchSet.Id base, PatchSet.Id curr, ChangeScreen2.Style style,
public void set(PatchSet.Id base, PatchSet.Id curr, ChangeScreen.Style style,
Widget replyButton, Mode mode, boolean editExists) {
this.base = base;
this.curr = curr;

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
View File

@@ -65,7 +65,7 @@ public class Hashtags extends Composite {
private static void onRemove(NativeEvent event) {
String hashtags = getDataId(event);
if (hashtags != null) {
final ChangeScreen2 screen = ChangeScreen2.get(event);
final ChangeScreen screen = ChangeScreen.get(event);
ChangeApi.hashtags(screen.getChangeId().get()).post(
PostInput.create(null, hashtags), new GerritCallback<JavaScriptObject>() {
@Override
@@ -96,7 +96,7 @@ public class Hashtags extends Composite {
@UiField Element error;
@UiField NpTextBox hashtagTextBox;
private ChangeScreen2.Style style;
private ChangeScreen.Style style;
private Change.Id changeId;
public Hashtags() {
@@ -116,7 +116,7 @@ public class Hashtags extends Composite {
});
}
void init(ChangeScreen2.Style style){
void init(ChangeScreen.Style style){
this.style = style;
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/History.java
View File

@@ -65,7 +65,7 @@ class History extends FlowPanel {
}
add(ui);
}
autoOpen(ChangeScreen2.myLastReply(info));
autoOpen(ChangeScreen.myLastReply(info));
}
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/IncludedInAction.java
View File

@@ -23,7 +23,7 @@ class IncludedInAction extends RightSidePopdownAction {
IncludedInAction(
Change.Id changeId,
ChangeScreen2.Style style,
ChangeScreen.Style style,
UIObject relativeTo,
Widget includedInButton) {
super(style, relativeTo, includedInButton);

8
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
View File

@@ -64,7 +64,7 @@ class Labels extends Grid {
private static void onRemove(NativeEvent event) {
Integer user = getDataId(event);
if (user != null) {
final ChangeScreen2 screen = ChangeScreen2.get(event);
final ChangeScreen screen = ChangeScreen.get(event);
ChangeApi.reviewer(screen.getChangeId().get(), user).delete(
new GerritCallback<JavaScriptObject>() {
@Override
@@ -89,9 +89,9 @@ class Labels extends Grid {
return null;
}
private ChangeScreen2.Style style;
private ChangeScreen.Style style;
void init(ChangeScreen2.Style style) {
void init(ChangeScreen.Style style) {
this.style = style;
}
@@ -194,7 +194,7 @@ class Labels extends Grid {
}
}
static SafeHtml formatUserList(ChangeScreen2.Style style,
static SafeHtml formatUserList(ChangeScreen.Style style,
Collection<? extends AccountInfo> in,
Set<Integer> removable,
Map<Integer, VotableInfo> votable) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PatchSetsAction.java
View File

@@ -24,7 +24,7 @@ class PatchSetsAction extends RightSidePopdownAction {
PatchSetsAction(
Change.Id changeId,
String revision,
ChangeScreen2.Style style,
ChangeScreen.Style style,
UIObject relativeTo,
Widget downloadButton) {
super(style, relativeTo, downloadButton);

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ReplyAction.java
View File

@@ -33,7 +33,7 @@ import com.google.gwtexpui.user.client.PluginSafePopupPanel;
class ReplyAction {
private final PatchSet.Id psId;
private final String revision;
private final ChangeScreen2.Style style;
private final ChangeScreen.Style style;
private final CommentLinkProcessor clp;
private final Widget replyButton;
private final Widget quickApproveButton;
@@ -47,7 +47,7 @@ class ReplyAction {
ReplyAction(
ChangeInfo info,
String revision,
ChangeScreen2.Style style,
ChangeScreen.Style style,
CommentLinkProcessor clp,
Widget replyButton,
Widget quickApproveButton) {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java
View File

@@ -67,7 +67,7 @@ public class Reviewers extends Composite {
@UiField(provided = true)
RemoteSuggestBox suggestBox;
private ChangeScreen2.Style style;
private ChangeScreen.Style style;
private Element ccText;
private ReviewerSuggestOracle reviewerSuggestOracle;
@@ -94,7 +94,7 @@ public class Reviewers extends Composite {
initWidget(uiBinder.createAndBindUi(this));
}
void init(ChangeScreen2.Style style, Element ccText) {
void init(ChangeScreen.Style style, Element ccText) {
this.style = style;
this.ccText = ccText;
}

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RightSidePopdownAction.java
View File

@@ -26,13 +26,13 @@ import com.google.gwtexpui.globalkey.client.GlobalKey;
import com.google.gwtexpui.user.client.PluginSafePopupPanel;
abstract class RightSidePopdownAction {
private final ChangeScreen2.Style style;
private final ChangeScreen.Style style;
private final Widget button;
private final UIObject relativeTo;
private PopupPanel popup;
RightSidePopdownAction(
ChangeScreen2.Style style,
ChangeScreen.Style style,
UIObject relativeTo,
Widget button) {
this.style = style;

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/UpdateCheckTimer.java
View File

@@ -28,11 +28,11 @@ class UpdateCheckTimer extends Timer implements ValueChangeHandler<Boolean> {
private static final int POLL_PERIOD =
Gerrit.getConfig().getChangeUpdateDelay() * 1000;
private final ChangeScreen2 screen;
private final ChangeScreen screen;
private int delay;
private boolean running;
UpdateCheckTimer(ChangeScreen2 screen) {
UpdateCheckTimer(ChangeScreen screen) {
this.screen = screen;
this.delay = POLL_PERIOD;
}

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
View File

@@ -32,10 +32,10 @@ import java.util.EnumSet;
public class AccountDashboardScreen extends Screen implements ChangeListScreen {
private final Account.Id ownerId;
private final boolean mine;
private ChangeTable2 table;
private ChangeTable2.Section outgoing;
private ChangeTable2.Section incoming;
private ChangeTable2.Section closed;
private ChangeTable table;
private ChangeTable.Section outgoing;
private ChangeTable.Section incoming;
private ChangeTable.Section closed;
public AccountDashboardScreen(final Account.Id id) {
ownerId = id;
@@ -45,7 +45,7 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen {
@Override
protected void onInitUI() {
super.onInitUI();
table = new ChangeTable2() {
table = new ChangeTable() {
{
keysNavigation.add(new KeyCommand(0, 'R', Util.C.keyReloadSearch()) {
@Override
@@ -57,9 +57,9 @@ public class AccountDashboardScreen extends Screen implements ChangeListScreen {
};
table.addStyleName(Gerrit.RESOURCES.css().accountDashboard());
outgoing = new ChangeTable2.Section();
incoming = new ChangeTable2.Section();
closed = new ChangeTable2.Section();
outgoing = new ChangeTable.Section();
incoming = new ChangeTable.Section();
closed = new ChangeTable.Section();
outgoing.setTitleText(Util.C.outgoingReviews());
incoming.setTitleText(Util.C.incomingReviews());

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java → gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
View File

@@ -47,7 +47,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
public class ChangeTable2 extends NavigationTable<ChangeInfo> {
public class ChangeTable extends NavigationTable<ChangeInfo> {
private static final int C_STAR = 1;
private static final int C_ID = 2;
private static final int C_SUBJECT = 3;
@@ -64,7 +64,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
private boolean showLegacyId;
private List<String> labelNames;
public ChangeTable2() {
public ChangeTable() {
super(Util.C.changeItemHelp());
columns = BASE_COLUMNS;
labelNames = Collections.emptyList();
@@ -462,7 +462,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
}
public static class Section {
ChangeTable2 parent;
ChangeTable parent;
String titleText;
Widget titleWidget;
int titleRow = -1;

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/DashboardTable.java
View File

@@ -31,7 +31,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.ListIterator;
public class DashboardTable extends ChangeTable2 {
public class DashboardTable extends ChangeTable {
private List<Section> sections;
private String title;
private List<String> titles;

8
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PagedSingleListScreen.java
View File

@@ -31,8 +31,8 @@ public abstract class PagedSingleListScreen extends Screen {
private final String anchorPrefix;
protected ChangeList changes;
private ChangeTable2 table;
private ChangeTable2.Section section;
private ChangeTable table;
private ChangeTable.Section section;
private Hyperlink prev;
private Hyperlink next;
@@ -59,7 +59,7 @@ public abstract class PagedSingleListScreen extends Screen {
next = new Hyperlink(Util.C.pagedChangeListNext(), true, "");
next.setVisible(false);
table = new ChangeTable2() {
table = new ChangeTable() {
{
keysNavigation.add(
new DoLinkCommand(0, 'p', Util.C.changeTablePagePrev(), prev),
@@ -77,7 +77,7 @@ public abstract class PagedSingleListScreen extends Screen {
});
}
};
section = new ChangeTable2.Section();
section = new ChangeTable.Section();
table.addSection(section);
table.setSavePointerId(anchorPrefix);
add(table);

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java
View File

@@ -41,7 +41,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
/** Colors modified regions for {@link SideBySide2}. */
/** Colors modified regions for {@link SideBySide}. */
class ChunkManager {
private static final String DATA_LINES = "_cs2h";
private static double guessedLineHeightPx = 15;
@@ -59,8 +59,8 @@ class ChunkManager {
Element e = Element.as(event.getEventTarget());
for (e = DOM.getParent(e); e != null; e = DOM.getParent(e)) {
EventListener l = DOM.getEventListener(e);
if (l instanceof SideBySide2) {
((SideBySide2) l).getCmFromSide(side).focus();
if (l instanceof SideBySide) {
((SideBySide) l).getCmFromSide(side).focus();
event.stopPropagation();
}
}
@@ -73,7 +73,7 @@ class ChunkManager {
private static final native void onClick(Element e, JavaScriptObject f)
/*-{ e.onclick = f }-*/;
private final SideBySide2 host;
private final SideBySide host;
private final CodeMirror cmA;
private final CodeMirror cmB;
private final Scrollbar scrollbar;
@@ -85,7 +85,7 @@ class ChunkManager {
private List<LineWidget> padding;
private List<Element> paddingDivs;
ChunkManager(SideBySide2 host,
ChunkManager(SideBySide host,
CodeMirror cmA,
CodeMirror cmB,
Scrollbar scrollbar) {

8
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java
View File

@@ -38,9 +38,9 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
/** Tracks comment widgets for {@link SideBySide2}. */
/** Tracks comment widgets for {@link SideBySide}. */
class CommentManager {
private final SideBySide2 host;
private final SideBySide host;
private final PatchSet.Id base;
private final PatchSet.Id revision;
private final String path;
@@ -53,7 +53,7 @@ class CommentManager {
private boolean attached;
private boolean expandAll;
CommentManager(SideBySide2 host,
CommentManager(SideBySide host,
PatchSet.Id base, PatchSet.Id revision,
String path,
CommentLinkProcessor clp) {
@@ -69,7 +69,7 @@ class CommentManager {
unsavedDrafts = new HashSet<>();
}
SideBySide2 getSideBySide2() {
SideBySide getSideBySide() {
return host;
}

14
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.java
View File

@@ -68,23 +68,23 @@ class DiffTable extends Composite {
@UiField static DiffTableStyle style;
@UiField(provided = true)
PatchSetSelectBox2 patchSetSelectBoxA;
PatchSetSelectBox patchSetSelectBoxA;
@UiField(provided = true)
PatchSetSelectBox2 patchSetSelectBoxB;
PatchSetSelectBox patchSetSelectBoxB;
private SideBySide2 parent;
private SideBySide parent;
private boolean header;
private boolean visibleA;
private ChangeType changeType;
DiffTable(SideBySide2 parent, PatchSet.Id base, PatchSet.Id revision,
DiffTable(SideBySide parent, PatchSet.Id base, PatchSet.Id revision,
String path) {
patchSetSelectBoxA = new PatchSetSelectBox2(
patchSetSelectBoxA = new PatchSetSelectBox(
parent, DisplaySide.A, revision.getParentKey(), base, path);
patchSetSelectBoxB = new PatchSetSelectBox2(
patchSetSelectBoxB = new PatchSetSelectBox(
parent, DisplaySide.B, revision.getParentKey(), revision, path);
PatchSetSelectBox2.link(patchSetSelectBoxA, patchSetSelectBoxB);
PatchSetSelectBox.link(patchSetSelectBoxA, patchSetSelectBoxB);
initWidget(uiBinder.createAndBindUi(this));
this.scrollbar = new Scrollbar(this);

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffTable.ui.xml
View File

@@ -157,10 +157,10 @@ limitations under the License.
<table class='{style.table}'>
<tr ui:field='patchSetNavRow' class='{style.patchSetNav}'>
<td ui:field='patchSetNavCellA' class='{style.psNavA}'>
<d:PatchSetSelectBox2 ui:field='patchSetSelectBoxA' />
<d:PatchSetSelectBox ui:field='patchSetSelectBoxA' />
</td>
<td ui:field='patchSetNavCellB' class='{style.psNavB}'>
<d:PatchSetSelectBox2 ui:field='patchSetSelectBoxB' />
<d:PatchSetSelectBox ui:field='patchSetSelectBoxB' />
</td>
</tr>
<tr ui:field='diffHeaderRow' class='{style.diff_header}'>

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.java
View File

@@ -287,7 +287,7 @@ public class Header extends Composite {
return k;
} else {
link.getElement().getStyle().setVisibility(Visibility.HIDDEN);
keys.add(new UpToChangeCommand2(patchSetId, 0, key));
keys.add(new UpToChangeCommand(patchSetId, 0, key));
return null;
}
}

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.java → gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.java
View File

@@ -42,8 +42,8 @@ import com.google.gwtorm.client.KeyUtil;
import java.util.List;
/** HTMLPanel to select among patch sets */
class PatchSetSelectBox2 extends Composite {
interface Binder extends UiBinder<HTMLPanel, PatchSetSelectBox2> {}
class PatchSetSelectBox extends Composite {
interface Binder extends UiBinder<HTMLPanel, PatchSetSelectBox> {}
private static final Binder uiBinder = GWT.create(Binder.class);
interface BoxStyle extends CssResource {
@@ -54,16 +54,16 @@ class PatchSetSelectBox2 extends Composite {
@UiField HTMLPanel linkPanel;
@UiField BoxStyle style;
private SideBySide2 parent;
private SideBySide parent;
private DisplaySide side;
private boolean sideA;
private String path;
private Change.Id changeId;
private PatchSet.Id revision;
private PatchSet.Id idActive;
private PatchSetSelectBox2 other;
private PatchSetSelectBox other;
PatchSetSelectBox2(SideBySide2 parent,
PatchSetSelectBox(SideBySide parent,
DisplaySide side,
Change.Id changeId,
PatchSet.Id revision,
@@ -133,7 +133,7 @@ class PatchSetSelectBox2 extends Composite {
return anchor;
}
static void link(PatchSetSelectBox2 a, PatchSetSelectBox2 b) {
static void link(PatchSetSelectBox a, PatchSetSelectBox b) {
a.other = b;
b.other = a;
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox2.ui.xml → gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PatchSetSelectBox.ui.xml
View File

@@ -20,7 +20,7 @@ limitations under the License.
<ui:with field='res' type='com.google.gerrit.client.GerritResources'/>
<ui:with field='patchConstants'
type='com.google.gerrit.client.patches.PatchConstants'/>
<ui:style type='com.google.gerrit.client.diff.PatchSetSelectBox2.BoxStyle'>
<ui:style type='com.google.gerrit.client.diff.PatchSetSelectBox.BoxStyle'>
@eval selectionColor com.google.gerrit.client.Gerrit.getTheme().selectionColor;
@eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;
.table {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesAction.java
View File

@@ -22,13 +22,13 @@ import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
import com.google.gwt.user.client.ui.Widget;
class PreferencesAction {
private final SideBySide2 view;
private final SideBySide view;
private final DiffPreferences prefs;
private PopupPanel popup;
private PreferencesBox current;
private Widget partner;
PreferencesAction(SideBySide2 view, DiffPreferences prefs) {
PreferencesAction(SideBySide view, DiffPreferences prefs) {
this.view = view;
this.prefs = prefs;
}

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java
View File

@@ -70,7 +70,7 @@ class PreferencesBox extends Composite {
String dialog();
}
private final SideBySide2 view;
private final SideBySide view;
private DiffPreferences prefs;
private int contextLastValue;
private Timer updateContextTimer;
@@ -99,7 +99,7 @@ class PreferencesBox extends Composite {
@UiField Button apply;
@UiField Button save;
PreferencesBox(SideBySide2 view) {
PreferencesBox(SideBySide view) {
this.view = view;
initWidget(uiBinder.createAndBindUi(this));

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PublishedBox.java
View File

@@ -149,7 +149,7 @@ class PublishedBox extends CommentBox {
void doReply() {
if (!Gerrit.isSignedIn()) {
Gerrit.doSignIn(getCommentManager().getSideBySide2().getToken());
Gerrit.doSignIn(getCommentManager().getSideBySide().getToken());
} else if (replyBox == null) {
addReplyBox();
} else {
@@ -179,7 +179,7 @@ class PublishedBox extends CommentBox {
void onReplyDone(ClickEvent e) {
e.stopPropagation();
if (!Gerrit.isSignedIn()) {
Gerrit.doSignIn(getCommentManager().getSideBySide2().getToken());
Gerrit.doSignIn(getCommentManager().getSideBySide().getToken());
} else if (replyBox == null) {
done.setEnabled(false);
CommentInfo input = CommentInfo.createReply(comment);

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java → gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java
View File

@@ -21,7 +21,7 @@ import com.google.gerrit.client.Dispatcher;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.JumpKeys;
import com.google.gerrit.client.account.DiffPreferences;
import com.google.gerrit.client.change.ChangeScreen2;
import com.google.gerrit.client.change.ChangeScreen;
import com.google.gerrit.client.change.FileTable;
import com.google.gerrit.client.changes.ChangeApi;
import com.google.gerrit.client.changes.ChangeInfo;
@@ -85,11 +85,11 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
public class SideBySide2 extends Screen {
public class SideBySide extends Screen {
private static final KeyMap RENDER_ENTIRE_FILE_KEYMAP = KeyMap.create()
.propagate("Ctrl-F");
interface Binder extends UiBinder<FlowPanel, SideBySide2> {}
interface Binder extends UiBinder<FlowPanel, SideBySide> {}
private static final Binder uiBinder = GWT.create(Binder.class);
enum FileSize {
@@ -137,7 +137,7 @@ public class SideBySide2 extends Screen {
private PreferencesAction prefsAction;
private int reloadVersionId;
public SideBySide2(
public SideBySide(
PatchSet.Id base,
PatchSet.Id revision,
String path,
@@ -255,11 +255,11 @@ public class SideBySide2 extends Screen {
}));
ConfigInfoCache.get(changeId, group2.addFinal(
new ScreenLoadCallback<ConfigInfoCache.Entry>(SideBySide2.this) {
new ScreenLoadCallback<ConfigInfoCache.Entry>(SideBySide.this) {
@Override
protected void preDisplay(ConfigInfoCache.Entry result) {
commentManager = new CommentManager(
SideBySide2.this,
SideBySide.this,
base, revision, path,
result.getCommentLinkProcessor());
setTheme(result.getTheme());
@@ -471,7 +471,7 @@ public class SideBySide2 extends Screen {
public void registerKeys() {
super.registerKeys();
keysNavigation.add(new UpToChangeCommand2(revision, 0, 'u'));
keysNavigation.add(new UpToChangeCommand(revision, 0, 'u'));
keysNavigation.add(
new NoOpKeyCommand(KeyCommand.M_SHIFT, KeyCodes.KEY_LEFT, PatchUtil.C.focusSideA()),
new NoOpKeyCommand(KeyCommand.M_SHIFT, KeyCodes.KEY_RIGHT, PatchUtil.C.focusSideB()));
@@ -855,7 +855,7 @@ public class SideBySide2 extends Screen {
String rev = revision.getId();
Gerrit.display(
PageLinks.toChange(changeId, b, rev),
new ChangeScreen2(changeId, b, rev, openReplyBox,
new ChangeScreen(changeId, b, rev, openReplyBox,
FileTable.Mode.REVIEW));
}
});

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.ui.xml → gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.ui.xml
View File

@@ -18,12 +18,12 @@ limitations under the License.
xmlns:g='urn:import:com.google.gwt.user.client.ui'
xmlns:d='urn:import:com.google.gerrit.client.diff'>
<ui:style>
.sbs2 {
.sbs {
margin-left: -5px;
margin-right: -5px;
}
</ui:style>
<g:FlowPanel styleName='{style.sbs2}'>
<g:FlowPanel styleName='{style.sbs}'>
<d:Header ui:field='header'/>
<d:DiffTable ui:field='diffTable'/>
</g:FlowPanel>

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SkipManager.java
View File

@@ -26,14 +26,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** Collapses common regions with {@link SkipBar} for {@link SideBySide2}. */
/** Collapses common regions with {@link SkipBar} for {@link SideBySide}. */
class SkipManager {
private final SideBySide2 host;
private final SideBySide host;
private final CommentManager commentManager;
private Set<SkipBar> skipBars;
private SkipBar line0;
SkipManager(SideBySide2 host, CommentManager commentManager) {
SkipManager(SideBySide host, CommentManager commentManager) {
this.host = host;
this.commentManager = commentManager;
}

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand2.java → gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UpToChangeCommand.java
View File

@@ -21,10 +21,10 @@ import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gwt.event.dom.client.KeyPressEvent;
import com.google.gwtexpui.globalkey.client.KeyCommand;
class UpToChangeCommand2 extends KeyCommand {
class UpToChangeCommand extends KeyCommand {
private final PatchSet.Id revision;
UpToChangeCommand2(PatchSet.Id revision, int mask, int key) {
UpToChangeCommand(PatchSet.Id revision, int mask, int key) {
super(mask, key, PatchUtil.C.upToChange());
this.revision = revision;
}