Merge "Add ExpandAllComments checkbox in PatchScreen"
This commit is contained in:
commit
9fb03c8bc9
|
@ -155,6 +155,10 @@ public class PatchScript {
|
|||
return intralineFailure;
|
||||
}
|
||||
|
||||
public boolean isExpandAllComments() {
|
||||
return diffPrefs.isExpandAllComments();
|
||||
}
|
||||
|
||||
public SparseFileContent getA() {
|
||||
return a;
|
||||
}
|
||||
|
|
|
@ -175,7 +175,7 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
|
|||
|
||||
protected abstract void onInsertComment(PatchLine pl);
|
||||
|
||||
public abstract void display(CommentDetail comments);
|
||||
public abstract void display(CommentDetail comments, boolean expandComments);
|
||||
|
||||
@Override
|
||||
protected MyFlexTable createFlexTable() {
|
||||
|
@ -529,7 +529,7 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
|
|||
}
|
||||
|
||||
protected void bindComment(final int row, final int col,
|
||||
final PatchLineComment line, final boolean isLast) {
|
||||
final PatchLineComment line, final boolean isLast, boolean expandComment) {
|
||||
if (line.getStatus() == PatchLineComment.Status.DRAFT) {
|
||||
final CommentEditorPanel plc = new CommentEditorPanel(line);
|
||||
plc.addFocusHandler(this);
|
||||
|
@ -541,6 +541,7 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
|
|||
final AccountInfo author = accountCache.get(line.getAuthor());
|
||||
final PublishedCommentPanel panel =
|
||||
new PublishedCommentPanel(author, line);
|
||||
panel.setOpen(expandComment);
|
||||
panel.addFocusHandler(this);
|
||||
panel.addBlurHandler(this);
|
||||
table.setWidget(row, col, panel);
|
||||
|
|
|
@ -438,7 +438,7 @@ public abstract class PatchScreen extends Screen implements
|
|||
|
||||
if (hasDifferences) {
|
||||
contentTable.display(patchKey, idSideA, idSideB, script);
|
||||
contentTable.display(script.getCommentDetail());
|
||||
contentTable.display(script.getCommentDetail(), script.isExpandAllComments());
|
||||
contentTable.finishDisplay();
|
||||
}
|
||||
showPatch(hasDifferences);
|
||||
|
|
|
@ -87,6 +87,9 @@ public class PatchScriptSettingsPanel extends Composite implements
|
|||
@UiField
|
||||
CheckBox skipUncommented;
|
||||
|
||||
@UiField
|
||||
CheckBox expandAllComments;
|
||||
|
||||
|
||||
@UiField
|
||||
Button update;
|
||||
|
@ -209,6 +212,7 @@ public class PatchScriptSettingsPanel extends Composite implements
|
|||
showTabs.setValue(dp.isShowTabs());
|
||||
skipDeleted.setValue(dp.isSkipDeleted());
|
||||
skipUncommented.setValue(dp.isSkipUncommented());
|
||||
expandAllComments.setValue(dp.isExpandAllComments());
|
||||
}
|
||||
|
||||
@UiHandler("update")
|
||||
|
@ -233,6 +237,7 @@ public class PatchScriptSettingsPanel extends Composite implements
|
|||
dp.setShowTabs(showTabs.getValue());
|
||||
dp.setSkipDeleted(skipDeleted.getValue());
|
||||
dp.setSkipUncommented(skipUncommented.getValue());
|
||||
dp.setExpandAllComments(expandAllComments.getValue());
|
||||
|
||||
listenablePrefs.set(dp);
|
||||
|
||||
|
|
|
@ -115,18 +115,27 @@ limitations under the License.
|
|||
</g:CheckBox>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<g:CheckBox
|
||||
ui:field='expandAllComments'
|
||||
text='Expand All Comments'
|
||||
tabIndex='9'>
|
||||
<ui:attribute name='text'/>
|
||||
</g:CheckBox>
|
||||
</td>
|
||||
|
||||
<td rowspan='2'>
|
||||
<g:CheckBox
|
||||
ui:field='skipUncommented'
|
||||
text='Skip Uncommented Files'
|
||||
tabIndex='9'>
|
||||
tabIndex='10'>
|
||||
<ui:attribute name='text'/>
|
||||
</g:CheckBox>
|
||||
<br/>
|
||||
<g:CheckBox
|
||||
ui:field='skipDeleted'
|
||||
text='Skip Deleted Files'
|
||||
tabIndex='10'>
|
||||
tabIndex='11'>
|
||||
<ui:attribute name='text'/>
|
||||
</g:CheckBox>
|
||||
</td>
|
||||
|
@ -136,7 +145,7 @@ limitations under the License.
|
|||
ui:field='update'
|
||||
text='Update'
|
||||
styleName='{style.updateButton}'
|
||||
tabIndex='11'>
|
||||
tabIndex='12'>
|
||||
<ui:attribute name='text'/>
|
||||
</g:Button>
|
||||
</td>
|
||||
|
@ -145,7 +154,7 @@ limitations under the License.
|
|||
<g:CheckBox
|
||||
ui:field='reviewed'
|
||||
text='Reviewed'
|
||||
tabIndex='12'>
|
||||
tabIndex='13'>
|
||||
<ui:attribute name='text'/>
|
||||
</g:CheckBox>
|
||||
</td>
|
||||
|
|
|
@ -186,7 +186,7 @@ public class SideBySideTable extends AbstractPatchContentTable {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void display(final CommentDetail cd) {
|
||||
public void display(final CommentDetail cd, boolean expandComments) {
|
||||
if (cd.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
@ -205,13 +205,13 @@ public class SideBySideTable extends AbstractPatchContentTable {
|
|||
final PatchLineComment ac = ai.next();
|
||||
final PatchLineComment bc = bi.next();
|
||||
insertRow(row);
|
||||
bindComment(row, COL_A, ac, !ai.hasNext());
|
||||
bindComment(row, COL_B, bc, !bi.hasNext());
|
||||
bindComment(row, COL_A, ac, !ai.hasNext(), expandComments);
|
||||
bindComment(row, COL_B, bc, !bi.hasNext(), expandComments);
|
||||
row++;
|
||||
}
|
||||
|
||||
row = finish(ai, row, COL_A);
|
||||
row = finish(bi, row, COL_B);
|
||||
row = finish(ai, row, COL_A, expandComments);
|
||||
row = finish(bi, row, COL_B, expandComments);
|
||||
} else {
|
||||
row++;
|
||||
}
|
||||
|
@ -228,11 +228,11 @@ public class SideBySideTable extends AbstractPatchContentTable {
|
|||
fmt.addStyleName(row, COL_B, Gerrit.RESOURCES.css().diffText());
|
||||
}
|
||||
|
||||
private int finish(final Iterator<PatchLineComment> i, int row, final int col) {
|
||||
private int finish(final Iterator<PatchLineComment> i, int row, final int col, boolean expandComment) {
|
||||
while (i.hasNext()) {
|
||||
final PatchLineComment c = i.next();
|
||||
insertRow(row);
|
||||
bindComment(row, col, c, !i.hasNext());
|
||||
bindComment(row, col, c, !i.hasNext(), expandComment);
|
||||
row++;
|
||||
}
|
||||
return row;
|
||||
|
|
|
@ -205,7 +205,7 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void display(final CommentDetail cd) {
|
||||
public void display(final CommentDetail cd, boolean expandComments) {
|
||||
if (cd.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
@ -224,13 +224,13 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
|
|||
all.addAll(fora);
|
||||
all.addAll(forb);
|
||||
Collections.sort(all, BY_DATE);
|
||||
row = insert(all, row);
|
||||
row = insert(all, row, expandComments);
|
||||
|
||||
} else if (!fora.isEmpty()) {
|
||||
row = insert(fora, row);
|
||||
row = insert(fora, row, expandComments);
|
||||
|
||||
} else if (!forb.isEmpty()) {
|
||||
row = insert(forb, row);
|
||||
row = insert(forb, row, expandComments);
|
||||
}
|
||||
} else {
|
||||
row++;
|
||||
|
@ -248,11 +248,11 @@ public class UnifiedDiffTable extends AbstractPatchContentTable {
|
|||
fmt.addStyleName(row, PC, Gerrit.RESOURCES.css().diffText());
|
||||
}
|
||||
|
||||
private int insert(final List<PatchLineComment> in, int row) {
|
||||
private int insert(final List<PatchLineComment> in, int row, boolean expandComment) {
|
||||
for (Iterator<PatchLineComment> ci = in.iterator(); ci.hasNext();) {
|
||||
final PatchLineComment c = ci.next();
|
||||
insertRow(row);
|
||||
bindComment(row, PC, c, !ci.hasNext());
|
||||
bindComment(row, PC, c, !ci.hasNext(), expandComment);
|
||||
row++;
|
||||
}
|
||||
return row;
|
||||
|
|
|
@ -102,6 +102,9 @@ public class AccountDiffPreference {
|
|||
@Column(id = 11)
|
||||
protected boolean skipUncommented;
|
||||
|
||||
@Column(id = 12)
|
||||
protected boolean expandAllComments;
|
||||
|
||||
protected AccountDiffPreference() {
|
||||
}
|
||||
|
||||
|
@ -120,6 +123,7 @@ public class AccountDiffPreference {
|
|||
this.showTabs = p.showTabs;
|
||||
this.skipDeleted = p.skipDeleted;
|
||||
this.skipUncommented = p.skipUncommented;
|
||||
this.expandAllComments = p.expandAllComments;
|
||||
this.context = p.context;
|
||||
}
|
||||
|
||||
|
@ -209,4 +213,12 @@ public class AccountDiffPreference {
|
|||
public void setSkipUncommented(boolean skip) {
|
||||
skipUncommented = skip;
|
||||
}
|
||||
|
||||
public boolean isExpandAllComments() {
|
||||
return expandAllComments;
|
||||
}
|
||||
|
||||
public void setExpandAllComments(boolean expand) {
|
||||
expandAllComments = expand;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ import java.util.List;
|
|||
/** A version of the database schema. */
|
||||
public abstract class SchemaVersion {
|
||||
/** The current schema version. */
|
||||
private static final Class<? extends SchemaVersion> C = Schema_53.class;
|
||||
private static final Class<? extends SchemaVersion> C = Schema_54.class;
|
||||
|
||||
public static class Module extends AbstractModule {
|
||||
@Override
|
||||
|
|
|
@ -0,0 +1,25 @@
|
|||
// Copyright (C) 2011 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.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
public class Schema_54 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_54(Provider<Schema_53> prior) {
|
||||
super(prior);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue