opendev
/
gerrit
Code Issues Proposed changes

Update import order settings to list all top-level packages 

Eclipse installations disagree about where to put unmatched top-level
packages. Settle this ambiguity by listing all top-level packages used
by Gerrit. Also explicitly include unmatched static imports.

The import order thus listed corresponds to the Google Java Style
Guide:

https://google-styleguide.googlecode.com/svn/trunk/javaguide.html#s3.3.3-import-ordering-and-spacing

Organize all imports to reflect the new reality.

Change-Id: I7c541b1c522e66869669d2291dcf78ff1d8784d0
This commit is contained in:
Dave Borowitz 2015-03-23 17:28:53 -07:00
parent 6012ef5ee1
commit eac3acc3e0
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.jdt.ui.prefs
View File

@ -1,10 +1,9 @@
#Wed Jul 29 11:31:38 PDT 2009
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_Google Format
formatter_settings_version=11
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=com.google;com;junit;net;org;java;javax;
org.eclipse.jdt.ui.importorder=\#;com.google;com;dk;eu;junit;net;org;java;javax;
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.staticondemandthreshold=99
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>

1
gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
View File

@ -42,7 +42,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@Singleton

6
gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
View File

@ -34,6 +34,9 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.inject.Inject;
import com.google.inject.util.Providers;
import dk.brics.automaton.RegExp;
import dk.brics.automaton.RunAutomaton;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
@ -51,9 +54,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import dk.brics.automaton.RegExp;
import dk.brics.automaton.RunAutomaton;
public class ListBranches implements RestReadView<ProjectResource> {
private final GitRepositoryManager repoManager;
private final DynamicMap<RestView<BranchResource>> branchViews;

19
tools/gerrit.importorder
View File

@ -1,9 +1,12 @@
#Organize Import Order
#Wed Jan 14 10:19:45 JST 2015
6=javax
5=java
4=org
3=net
2=junit
1=com
0=com.google
#Mon Mar 23 17:27:34 PDT 2015
9=javax
8=java
7=org
6=net
5=junit
4=eu
3=dk
2=com
1=com.google
0=\#