From 9875c00ed9366180ffcde6f221a17e1dc0e27bcb Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 30 Nov 2016 11:14:02 +0900 Subject: [PATCH] Organize imports Change-Id: I5c2644bc44b55c1a7284f164356082f35f6bab5f --- .../java/com/google/gerrit/lucene/LuceneChangeIndex.java | 1 - .../gerrit/server/account/GeneralPreferencesLoader.java | 5 ++--- .../com/google/gerrit/server/account/SetPreferences.java | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java index faddd6cbb0..e6d395c27b 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java @@ -21,7 +21,6 @@ import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID; import static com.google.gerrit.server.index.change.ChangeField.PROJECT; import static com.google.gerrit.server.index.change.ChangeIndexRewriter.CLOSED_STATUSES; import static com.google.gerrit.server.index.change.ChangeIndexRewriter.OPEN_STATUSES; - import static java.util.stream.Collectors.toList; import com.google.common.base.Throwables; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java index 1195c85664..24a0dae829 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java @@ -16,15 +16,14 @@ package com.google.gerrit.server.account; import static com.google.gerrit.server.config.ConfigUtil.loadSection; import static com.google.gerrit.server.config.ConfigUtil.skipField; +import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE; +import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE_COLUMN; import static com.google.gerrit.server.git.UserConfigSections.KEY_ID; import static com.google.gerrit.server.git.UserConfigSections.KEY_MATCH; import static com.google.gerrit.server.git.UserConfigSections.KEY_TARGET; import static com.google.gerrit.server.git.UserConfigSections.KEY_TOKEN; import static com.google.gerrit.server.git.UserConfigSections.KEY_URL; import static com.google.gerrit.server.git.UserConfigSections.URL_ALIAS; -import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE; -import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE_COLUMN; - import com.google.common.base.Strings; import com.google.common.collect.Lists; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java index 08b7b0bae2..3714cee7c0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java @@ -15,14 +15,13 @@ package com.google.gerrit.server.account; import static com.google.gerrit.server.config.ConfigUtil.storeSection; +import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE_COLUMN; import static com.google.gerrit.server.git.UserConfigSections.KEY_ID; import static com.google.gerrit.server.git.UserConfigSections.KEY_MATCH; import static com.google.gerrit.server.git.UserConfigSections.KEY_TARGET; import static com.google.gerrit.server.git.UserConfigSections.KEY_TOKEN; import static com.google.gerrit.server.git.UserConfigSections.KEY_URL; import static com.google.gerrit.server.git.UserConfigSections.URL_ALIAS; -import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE; -import static com.google.gerrit.server.git.UserConfigSections.CHANGE_TABLE_COLUMN; import com.google.common.base.Strings; import com.google.gerrit.extensions.client.GeneralPreferencesInfo;