From 4ee1684fa38ba8023e8853b568e09b4895e0f4fd Mon Sep 17 00:00:00 2001 From: David Huynh Date: Thu, 4 Feb 2010 06:12:22 +0000 Subject: [PATCH] Break the commands package into several for clearer organization. git-svn-id: http://google-refine.googlecode.com/svn/trunk@37 7d457c2a-affb-35e4-300a-418c747d4874 --- .../metaweb/gridworks/GridworksServlet.java | 30 +++++++++---------- .../CreateProjectFromUploadCommand.java | 3 +- .../{ => edit}/DoTextTransformCommand.java | 3 +- .../commands/{ => edit}/UndoRedoCommand.java | 3 +- .../{ => info}/ComputeFacetsCommand.java | 3 +- .../GetAllProjectMetadataCommand.java | 3 +- .../{ => info}/GetColumnModelCommand.java | 3 +- .../{ => info}/GetHistoryCommand.java | 3 +- .../{ => info}/GetProcessesCommand.java | 3 +- .../{ => info}/GetProjectMetadataCommand.java | 3 +- .../commands/{ => info}/GetRowsCommand.java | 3 +- .../ApproveNewReconcileCommand.java | 3 +- .../{ => recon}/ApproveReconcileCommand.java | 3 +- .../{ => recon}/DiscardReconcileCommand.java | 3 +- .../{ => recon}/ReconcileCommand.java | 3 +- .../{ => util}/PreviewExpressionCommand.java | 3 +- 16 files changed, 45 insertions(+), 30 deletions(-) rename src/main/java/com/metaweb/gridworks/commands/{ => edit}/CreateProjectFromUploadCommand.java (93%) rename src/main/java/com/metaweb/gridworks/commands/{ => edit}/DoTextTransformCommand.java (94%) rename src/main/java/com/metaweb/gridworks/commands/{ => edit}/UndoRedoCommand.java (86%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/ComputeFacetsCommand.java (84%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetAllProjectMetadataCommand.java (89%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetColumnModelCommand.java (83%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetHistoryCommand.java (83%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetProcessesCommand.java (83%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetProjectMetadataCommand.java (85%) rename src/main/java/com/metaweb/gridworks/commands/{ => info}/GetRowsCommand.java (93%) rename src/main/java/com/metaweb/gridworks/commands/{ => recon}/ApproveNewReconcileCommand.java (94%) rename src/main/java/com/metaweb/gridworks/commands/{ => recon}/ApproveReconcileCommand.java (94%) rename src/main/java/com/metaweb/gridworks/commands/{ => recon}/DiscardReconcileCommand.java (93%) rename src/main/java/com/metaweb/gridworks/commands/{ => recon}/ReconcileCommand.java (93%) rename src/main/java/com/metaweb/gridworks/commands/{ => util}/PreviewExpressionCommand.java (92%) diff --git a/src/main/java/com/metaweb/gridworks/GridworksServlet.java b/src/main/java/com/metaweb/gridworks/GridworksServlet.java index d10418b75..8233d85fb 100644 --- a/src/main/java/com/metaweb/gridworks/GridworksServlet.java +++ b/src/main/java/com/metaweb/gridworks/GridworksServlet.java @@ -14,22 +14,22 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import com.metaweb.gridworks.commands.ApproveNewReconcileCommand; -import com.metaweb.gridworks.commands.ApproveReconcileCommand; import com.metaweb.gridworks.commands.Command; -import com.metaweb.gridworks.commands.ComputeFacetsCommand; -import com.metaweb.gridworks.commands.CreateProjectFromUploadCommand; -import com.metaweb.gridworks.commands.DiscardReconcileCommand; -import com.metaweb.gridworks.commands.DoTextTransformCommand; -import com.metaweb.gridworks.commands.GetAllProjectMetadataCommand; -import com.metaweb.gridworks.commands.GetColumnModelCommand; -import com.metaweb.gridworks.commands.GetHistoryCommand; -import com.metaweb.gridworks.commands.GetProcessesCommand; -import com.metaweb.gridworks.commands.GetProjectMetadataCommand; -import com.metaweb.gridworks.commands.GetRowsCommand; -import com.metaweb.gridworks.commands.PreviewExpressionCommand; -import com.metaweb.gridworks.commands.ReconcileCommand; -import com.metaweb.gridworks.commands.UndoRedoCommand; +import com.metaweb.gridworks.commands.edit.CreateProjectFromUploadCommand; +import com.metaweb.gridworks.commands.edit.DoTextTransformCommand; +import com.metaweb.gridworks.commands.edit.UndoRedoCommand; +import com.metaweb.gridworks.commands.info.ComputeFacetsCommand; +import com.metaweb.gridworks.commands.info.GetAllProjectMetadataCommand; +import com.metaweb.gridworks.commands.info.GetColumnModelCommand; +import com.metaweb.gridworks.commands.info.GetHistoryCommand; +import com.metaweb.gridworks.commands.info.GetProcessesCommand; +import com.metaweb.gridworks.commands.info.GetProjectMetadataCommand; +import com.metaweb.gridworks.commands.info.GetRowsCommand; +import com.metaweb.gridworks.commands.recon.ApproveNewReconcileCommand; +import com.metaweb.gridworks.commands.recon.ApproveReconcileCommand; +import com.metaweb.gridworks.commands.recon.DiscardReconcileCommand; +import com.metaweb.gridworks.commands.recon.ReconcileCommand; +import com.metaweb.gridworks.commands.util.PreviewExpressionCommand; public class GridworksServlet extends HttpServlet { private static final long serialVersionUID = 2386057901503517403L; diff --git a/src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectFromUploadCommand.java similarity index 93% rename from src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java rename to src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectFromUploadCommand.java index 4de1bf792..8be1c24af 100644 --- a/src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/CreateProjectFromUploadCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.edit; import java.io.IOException; import java.util.Properties; @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.ProjectManager; import com.metaweb.gridworks.ProjectMetadata; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; diff --git a/src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java rename to src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java index 9f028d095..0ca28da0f 100644 --- a/src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.edit; import java.io.IOException; import java.util.ArrayList; @@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.Parser; import com.metaweb.gridworks.history.HistoryEntry; diff --git a/src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/UndoRedoCommand.java similarity index 86% rename from src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java rename to src/main/java/com/metaweb/gridworks/commands/edit/UndoRedoCommand.java index 4728ed031..be8934f3f 100644 --- a/src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/UndoRedoCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.edit; import java.io.IOException; @@ -6,6 +6,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.history.HistoryProcess; import com.metaweb.gridworks.model.Project; diff --git a/src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java similarity index 84% rename from src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java index 250e8e612..8632700ab 100644 --- a/src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; public class ComputeFacetsCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/GetAllProjectMetadataCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java similarity index 89% rename from src/main/java/com/metaweb/gridworks/commands/GetAllProjectMetadataCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java index 2f68ed6aa..89fdabdfa 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetAllProjectMetadataCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; import java.util.Map; @@ -13,6 +13,7 @@ import org.json.JSONWriter; import com.metaweb.gridworks.ProjectManager; import com.metaweb.gridworks.ProjectMetadata; +import com.metaweb.gridworks.commands.Command; public class GetAllProjectMetadataCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetColumnModelCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetColumnModelCommand.java index 90c7fddf3..d5e121c3f 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetColumnModelCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; public class GetColumnModelCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetHistoryCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetHistoryCommand.java index 489eeb324..e0073be05 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetHistoryCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; public class GetHistoryCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetProcessesCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetProcessesCommand.java index 78b0f0a20..8a4443db6 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetProcessesCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; public class GetProcessesCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetProjectMetadataCommand.java similarity index 85% rename from src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetProjectMetadataCommand.java index f2cf0fcaa..8f00beca0 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetProjectMetadataCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; public class GetProjectMetadataCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java b/src/main/java/com/metaweb/gridworks/commands/info/GetRowsCommand.java similarity index 93% rename from src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java rename to src/main/java/com/metaweb/gridworks/commands/info/GetRowsCommand.java index 73fac2f32..f3f1033dc 100644 --- a/src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/info/GetRowsCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.info; import java.io.IOException; import java.util.Properties; @@ -13,6 +13,7 @@ import org.json.JSONWriter; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; diff --git a/src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ApproveNewReconcileCommand.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/recon/ApproveNewReconcileCommand.java index 1eb3f464d..e6a37b16e 100644 --- a/src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ApproveNewReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.recon; import java.io.IOException; import java.util.ArrayList; @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.history.HistoryEntry; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column; diff --git a/src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ApproveReconcileCommand.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/recon/ApproveReconcileCommand.java index fc4b34bcc..95a1cbfad 100644 --- a/src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ApproveReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.recon; import java.io.IOException; import java.util.ArrayList; @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.history.HistoryEntry; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column; diff --git a/src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/DiscardReconcileCommand.java similarity index 93% rename from src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/recon/DiscardReconcileCommand.java index f849225d8..f78343efc 100644 --- a/src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/DiscardReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.recon; import java.io.IOException; import java.util.ArrayList; @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.history.HistoryEntry; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column; diff --git a/src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java similarity index 93% rename from src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java index 55f93a04f..9746e9350 100644 --- a/src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.recon; import java.io.IOException; import java.util.ArrayList; @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.browsing.Engine; import com.metaweb.gridworks.browsing.FilteredRows; import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.Cell; import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; diff --git a/src/main/java/com/metaweb/gridworks/commands/PreviewExpressionCommand.java b/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/commands/PreviewExpressionCommand.java rename to src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java index 6410d4514..133ba6c02 100644 --- a/src/main/java/com/metaweb/gridworks/commands/PreviewExpressionCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands; +package com.metaweb.gridworks.commands.util; import java.io.IOException; import java.util.Properties; @@ -11,6 +11,7 @@ import org.json.JSONArray; import org.json.JSONWriter; +import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.expr.Evaluable; import com.metaweb.gridworks.expr.Parser; import com.metaweb.gridworks.model.Cell;