Move PatchScriptSettings to .data package

This way its alongside its sibling PatchScript, as it really does
describe that class.

Signed-off-by: Shawn O. Pearce <sop@google.com>

9 files changed, 11 insertions, 10 deletions

diff --git a/src/main/java/com/google/gerrit/client/data/PatchScript.java b/src/main/java/com/google/gerrit/client/data/PatchScript.java
index bc78854684..656668cea3 100644
--- a/src/main/java/com/google/gerrit/client/data/PatchScript.java
+++ b/src/main/java/com/google/gerrit/client/data/PatchScript.java
@@ -15,7 +15,6 @@
 package com.google.gerrit.client.data;
 
 
-import com.google.gerrit.client.patches.PatchScriptSettings;
 
 import org.spearce.jgit.diff.Edit;
 
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchScriptSettings.java b/src/main/java/com/google/gerrit/client/data/PatchScriptSettings.java
index 17477163db..615f348c18 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchScriptSettings.java
+++ b/src/main/java/com/google/gerrit/client/data/PatchScriptSettings.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.client.patches;
+package com.google.gerrit.client.data;
 
 import com.google.gerrit.client.reviewdb.AccountGeneralPreferences;
 
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java b/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
index e3e3030858..5e80b7ea18 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.client.patches;
 
 import com.google.gerrit.client.data.PatchScript;
+import com.google.gerrit.client.data.PatchScriptSettings;
 import com.google.gerrit.client.reviewdb.ApprovalCategoryValue;
 import com.google.gerrit.client.reviewdb.Change;
 import com.google.gerrit.client.reviewdb.Patch;
diff --git a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java b/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
index 8b51e66249..ab93f82822 100644
--- a/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
+++ b/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
@@ -16,14 +16,15 @@ package com.google.gerrit.client.patches;
 
 import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.DEFAULT_CONTEXT;
 import static com.google.gerrit.client.reviewdb.AccountGeneralPreferences.WHOLE_FILE_CONTEXT;
-import static com.google.gerrit.client.patches.PatchScriptSettings.Whitespace.IGNORE_NONE;
-import static com.google.gerrit.client.patches.PatchScriptSettings.Whitespace.IGNORE_SPACE_CHANGE;
+import static com.google.gerrit.client.data.PatchScriptSettings.Whitespace.IGNORE_NONE;
+import static com.google.gerrit.client.data.PatchScriptSettings.Whitespace.IGNORE_SPACE_CHANGE;
 
 import com.google.gerrit.client.Gerrit;
 import com.google.gerrit.client.Link;
 import com.google.gerrit.client.changes.PatchTable;
 import com.google.gerrit.client.changes.Util;
 import com.google.gerrit.client.data.PatchScript;
+import com.google.gerrit.client.data.PatchScriptSettings;
 import com.google.gerrit.client.reviewdb.AccountGeneralPreferences;
 import com.google.gerrit.client.reviewdb.Change;
 import com.google.gerrit.client.reviewdb.Patch;
diff --git a/src/main/java/com/google/gerrit/git/PatchSetImporter.java b/src/main/java/com/google/gerrit/git/PatchSetImporter.java
index 4644c93496..de259bdd7c 100644
--- a/src/main/java/com/google/gerrit/git/PatchSetImporter.java
+++ b/src/main/java/com/google/gerrit/git/PatchSetImporter.java
@@ -14,7 +14,7 @@
 
 package com.google.gerrit.git;
 
-import static com.google.gerrit.client.patches.PatchScriptSettings.Whitespace.IGNORE_NONE;
+import static com.google.gerrit.client.data.PatchScriptSettings.Whitespace.IGNORE_NONE;
 
 import com.google.gerrit.client.reviewdb.Account;
 import com.google.gerrit.client.reviewdb.AccountExternalId;
diff --git a/src/main/java/com/google/gerrit/server/patch/DiffCacheKey.java b/src/main/java/com/google/gerrit/server/patch/DiffCacheKey.java
index 0177f11dbf..423a307b8f 100644
--- a/src/main/java/com/google/gerrit/server/patch/DiffCacheKey.java
+++ b/src/main/java/com/google/gerrit/server/patch/DiffCacheKey.java
@@ -14,8 +14,8 @@
 
 package com.google.gerrit.server.patch;
 
-import com.google.gerrit.client.patches.PatchScriptSettings;
-import com.google.gerrit.client.patches.PatchScriptSettings.Whitespace;
+import com.google.gerrit.client.data.PatchScriptSettings;
+import com.google.gerrit.client.data.PatchScriptSettings.Whitespace;
 import com.google.gerrit.client.reviewdb.Patch;
 import com.google.gerrit.client.reviewdb.Project;
 
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java b/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
index 198721eef5..6c1edf8bd8 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
@@ -16,10 +16,10 @@ package com.google.gerrit.server.patch;
 
 import com.google.gerrit.client.data.ApprovalType;
 import com.google.gerrit.client.data.PatchScript;
+import com.google.gerrit.client.data.PatchScriptSettings;
 import com.google.gerrit.client.data.ProjectCache;
 import com.google.gerrit.client.patches.CommentDetail;
 import com.google.gerrit.client.patches.PatchDetailService;
-import com.google.gerrit.client.patches.PatchScriptSettings;
 import com.google.gerrit.client.reviewdb.Account;
 import com.google.gerrit.client.reviewdb.ApprovalCategory;
 import com.google.gerrit.client.reviewdb.ApprovalCategoryValue;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchScriptAction.java b/src/main/java/com/google/gerrit/server/patch/PatchScriptAction.java
index 307b601e41..927f511f95 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchScriptAction.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchScriptAction.java
@@ -17,8 +17,8 @@ package com.google.gerrit.server.patch;
 import static com.google.gerrit.client.rpc.BaseServiceImplementation.canRead;
 
 import com.google.gerrit.client.data.PatchScript;
+import com.google.gerrit.client.data.PatchScriptSettings;
 import com.google.gerrit.client.patches.CommentDetail;
-import com.google.gerrit.client.patches.PatchScriptSettings;
 import com.google.gerrit.client.reviewdb.Account;
 import com.google.gerrit.client.reviewdb.AccountGeneralPreferences;
 import com.google.gerrit.client.reviewdb.Change;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
index 7acf841555..38cc369caa 100644
--- a/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
+++ b/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
@@ -15,9 +15,9 @@
 package com.google.gerrit.server.patch;
 
 import com.google.gerrit.client.data.PatchScript;
+import com.google.gerrit.client.data.PatchScriptSettings;
 import com.google.gerrit.client.data.SparseFileContent;
 import com.google.gerrit.client.patches.CommentDetail;
-import com.google.gerrit.client.patches.PatchScriptSettings;
 import com.google.gerrit.client.reviewdb.Patch;
 import com.google.gerrit.client.reviewdb.PatchLineComment;
 import com.google.gerrit.client.rpc.CorruptEntityException;