From 4cbd5a3b490fcfdf6f05e855cb5e9d3ed84b564d Mon Sep 17 00:00:00 2001 From: David Huynh Date: Mon, 17 May 2010 02:33:01 +0000 Subject: [PATCH] More re-organization of commands. git-svn-id: http://google-refine.googlecode.com/svn/trunk@786 7d457c2a-affb-35e4-300a-418c747d4874 --- .../com/metaweb/gridworks/GridworksServlet.java | 16 ++++++++-------- .../ComputeClustersCommand.java | 2 +- .../{info => browsing}/ComputeFacetsCommand.java | 2 +- .../GetScatterplotCommand.java | 2 +- .../GetExpressionHistoryCommand.java | 2 +- .../GetExpressionLanguageInfoCommand.java | 2 +- .../{util => expr}/LogExpressionCommand.java | 2 +- .../{util => expr}/PreviewExpressionCommand.java | 2 +- .../GetAllProjectMetadataCommand.java | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename src/main/java/com/metaweb/gridworks/commands/{info => browsing}/ComputeClustersCommand.java (97%) rename src/main/java/com/metaweb/gridworks/commands/{info => browsing}/ComputeFacetsCommand.java (94%) rename src/main/java/com/metaweb/gridworks/commands/{info => browsing}/GetScatterplotCommand.java (99%) rename src/main/java/com/metaweb/gridworks/commands/{util => expr}/GetExpressionHistoryCommand.java (97%) rename src/main/java/com/metaweb/gridworks/commands/{util => expr}/GetExpressionLanguageInfoCommand.java (97%) rename src/main/java/com/metaweb/gridworks/commands/{util => expr}/LogExpressionCommand.java (95%) rename src/main/java/com/metaweb/gridworks/commands/{util => expr}/PreviewExpressionCommand.java (99%) rename src/main/java/com/metaweb/gridworks/commands/{info => workspace}/GetAllProjectMetadataCommand.java (96%) diff --git a/src/main/java/com/metaweb/gridworks/GridworksServlet.java b/src/main/java/com/metaweb/gridworks/GridworksServlet.java index 5a3daa09e..b4880b3d8 100644 --- a/src/main/java/com/metaweb/gridworks/GridworksServlet.java +++ b/src/main/java/com/metaweb/gridworks/GridworksServlet.java @@ -19,6 +19,9 @@ import com.metaweb.gridworks.commands.auth.AuthorizeCommand; import com.metaweb.gridworks.commands.auth.CheckAuthorizationCommand; import com.metaweb.gridworks.commands.auth.DeAuthorizeCommand; import com.metaweb.gridworks.commands.auth.GetUserBadgesCommand; +import com.metaweb.gridworks.commands.browsing.ComputeClustersCommand; +import com.metaweb.gridworks.commands.browsing.ComputeFacetsCommand; +import com.metaweb.gridworks.commands.browsing.GetScatterplotCommand; import com.metaweb.gridworks.commands.cell.EditOneCellCommand; import com.metaweb.gridworks.commands.cell.JoinMultiValueCellsCommand; import com.metaweb.gridworks.commands.cell.MassEditCommand; @@ -31,6 +34,10 @@ import com.metaweb.gridworks.commands.column.PreviewExtendDataCommand; import com.metaweb.gridworks.commands.column.RemoveColumnCommand; import com.metaweb.gridworks.commands.column.RenameColumnCommand; import com.metaweb.gridworks.commands.column.SplitColumnCommand; +import com.metaweb.gridworks.commands.expr.GetExpressionHistoryCommand; +import com.metaweb.gridworks.commands.expr.GetExpressionLanguageInfoCommand; +import com.metaweb.gridworks.commands.expr.LogExpressionCommand; +import com.metaweb.gridworks.commands.expr.PreviewExpressionCommand; import com.metaweb.gridworks.commands.freebase.GuessTypesOfColumnCommand; import com.metaweb.gridworks.commands.freebase.MQLReadCommand; import com.metaweb.gridworks.commands.freebase.MQLWriteCommand; @@ -43,10 +50,6 @@ import com.metaweb.gridworks.commands.history.GetHistoryCommand; import com.metaweb.gridworks.commands.history.GetOperationsCommand; import com.metaweb.gridworks.commands.history.GetProcessesCommand; import com.metaweb.gridworks.commands.history.UndoRedoCommand; -import com.metaweb.gridworks.commands.info.ComputeClustersCommand; -import com.metaweb.gridworks.commands.info.ComputeFacetsCommand; -import com.metaweb.gridworks.commands.info.GetAllProjectMetadataCommand; -import com.metaweb.gridworks.commands.info.GetScatterplotCommand; import com.metaweb.gridworks.commands.project.CreateProjectCommand; import com.metaweb.gridworks.commands.project.DeleteProjectCommand; import com.metaweb.gridworks.commands.project.ExportProjectCommand; @@ -66,10 +69,7 @@ import com.metaweb.gridworks.commands.row.AnnotateRowsCommand; import com.metaweb.gridworks.commands.row.DenormalizeCommand; import com.metaweb.gridworks.commands.row.GetRowsCommand; import com.metaweb.gridworks.commands.row.RemoveRowsCommand; -import com.metaweb.gridworks.commands.util.GetExpressionHistoryCommand; -import com.metaweb.gridworks.commands.util.GetExpressionLanguageInfoCommand; -import com.metaweb.gridworks.commands.util.LogExpressionCommand; -import com.metaweb.gridworks.commands.util.PreviewExpressionCommand; +import com.metaweb.gridworks.commands.workspace.GetAllProjectMetadataCommand; public class GridworksServlet extends HttpServlet { diff --git a/src/main/java/com/metaweb/gridworks/commands/info/ComputeClustersCommand.java b/src/main/java/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/commands/info/ComputeClustersCommand.java rename to src/main/java/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java index 79ce2540b..d7ba9873c 100644 --- a/src/main/java/com/metaweb/gridworks/commands/info/ComputeClustersCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/browsing/ComputeClustersCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.info; +package com.metaweb.gridworks.commands.browsing; import java.io.IOException; diff --git a/src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java b/src/main/java/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java rename to src/main/java/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java index 7dd0ae1fd..ffbfd0c68 100644 --- a/src/main/java/com/metaweb/gridworks/commands/info/ComputeFacetsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/browsing/ComputeFacetsCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.info; +package com.metaweb.gridworks.commands.browsing; import java.io.IOException; diff --git a/src/main/java/com/metaweb/gridworks/commands/info/GetScatterplotCommand.java b/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java similarity index 99% rename from src/main/java/com/metaweb/gridworks/commands/info/GetScatterplotCommand.java rename to src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java index 726cb40e3..ae8f8fada 100644 --- a/src/main/java/com/metaweb/gridworks/commands/info/GetScatterplotCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/browsing/GetScatterplotCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.info; +package com.metaweb.gridworks.commands.browsing; import java.awt.Color; import java.awt.image.BufferedImage; diff --git a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionHistoryCommand.java b/src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/commands/util/GetExpressionHistoryCommand.java rename to src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java index 5f46137a5..8f7e38343 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionHistoryCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionHistoryCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.util; +package com.metaweb.gridworks.commands.expr; import java.io.IOException; import java.util.HashSet; diff --git a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java b/src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java rename to src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java index 5b3c743a1..2b4813a80 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/GetExpressionLanguageInfoCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/expr/GetExpressionLanguageInfoCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.util; +package com.metaweb.gridworks.commands.expr; import java.io.IOException; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/commands/util/LogExpressionCommand.java b/src/main/java/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/commands/util/LogExpressionCommand.java rename to src/main/java/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java index 02d71231f..8307e01e1 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/LogExpressionCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/expr/LogExpressionCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.util; +package com.metaweb.gridworks.commands.expr; import java.io.IOException; diff --git a/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java b/src/main/java/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java similarity index 99% rename from src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java rename to src/main/java/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java index c5390cce1..83637e8f9 100644 --- a/src/main/java/com/metaweb/gridworks/commands/util/PreviewExpressionCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/expr/PreviewExpressionCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.util; +package com.metaweb.gridworks.commands.expr; import java.io.IOException; import java.io.Serializable; diff --git a/src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java b/src/main/java/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java rename to src/main/java/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java index c595b422d..4f604a72e 100644 --- a/src/main/java/com/metaweb/gridworks/commands/info/GetAllProjectMetadataCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/workspace/GetAllProjectMetadataCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.commands.info; +package com.metaweb.gridworks.commands.workspace; import java.io.IOException; import java.util.Map;