opendev/gerrit
Code Issues Proposed changes

Format all files with google-java-format

Browse Source 
Change-Id: I27e8e1d16ad5f127c8634b22a8ec949bb34a3008
This commit is contained in:
Dave Borowitz
2017-06-27 09:45:05 -04:00
parent c72b3a0cc1
commit 1363061b62
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java
View File

@@ -542,16 +542,24 @@ public class EditScreen extends Screen {
}
}
Configuration cfg = Configuration.create().set("autoCloseBrackets", prefs.autoCloseBrackets())
.set("cursorBlinkRate", prefs.cursorBlinkRate()).set("cursorHeight", 0.85)
.set("indentUnit", prefs.indentUnit())
.set("keyMap", prefs.keyMapType().name().toLowerCase())
.set("lineNumbers", prefs.hideLineNumbers()).set("lineWrapping", false)
.set("matchBrackets", prefs.matchBrackets()).set("mode", mode != null ? mode.mime() : null)
.set("origLeft", editContent).set("scrollbarStyle", "overlay")
.set("showTrailingSpace", prefs.showWhitespaceErrors()).set("styleSelectedText", true)
.set("tabSize", prefs.tabSize()).set("theme", prefs.theme().name().toLowerCase())
.set("value", "");
Configuration cfg =
Configuration.create()
.set("autoCloseBrackets", prefs.autoCloseBrackets())
.set("cursorBlinkRate", prefs.cursorBlinkRate())
.set("cursorHeight", 0.85)
.set("indentUnit", prefs.indentUnit())
.set("keyMap", prefs.keyMapType().name().toLowerCase())
.set("lineNumbers", prefs.hideLineNumbers())
.set("lineWrapping", false)
.set("matchBrackets", prefs.matchBrackets())
.set("mode", mode != null ? mode.mime() : null)
.set("origLeft", editContent)
.set("scrollbarStyle", "overlay")
.set("showTrailingSpace", prefs.showWhitespaceErrors())
.set("styleSelectedText", true)
.set("tabSize", prefs.tabSize())
.set("theme", prefs.theme().name().toLowerCase())
.set("value", "");
if (editContent.contains("\r\n")) {
cfg.set("lineSeparator", "\r\n");

1
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommitsExecutorModule.java
View File

@@ -25,7 +25,6 @@ import com.google.inject.Singleton;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.lib.Config;

9
gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
View File

@@ -282,8 +282,7 @@ public class RefControl {
String msg =
String.format(
"RevWalk(%s) for pushing tag %s:",
projectControl.getProject().getNameKey(),
tag.name());
projectControl.getProject().getNameKey(), tag.name());
log.error(msg, e);
return "I/O exception for revwalk";
@@ -333,8 +332,8 @@ public class RefControl {
}
/**
* Check if the user is allowed to create a new commit object if this introduces a new commit
* to the project. If not allowed, returns a string describing why it's not allowed.
* Check if the user is allowed to create a new commit object if this introduces a new commit to
* the project. If not allowed, returns a string describing why it's not allowed.
*/
@Nullable
private String canCreateCommit(Repository repo, RevCommit commit) {
@@ -349,7 +348,7 @@ public class RefControl {
// even if they don't have push permission.
return null;
}
return "lacks permission " + Permission.PUSH + " for creating new commit object";
return "lacks permission " + Permission.PUSH + " for creating new commit object";
}
private boolean isMergedIntoBranchOrTag(Repository repo, RevCommit commit) {