From 047f59e4610495ee5345d1a7abc8804cea2242b9 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Wed, 3 Feb 2010 02:29:47 +0000 Subject: [PATCH] Renamed java packages. git-svn-id: http://google-refine.googlecode.com/svn/trunk@27 7d457c2a-affb-35e4-300a-418c747d4874 --- .project | 2 +- pom.xml | 8 ++--- .../metaweb/gridlock/browsing/RowVisitor.java | 9 ------ .../gridlock/browsing/facets/Facet.java | 16 ---------- .../gridlock/browsing/filters/RowFilter.java | 8 ----- .../GridworksServlet.java} | 32 +++++++++---------- .../{gridlock => gridworks}/Jsonizable.java | 2 +- .../ProjectManager.java | 4 +-- .../ProjectMetadata.java | 2 +- .../browsing/ConjunctiveFilteredRows.java | 8 ++--- .../browsing/DecoratedValue.java | 4 +-- .../browsing/Engine.java | 16 +++++----- .../browsing/FilteredRows.java | 4 +-- .../gridworks/browsing/RowVisitor.java | 9 ++++++ .../facets/ExpressionNominalRowGrouper.java | 14 ++++---- .../gridworks/browsing/facets/Facet.java | 16 ++++++++++ .../browsing/facets/ListFacet.java | 16 +++++----- .../browsing/facets/NominalFacetChoice.java | 6 ++-- .../browsing/facets/NumericBinIndex.java | 10 +++--- .../browsing/facets/RangeFacet.java | 16 +++++----- .../browsing/facets/TextSearchFacet.java | 18 +++++------ .../filters/ExpressionEqualRowFilter.java | 10 +++--- .../ExpressionNumberComparisonRowFilter.java | 10 +++--- .../ExpressionStringComparisonRowFilter.java | 10 +++--- .../gridworks/browsing/filters/RowFilter.java | 8 +++++ .../commands/ApproveNewReconcileCommand.java | 28 ++++++++-------- .../commands/ApproveReconcileCommand.java | 26 +++++++-------- .../commands/Command.java | 10 +++--- .../commands/ComputeFacetsCommand.java | 6 ++-- .../CreateProjectFromUploadCommand.java | 14 ++++---- .../commands/DiscardReconcileCommand.java | 24 +++++++------- .../commands/DoTextTransformCommand.java | 28 ++++++++-------- .../commands/GetColumnModelCommand.java | 4 +-- .../commands/GetHistoryCommand.java | 4 +-- .../commands/GetProcessesCommand.java | 4 +-- .../commands/GetProjectMetadataCommand.java | 6 ++-- .../commands/GetRowsCommand.java | 12 +++---- .../commands/ReconcileCommand.java | 20 ++++++------ .../commands/UndoRedoCommand.java | 6 ++-- .../expr/Evaluable.java | 2 +- .../expr/FieldAccessorExpr.java | 2 +- .../expr/Function.java | 2 +- .../expr/FunctionCallExpr.java | 2 +- .../expr/HasFields.java | 2 +- .../expr/LiteralExpr.java | 2 +- .../expr/OperatorCallExpr.java | 2 +- .../{gridlock => gridworks}/expr/Parser.java | 32 +++++++++---------- .../{gridlock => gridworks}/expr/Scanner.java | 2 +- .../expr/VariableExpr.java | 2 +- .../expr/functions/And.java | 4 +-- .../expr/functions/Get.java | 4 +-- .../expr/functions/IsNotNull.java | 4 +-- .../expr/functions/IsNull.java | 4 +-- .../expr/functions/Not.java | 4 +-- .../expr/functions/Or.java | 4 +-- .../expr/functions/Replace.java | 4 +-- .../expr/functions/Slice.java | 4 +-- .../expr/functions/Split.java | 4 +-- .../expr/functions/ToLowercase.java | 4 +-- .../expr/functions/ToTitlecase.java | 4 +-- .../expr/functions/ToUppercase.java | 4 +-- .../history/CellChange.java | 4 +-- .../history/Change.java | 4 +-- .../history/History.java | 8 ++--- .../history/HistoryEntry.java | 8 ++--- .../history/HistoryProcess.java | 8 ++--- .../history/MassCellChange.java | 6 ++-- .../{gridlock => gridworks}/model/Cell.java | 6 ++-- .../{gridlock => gridworks}/model/Column.java | 4 +-- .../model/ColumnModel.java | 4 +-- .../model/Project.java | 6 ++-- .../{gridlock => gridworks}/model/Recon.java | 6 ++-- .../model/ReconCandidate.java | 6 ++-- .../{gridlock => gridworks}/model/Row.java | 6 ++-- .../process/LongRunningProcess.java | 2 +- .../process/Process.java | 4 +-- .../process/ProcessManager.java | 4 +-- .../process/QuickHistoryEntryProcess.java | 6 ++-- .../process/ReconProcess.java | 18 +++++------ .../util/IndentWriter.java | 2 +- .../util/JSObject.java | 2 +- .../util/ParsingUtilities.java | 2 +- src/main/webapp/WEB-INF/web.xml | 6 ++-- 83 files changed, 335 insertions(+), 335 deletions(-) delete mode 100644 src/main/java/com/metaweb/gridlock/browsing/RowVisitor.java delete mode 100644 src/main/java/com/metaweb/gridlock/browsing/facets/Facet.java delete mode 100644 src/main/java/com/metaweb/gridlock/browsing/filters/RowFilter.java rename src/main/java/com/metaweb/{gridlock/GridlockServlet.java => gridworks/GridworksServlet.java} (72%) rename src/main/java/com/metaweb/{gridlock => gridworks}/Jsonizable.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/ProjectManager.java (93%) rename src/main/java/com/metaweb/{gridlock => gridworks}/ProjectMetadata.java (93%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/ConjunctiveFilteredRows.java (75%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/DecoratedValue.java (82%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/Engine.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/FilteredRows.java (50%) create mode 100644 src/main/java/com/metaweb/gridworks/browsing/RowVisitor.java rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/ExpressionNominalRowGrouper.java (78%) create mode 100644 src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/ListFacet.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/NominalFacetChoice.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/NumericBinIndex.java (85%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/RangeFacet.java (84%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/facets/TextSearchFacet.java (74%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/filters/ExpressionEqualRowFilter.java (80%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/filters/ExpressionNumberComparisonRowFilter.java (81%) rename src/main/java/com/metaweb/{gridlock => gridworks}/browsing/filters/ExpressionStringComparisonRowFilter.java (81%) create mode 100644 src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/ApproveNewReconcileCommand.java (75%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/ApproveReconcileCommand.java (77%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/Command.java (93%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/ComputeFacetsCommand.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/CreateProjectFromUploadCommand.java (88%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/DiscardReconcileCommand.java (76%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/DoTextTransformCommand.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/GetColumnModelCommand.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/GetHistoryCommand.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/GetProcessesCommand.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/GetProjectMetadataCommand.java (79%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/GetRowsCommand.java (87%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/ReconcileCommand.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/commands/UndoRedoCommand.java (79%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/Evaluable.java (71%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/FieldAccessorExpr.java (90%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/Function.java (73%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/FunctionCallExpr.java (91%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/HasFields.java (73%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/LiteralExpr.java (88%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/OperatorCallExpr.java (94%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/Parser.java (85%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/Scanner.java (94%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/VariableExpr.java (84%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/And.java (69%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Get.java (91%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/IsNotNull.java (65%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/IsNull.java (65%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Not.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Or.java (69%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Replace.java (81%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Slice.java (91%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/Split.java (78%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/ToLowercase.java (74%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/ToTitlecase.java (84%) rename src/main/java/com/metaweb/{gridlock => gridworks}/expr/functions/ToUppercase.java (74%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/CellChange.java (81%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/Change.java (62%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/History.java (90%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/HistoryEntry.java (90%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/HistoryProcess.java (85%) rename src/main/java/com/metaweb/{gridlock => gridworks}/history/MassCellChange.java (87%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/Cell.java (82%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/Column.java (90%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/ColumnModel.java (89%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/Project.java (83%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/Recon.java (91%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/ReconCandidate.java (87%) rename src/main/java/com/metaweb/{gridlock => gridworks}/model/Row.java (88%) rename src/main/java/com/metaweb/{gridlock => gridworks}/process/LongRunningProcess.java (93%) rename src/main/java/com/metaweb/{gridlock => gridworks}/process/Process.java (76%) rename src/main/java/com/metaweb/{gridlock => gridworks}/process/ProcessManager.java (89%) rename src/main/java/com/metaweb/{gridlock => gridworks}/process/QuickHistoryEntryProcess.java (86%) rename src/main/java/com/metaweb/{gridlock => gridworks}/process/ReconProcess.java (91%) rename src/main/java/com/metaweb/{gridlock => gridworks}/util/IndentWriter.java (93%) rename src/main/java/com/metaweb/{gridlock => gridworks}/util/JSObject.java (95%) rename src/main/java/com/metaweb/{gridlock => gridworks}/util/ParsingUtilities.java (94%) diff --git a/.project b/.project index 9d31b3725..49dbdecb7 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - gridlock + gridworks diff --git a/pom.xml b/pom.xml index 92b613cee..2bcfafe26 100644 --- a/pom.xml +++ b/pom.xml @@ -6,12 +6,12 @@ 4.0.0 com.metaweb - gridlock + gridworks 1.0.0 - Gridlock - Gridlock description here. - http://www.metaweb.com/gridlock/ + Gridworks + Gridworks description here. + http://www.metaweb.com/gridworks/ 2010 diff --git a/src/main/java/com/metaweb/gridlock/browsing/RowVisitor.java b/src/main/java/com/metaweb/gridlock/browsing/RowVisitor.java deleted file mode 100644 index b2deb1d72..000000000 --- a/src/main/java/com/metaweb/gridlock/browsing/RowVisitor.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.metaweb.gridlock.browsing; - -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; - -public interface RowVisitor { - public boolean visit(Project project, int rowIndex, Row row); - -} diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/Facet.java b/src/main/java/com/metaweb/gridlock/browsing/facets/Facet.java deleted file mode 100644 index 3f32dcc6f..000000000 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/Facet.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.metaweb.gridlock.browsing.facets; - -import org.json.JSONObject; - -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.model.Project; - -public interface Facet extends Jsonizable { - public RowFilter getRowFilter(); - - public void computeChoices(Project project, FilteredRows filteredRows); - - public void initializeFromJSON(JSONObject o) throws Exception; -} diff --git a/src/main/java/com/metaweb/gridlock/browsing/filters/RowFilter.java b/src/main/java/com/metaweb/gridlock/browsing/filters/RowFilter.java deleted file mode 100644 index 6afa2e9d1..000000000 --- a/src/main/java/com/metaweb/gridlock/browsing/filters/RowFilter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.metaweb.gridlock.browsing.filters; - -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; - -public interface RowFilter { - public boolean filterRow(Project project, int rowIndex, Row row); -} diff --git a/src/main/java/com/metaweb/gridlock/GridlockServlet.java b/src/main/java/com/metaweb/gridworks/GridworksServlet.java similarity index 72% rename from src/main/java/com/metaweb/gridlock/GridlockServlet.java rename to src/main/java/com/metaweb/gridworks/GridworksServlet.java index 26958398a..5c9545a0e 100644 --- a/src/main/java/com/metaweb/gridlock/GridlockServlet.java +++ b/src/main/java/com/metaweb/gridworks/GridworksServlet.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock; +package com.metaweb.gridworks; import java.io.File; import java.io.IOException; @@ -14,22 +14,22 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import com.metaweb.gridlock.commands.ApproveNewReconcileCommand; -import com.metaweb.gridlock.commands.ApproveReconcileCommand; -import com.metaweb.gridlock.commands.Command; -import com.metaweb.gridlock.commands.ComputeFacetsCommand; -import com.metaweb.gridlock.commands.CreateProjectFromUploadCommand; -import com.metaweb.gridlock.commands.DiscardReconcileCommand; -import com.metaweb.gridlock.commands.DoTextTransformCommand; -import com.metaweb.gridlock.commands.GetColumnModelCommand; -import com.metaweb.gridlock.commands.GetHistoryCommand; -import com.metaweb.gridlock.commands.GetProcessesCommand; -import com.metaweb.gridlock.commands.GetProjectMetadataCommand; -import com.metaweb.gridlock.commands.GetRowsCommand; -import com.metaweb.gridlock.commands.ReconcileCommand; -import com.metaweb.gridlock.commands.UndoRedoCommand; +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.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.ReconcileCommand; +import com.metaweb.gridworks.commands.UndoRedoCommand; -public class GridlockServlet extends HttpServlet { +public class GridworksServlet extends HttpServlet { private static final long serialVersionUID = 2386057901503517403L; static protected Map _commands = new HashMap(); diff --git a/src/main/java/com/metaweb/gridlock/Jsonizable.java b/src/main/java/com/metaweb/gridworks/Jsonizable.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/Jsonizable.java rename to src/main/java/com/metaweb/gridworks/Jsonizable.java index 8d3cebed2..8c983cd77 100644 --- a/src/main/java/com/metaweb/gridlock/Jsonizable.java +++ b/src/main/java/com/metaweb/gridworks/Jsonizable.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock; +package com.metaweb.gridworks; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/ProjectManager.java b/src/main/java/com/metaweb/gridworks/ProjectManager.java similarity index 93% rename from src/main/java/com/metaweb/gridlock/ProjectManager.java rename to src/main/java/com/metaweb/gridworks/ProjectManager.java index a6acd3645..5d11152b7 100644 --- a/src/main/java/com/metaweb/gridlock/ProjectManager.java +++ b/src/main/java/com/metaweb/gridworks/ProjectManager.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock; +package com.metaweb.gridworks; import java.io.File; import java.io.FileInputStream; @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public class ProjectManager implements Serializable { private static final long serialVersionUID = -2967415873336723962L; diff --git a/src/main/java/com/metaweb/gridlock/ProjectMetadata.java b/src/main/java/com/metaweb/gridworks/ProjectMetadata.java similarity index 93% rename from src/main/java/com/metaweb/gridlock/ProjectMetadata.java rename to src/main/java/com/metaweb/gridworks/ProjectMetadata.java index 3eb4cf303..3367b0bbd 100644 --- a/src/main/java/com/metaweb/gridlock/ProjectMetadata.java +++ b/src/main/java/com/metaweb/gridworks/ProjectMetadata.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock; +package com.metaweb.gridworks; import java.io.Serializable; import java.text.SimpleDateFormat; diff --git a/src/main/java/com/metaweb/gridlock/browsing/ConjunctiveFilteredRows.java b/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java similarity index 75% rename from src/main/java/com/metaweb/gridlock/browsing/ConjunctiveFilteredRows.java rename to src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java index a4da69b81..3703a9dd6 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/ConjunctiveFilteredRows.java +++ b/src/main/java/com/metaweb/gridworks/browsing/ConjunctiveFilteredRows.java @@ -1,11 +1,11 @@ -package com.metaweb.gridlock.browsing; +package com.metaweb.gridworks.browsing; import java.util.LinkedList; import java.util.List; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class ConjunctiveFilteredRows implements FilteredRows { final protected List _rowFilters = new LinkedList(); diff --git a/src/main/java/com/metaweb/gridlock/browsing/DecoratedValue.java b/src/main/java/com/metaweb/gridworks/browsing/DecoratedValue.java similarity index 82% rename from src/main/java/com/metaweb/gridlock/browsing/DecoratedValue.java rename to src/main/java/com/metaweb/gridworks/browsing/DecoratedValue.java index 43458db23..77d0b3265 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/DecoratedValue.java +++ b/src/main/java/com/metaweb/gridworks/browsing/DecoratedValue.java @@ -1,11 +1,11 @@ -package com.metaweb.gridlock.browsing; +package com.metaweb.gridworks.browsing; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; +import com.metaweb.gridworks.Jsonizable; public class DecoratedValue implements Jsonizable { final public Object value; diff --git a/src/main/java/com/metaweb/gridlock/browsing/Engine.java b/src/main/java/com/metaweb/gridworks/browsing/Engine.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/browsing/Engine.java rename to src/main/java/com/metaweb/gridworks/browsing/Engine.java index 88c3bc9f9..989b3f02b 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/Engine.java +++ b/src/main/java/com/metaweb/gridworks/browsing/Engine.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.browsing; +package com.metaweb.gridworks.browsing; import java.util.LinkedList; import java.util.List; @@ -9,13 +9,13 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.browsing.facets.Facet; -import com.metaweb.gridlock.browsing.facets.ListFacet; -import com.metaweb.gridlock.browsing.facets.RangeFacet; -import com.metaweb.gridlock.browsing.facets.TextSearchFacet; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.browsing.facets.Facet; +import com.metaweb.gridworks.browsing.facets.ListFacet; +import com.metaweb.gridworks.browsing.facets.RangeFacet; +import com.metaweb.gridworks.browsing.facets.TextSearchFacet; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.model.Project; public class Engine implements Jsonizable { protected Project _project; diff --git a/src/main/java/com/metaweb/gridlock/browsing/FilteredRows.java b/src/main/java/com/metaweb/gridworks/browsing/FilteredRows.java similarity index 50% rename from src/main/java/com/metaweb/gridlock/browsing/FilteredRows.java rename to src/main/java/com/metaweb/gridworks/browsing/FilteredRows.java index a802bb2d4..aa7f6a882 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/FilteredRows.java +++ b/src/main/java/com/metaweb/gridworks/browsing/FilteredRows.java @@ -1,6 +1,6 @@ -package com.metaweb.gridlock.browsing; +package com.metaweb.gridworks.browsing; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public interface FilteredRows { public void accept(Project project, RowVisitor visitor); diff --git a/src/main/java/com/metaweb/gridworks/browsing/RowVisitor.java b/src/main/java/com/metaweb/gridworks/browsing/RowVisitor.java new file mode 100644 index 000000000..3ef40bb81 --- /dev/null +++ b/src/main/java/com/metaweb/gridworks/browsing/RowVisitor.java @@ -0,0 +1,9 @@ +package com.metaweb.gridworks.browsing; + +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; + +public interface RowVisitor { + public boolean visit(Project project, int rowIndex, Row row); + +} diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/ExpressionNominalRowGrouper.java b/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/browsing/facets/ExpressionNominalRowGrouper.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java index c146a3e2f..8988fb47e 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/ExpressionNominalRowGrouper.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/ExpressionNominalRowGrouper.java @@ -1,15 +1,15 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import com.metaweb.gridlock.browsing.DecoratedValue; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.browsing.DecoratedValue; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class ExpressionNominalRowGrouper implements RowVisitor { final protected Evaluable _evaluable; diff --git a/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java new file mode 100644 index 000000000..0072fa3f3 --- /dev/null +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/Facet.java @@ -0,0 +1,16 @@ +package com.metaweb.gridworks.browsing.facets; + +import org.json.JSONObject; + +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.model.Project; + +public interface Facet extends Jsonizable { + public RowFilter getRowFilter(); + + public void computeChoices(Project project, FilteredRows filteredRows); + + public void initializeFromJSON(JSONObject o) throws Exception; +} diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/ListFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/browsing/facets/ListFacet.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java index 28898a058..d9976da42 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/ListFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/ListFacet.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.LinkedList; import java.util.List; @@ -9,13 +9,13 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; -import com.metaweb.gridlock.browsing.DecoratedValue; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.filters.ExpressionEqualRowFilter; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.expr.Parser; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.browsing.DecoratedValue; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.filters.ExpressionEqualRowFilter; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.model.Project; public class ListFacet implements Facet { protected List _selection = new LinkedList(); diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/NominalFacetChoice.java b/src/main/java/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/browsing/facets/NominalFacetChoice.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java index 47a0fe092..ca3d65cd6 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/NominalFacetChoice.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/NominalFacetChoice.java @@ -1,12 +1,12 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.browsing.DecoratedValue; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.browsing.DecoratedValue; public class NominalFacetChoice implements Jsonizable { final public DecoratedValue decoratedValue; diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/NumericBinIndex.java b/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java similarity index 85% rename from src/main/java/com/metaweb/gridlock/browsing/facets/NumericBinIndex.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java index 8a6685e13..0c4d92d4b 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/NumericBinIndex.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/NumericBinIndex.java @@ -1,13 +1,13 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.ArrayList; import java.util.List; import java.util.Properties; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class NumericBinIndex { public double min; diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/RangeFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java similarity index 84% rename from src/main/java/com/metaweb/gridlock/browsing/facets/RangeFacet.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java index 8657618a4..0c8740086 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/RangeFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/RangeFacet.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.Properties; @@ -6,13 +6,13 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.filters.ExpressionNumberComparisonRowFilter; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.expr.Parser; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.filters.ExpressionNumberComparisonRowFilter; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; public class RangeFacet implements Facet { protected String _name; diff --git a/src/main/java/com/metaweb/gridlock/browsing/facets/TextSearchFacet.java b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java similarity index 74% rename from src/main/java/com/metaweb/gridlock/browsing/facets/TextSearchFacet.java rename to src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java index 9d1994cf5..a90d3dd5c 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/facets/TextSearchFacet.java +++ b/src/main/java/com/metaweb/gridworks/browsing/facets/TextSearchFacet.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.browsing.facets; +package com.metaweb.gridworks.browsing.facets; import java.util.Properties; @@ -6,14 +6,14 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.filters.ExpressionNumberComparisonRowFilter; -import com.metaweb.gridlock.browsing.filters.ExpressionStringComparisonRowFilter; -import com.metaweb.gridlock.browsing.filters.RowFilter; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.expr.Parser; -import com.metaweb.gridlock.expr.VariableExpr; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.filters.ExpressionNumberComparisonRowFilter; +import com.metaweb.gridworks.browsing.filters.ExpressionStringComparisonRowFilter; +import com.metaweb.gridworks.browsing.filters.RowFilter; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.expr.VariableExpr; +import com.metaweb.gridworks.model.Project; public class TextSearchFacet implements Facet { protected String _name; diff --git a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionEqualRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java similarity index 80% rename from src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionEqualRowFilter.java rename to src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java index d032f3661..bc124b95f 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionEqualRowFilter.java +++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionEqualRowFilter.java @@ -1,11 +1,11 @@ -package com.metaweb.gridlock.browsing.filters; +package com.metaweb.gridworks.browsing.filters; import java.util.Properties; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class ExpressionEqualRowFilter implements RowFilter { final protected Evaluable _evaluable; diff --git a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionNumberComparisonRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java similarity index 81% rename from src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionNumberComparisonRowFilter.java rename to src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java index 7cc52a719..2bb5253bb 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionNumberComparisonRowFilter.java +++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionNumberComparisonRowFilter.java @@ -1,11 +1,11 @@ -package com.metaweb.gridlock.browsing.filters; +package com.metaweb.gridworks.browsing.filters; import java.util.Properties; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; abstract public class ExpressionNumberComparisonRowFilter implements RowFilter { final protected Evaluable _evaluable; diff --git a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionStringComparisonRowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java similarity index 81% rename from src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionStringComparisonRowFilter.java rename to src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java index 0038dba57..4c6bafd62 100644 --- a/src/main/java/com/metaweb/gridlock/browsing/filters/ExpressionStringComparisonRowFilter.java +++ b/src/main/java/com/metaweb/gridworks/browsing/filters/ExpressionStringComparisonRowFilter.java @@ -1,11 +1,11 @@ -package com.metaweb.gridlock.browsing.filters; +package com.metaweb.gridworks.browsing.filters; import java.util.Properties; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; abstract public class ExpressionStringComparisonRowFilter implements RowFilter { final protected Evaluable _evaluable; diff --git a/src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java b/src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java new file mode 100644 index 000000000..cf3f0cb5c --- /dev/null +++ b/src/main/java/com/metaweb/gridworks/browsing/filters/RowFilter.java @@ -0,0 +1,8 @@ +package com.metaweb.gridworks.browsing.filters; + +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; + +public interface RowFilter { + public boolean filterRow(Project project, int rowIndex, Row row); +} diff --git a/src/main/java/com/metaweb/gridlock/commands/ApproveNewReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java similarity index 75% rename from src/main/java/com/metaweb/gridlock/commands/ApproveNewReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java index 5dc8da078..988290180 100644 --- a/src/main/java/com/metaweb/gridlock/commands/ApproveNewReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/ApproveNewReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.ArrayList; @@ -8,19 +8,19 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.history.CellChange; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.history.MassCellChange; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Recon; -import com.metaweb.gridlock.model.Row; -import com.metaweb.gridlock.model.Recon.Judgment; -import com.metaweb.gridlock.process.QuickHistoryEntryProcess; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.history.CellChange; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.history.MassCellChange; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Recon; +import com.metaweb.gridworks.model.Row; +import com.metaweb.gridworks.model.Recon.Judgment; +import com.metaweb.gridworks.process.QuickHistoryEntryProcess; public class ApproveNewReconcileCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/commands/ApproveReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java similarity index 77% rename from src/main/java/com/metaweb/gridlock/commands/ApproveReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java index b44201ad5..9db795823 100644 --- a/src/main/java/com/metaweb/gridlock/commands/ApproveReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/ApproveReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.ArrayList; @@ -8,18 +8,18 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.history.CellChange; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.history.MassCellChange; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; -import com.metaweb.gridlock.model.Recon.Judgment; -import com.metaweb.gridlock.process.QuickHistoryEntryProcess; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.history.CellChange; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.history.MassCellChange; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; +import com.metaweb.gridworks.model.Recon.Judgment; +import com.metaweb.gridworks.process.QuickHistoryEntryProcess; public class ApproveReconcileCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/commands/Command.java b/src/main/java/com/metaweb/gridworks/commands/Command.java similarity index 93% rename from src/main/java/com/metaweb/gridlock/commands/Command.java rename to src/main/java/com/metaweb/gridworks/commands/Command.java index 06144cdc3..8d4255417 100644 --- a/src/main/java/com/metaweb/gridlock/commands/Command.java +++ b/src/main/java/com/metaweb/gridworks/commands/Command.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.io.InputStreamReader; @@ -20,10 +20,10 @@ import org.json.JSONObject; import org.json.JSONTokener; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.ProjectManager; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.model.Project; import com.oreilly.servlet.multipart.FilePart; import com.oreilly.servlet.multipart.MultipartParser; import com.oreilly.servlet.multipart.ParamPart; diff --git a/src/main/java/com/metaweb/gridlock/commands/ComputeFacetsCommand.java b/src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/commands/ComputeFacetsCommand.java rename to src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java index a168ff082..250e8e612 100644 --- a/src/main/java/com/metaweb/gridlock/commands/ComputeFacetsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/ComputeFacetsCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -6,8 +6,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.model.Project; public class ComputeFacetsCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/CreateProjectFromUploadCommand.java b/src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java similarity index 88% rename from src/main/java/com/metaweb/gridlock/commands/CreateProjectFromUploadCommand.java rename to src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java index d8e3826d8..febef54f2 100644 --- a/src/main/java/com/metaweb/gridlock/commands/CreateProjectFromUploadCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/CreateProjectFromUploadCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.Properties; @@ -7,12 +7,12 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.ProjectManager; -import com.metaweb.gridlock.ProjectMetadata; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.ProjectMetadata; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class CreateProjectFromUploadCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/DiscardReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java similarity index 76% rename from src/main/java/com/metaweb/gridlock/commands/DiscardReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java index f99ad43f3..7e235dc6a 100644 --- a/src/main/java/com/metaweb/gridlock/commands/DiscardReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/DiscardReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.ArrayList; @@ -8,17 +8,17 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.history.CellChange; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.history.MassCellChange; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; -import com.metaweb.gridlock.process.QuickHistoryEntryProcess; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.history.CellChange; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.history.MassCellChange; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; +import com.metaweb.gridworks.process.QuickHistoryEntryProcess; public class DiscardReconcileCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/commands/DoTextTransformCommand.java b/src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/commands/DoTextTransformCommand.java rename to src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java index a19ea2173..91e3179c0 100644 --- a/src/main/java/com/metaweb/gridlock/commands/DoTextTransformCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/DoTextTransformCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.ArrayList; @@ -10,19 +10,19 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.expr.Evaluable; -import com.metaweb.gridlock.expr.Parser; -import com.metaweb.gridlock.history.CellChange; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.history.MassCellChange; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; -import com.metaweb.gridlock.process.QuickHistoryEntryProcess; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.expr.Evaluable; +import com.metaweb.gridworks.expr.Parser; +import com.metaweb.gridworks.history.CellChange; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.history.MassCellChange; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; +import com.metaweb.gridworks.process.QuickHistoryEntryProcess; public class DoTextTransformCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/commands/GetColumnModelCommand.java b/src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/commands/GetColumnModelCommand.java rename to src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java index dee8f481a..90c7fddf3 100644 --- a/src/main/java/com/metaweb/gridlock/commands/GetColumnModelCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/GetColumnModelCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public class GetColumnModelCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/GetHistoryCommand.java b/src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/commands/GetHistoryCommand.java rename to src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java index 25aa2de29..489eeb324 100644 --- a/src/main/java/com/metaweb/gridlock/commands/GetHistoryCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/GetHistoryCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public class GetHistoryCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/GetProcessesCommand.java b/src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/commands/GetProcessesCommand.java rename to src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java index b65101d58..78b0f0a20 100644 --- a/src/main/java/com/metaweb/gridlock/commands/GetProcessesCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/GetProcessesCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public class GetProcessesCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/GetProjectMetadataCommand.java b/src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java similarity index 79% rename from src/main/java/com/metaweb/gridlock/commands/GetProjectMetadataCommand.java rename to src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java index dfb6c8333..f2cf0fcaa 100644 --- a/src/main/java/com/metaweb/gridlock/commands/GetProjectMetadataCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/GetProjectMetadataCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -8,8 +8,8 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; -import com.metaweb.gridlock.ProjectManager; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.model.Project; public class GetProjectMetadataCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/GetRowsCommand.java b/src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java similarity index 87% rename from src/main/java/com/metaweb/gridlock/commands/GetRowsCommand.java rename to src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java index 4d1f9cf87..73fac2f32 100644 --- a/src/main/java/com/metaweb/gridlock/commands/GetRowsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/GetRowsCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.Properties; @@ -10,11 +10,11 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class GetRowsCommand extends Command { @Override diff --git a/src/main/java/com/metaweb/gridlock/commands/ReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/commands/ReconcileCommand.java rename to src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java index 54cb16bd1..48d2118dd 100644 --- a/src/main/java/com/metaweb/gridlock/commands/ReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/ReconcileCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; import java.util.ArrayList; @@ -8,15 +8,15 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.browsing.Engine; -import com.metaweb.gridlock.browsing.FilteredRows; -import com.metaweb.gridlock.browsing.RowVisitor; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Column; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; -import com.metaweb.gridlock.process.ReconProcess; -import com.metaweb.gridlock.process.ReconProcess.ReconEntry; +import com.metaweb.gridworks.browsing.Engine; +import com.metaweb.gridworks.browsing.FilteredRows; +import com.metaweb.gridworks.browsing.RowVisitor; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Column; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; +import com.metaweb.gridworks.process.ReconProcess; +import com.metaweb.gridworks.process.ReconProcess.ReconEntry; public class ReconcileCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/commands/UndoRedoCommand.java b/src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java similarity index 79% rename from src/main/java/com/metaweb/gridlock/commands/UndoRedoCommand.java rename to src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java index dbaed157e..4728ed031 100644 --- a/src/main/java/com/metaweb/gridlock/commands/UndoRedoCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/UndoRedoCommand.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.commands; +package com.metaweb.gridworks.commands; import java.io.IOException; @@ -6,8 +6,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.metaweb.gridlock.history.HistoryProcess; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.history.HistoryProcess; +import com.metaweb.gridworks.model.Project; public class UndoRedoCommand extends Command { diff --git a/src/main/java/com/metaweb/gridlock/expr/Evaluable.java b/src/main/java/com/metaweb/gridworks/expr/Evaluable.java similarity index 71% rename from src/main/java/com/metaweb/gridlock/expr/Evaluable.java rename to src/main/java/com/metaweb/gridworks/expr/Evaluable.java index b98041ef6..27267bdaf 100644 --- a/src/main/java/com/metaweb/gridlock/expr/Evaluable.java +++ b/src/main/java/com/metaweb/gridworks/expr/Evaluable.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/FieldAccessorExpr.java b/src/main/java/com/metaweb/gridworks/expr/FieldAccessorExpr.java similarity index 90% rename from src/main/java/com/metaweb/gridlock/expr/FieldAccessorExpr.java rename to src/main/java/com/metaweb/gridworks/expr/FieldAccessorExpr.java index 60599d03c..18867e4f5 100644 --- a/src/main/java/com/metaweb/gridlock/expr/FieldAccessorExpr.java +++ b/src/main/java/com/metaweb/gridworks/expr/FieldAccessorExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/Function.java b/src/main/java/com/metaweb/gridworks/expr/Function.java similarity index 73% rename from src/main/java/com/metaweb/gridlock/expr/Function.java rename to src/main/java/com/metaweb/gridworks/expr/Function.java index 37e24ee39..eb168bed1 100644 --- a/src/main/java/com/metaweb/gridlock/expr/Function.java +++ b/src/main/java/com/metaweb/gridworks/expr/Function.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/FunctionCallExpr.java b/src/main/java/com/metaweb/gridworks/expr/FunctionCallExpr.java similarity index 91% rename from src/main/java/com/metaweb/gridlock/expr/FunctionCallExpr.java rename to src/main/java/com/metaweb/gridworks/expr/FunctionCallExpr.java index 96169ef7e..ede0d4af5 100644 --- a/src/main/java/com/metaweb/gridlock/expr/FunctionCallExpr.java +++ b/src/main/java/com/metaweb/gridworks/expr/FunctionCallExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/HasFields.java b/src/main/java/com/metaweb/gridworks/expr/HasFields.java similarity index 73% rename from src/main/java/com/metaweb/gridlock/expr/HasFields.java rename to src/main/java/com/metaweb/gridworks/expr/HasFields.java index fbb9f41e8..42de4cd6b 100644 --- a/src/main/java/com/metaweb/gridlock/expr/HasFields.java +++ b/src/main/java/com/metaweb/gridworks/expr/HasFields.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/LiteralExpr.java b/src/main/java/com/metaweb/gridworks/expr/LiteralExpr.java similarity index 88% rename from src/main/java/com/metaweb/gridlock/expr/LiteralExpr.java rename to src/main/java/com/metaweb/gridworks/expr/LiteralExpr.java index ea304cf14..eb664d793 100644 --- a/src/main/java/com/metaweb/gridlock/expr/LiteralExpr.java +++ b/src/main/java/com/metaweb/gridworks/expr/LiteralExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/OperatorCallExpr.java b/src/main/java/com/metaweb/gridworks/expr/OperatorCallExpr.java similarity index 94% rename from src/main/java/com/metaweb/gridlock/expr/OperatorCallExpr.java rename to src/main/java/com/metaweb/gridworks/expr/OperatorCallExpr.java index 020cc92be..7b6867aff 100644 --- a/src/main/java/com/metaweb/gridlock/expr/OperatorCallExpr.java +++ b/src/main/java/com/metaweb/gridworks/expr/OperatorCallExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/Parser.java b/src/main/java/com/metaweb/gridworks/expr/Parser.java similarity index 85% rename from src/main/java/com/metaweb/gridlock/expr/Parser.java rename to src/main/java/com/metaweb/gridworks/expr/Parser.java index d10b93817..f902178c7 100644 --- a/src/main/java/com/metaweb/gridlock/expr/Parser.java +++ b/src/main/java/com/metaweb/gridworks/expr/Parser.java @@ -1,25 +1,25 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.metaweb.gridlock.expr.Scanner.NumberToken; -import com.metaweb.gridlock.expr.Scanner.Token; -import com.metaweb.gridlock.expr.Scanner.TokenType; -import com.metaweb.gridlock.expr.functions.And; -import com.metaweb.gridlock.expr.functions.Get; -import com.metaweb.gridlock.expr.functions.IsNotNull; -import com.metaweb.gridlock.expr.functions.IsNull; -import com.metaweb.gridlock.expr.functions.Not; -import com.metaweb.gridlock.expr.functions.Or; -import com.metaweb.gridlock.expr.functions.Replace; -import com.metaweb.gridlock.expr.functions.Slice; -import com.metaweb.gridlock.expr.functions.Split; -import com.metaweb.gridlock.expr.functions.ToLowercase; -import com.metaweb.gridlock.expr.functions.ToTitlecase; -import com.metaweb.gridlock.expr.functions.ToUppercase; +import com.metaweb.gridworks.expr.Scanner.NumberToken; +import com.metaweb.gridworks.expr.Scanner.Token; +import com.metaweb.gridworks.expr.Scanner.TokenType; +import com.metaweb.gridworks.expr.functions.And; +import com.metaweb.gridworks.expr.functions.Get; +import com.metaweb.gridworks.expr.functions.IsNotNull; +import com.metaweb.gridworks.expr.functions.IsNull; +import com.metaweb.gridworks.expr.functions.Not; +import com.metaweb.gridworks.expr.functions.Or; +import com.metaweb.gridworks.expr.functions.Replace; +import com.metaweb.gridworks.expr.functions.Slice; +import com.metaweb.gridworks.expr.functions.Split; +import com.metaweb.gridworks.expr.functions.ToLowercase; +import com.metaweb.gridworks.expr.functions.ToTitlecase; +import com.metaweb.gridworks.expr.functions.ToUppercase; public class Parser { protected Scanner _scanner; diff --git a/src/main/java/com/metaweb/gridlock/expr/Scanner.java b/src/main/java/com/metaweb/gridworks/expr/Scanner.java similarity index 94% rename from src/main/java/com/metaweb/gridlock/expr/Scanner.java rename to src/main/java/com/metaweb/gridworks/expr/Scanner.java index 3bc8c10d4..0d7d238da 100644 --- a/src/main/java/com/metaweb/gridlock/expr/Scanner.java +++ b/src/main/java/com/metaweb/gridworks/expr/Scanner.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; public class Scanner { static public enum TokenType { diff --git a/src/main/java/com/metaweb/gridlock/expr/VariableExpr.java b/src/main/java/com/metaweb/gridworks/expr/VariableExpr.java similarity index 84% rename from src/main/java/com/metaweb/gridlock/expr/VariableExpr.java rename to src/main/java/com/metaweb/gridworks/expr/VariableExpr.java index d4b89125c..74227acfc 100644 --- a/src/main/java/com/metaweb/gridlock/expr/VariableExpr.java +++ b/src/main/java/com/metaweb/gridworks/expr/VariableExpr.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.expr; +package com.metaweb.gridworks.expr; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/And.java b/src/main/java/com/metaweb/gridworks/expr/functions/And.java similarity index 69% rename from src/main/java/com/metaweb/gridlock/expr/functions/And.java rename to src/main/java/com/metaweb/gridworks/expr/functions/And.java index aefb7a69c..13df05512 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/And.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/And.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class And implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Get.java b/src/main/java/com/metaweb/gridworks/expr/functions/Get.java similarity index 91% rename from src/main/java/com/metaweb/gridlock/expr/functions/Get.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Get.java index 2b42c586a..f9e201e3f 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Get.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Get.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Get implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/IsNotNull.java b/src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java similarity index 65% rename from src/main/java/com/metaweb/gridlock/expr/functions/IsNotNull.java rename to src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java index 5fe02ea06..ede6223e8 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/IsNotNull.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/IsNotNull.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class IsNotNull implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/IsNull.java b/src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java similarity index 65% rename from src/main/java/com/metaweb/gridlock/expr/functions/IsNull.java rename to src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java index b09e7e099..ea5b883da 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/IsNull.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/IsNull.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class IsNull implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Not.java b/src/main/java/com/metaweb/gridworks/expr/functions/Not.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/expr/functions/Not.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Not.java index c100e263b..99fa013e4 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Not.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Not.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Not implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Or.java b/src/main/java/com/metaweb/gridworks/expr/functions/Or.java similarity index 69% rename from src/main/java/com/metaweb/gridlock/expr/functions/Or.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Or.java index 2ae35e313..09a5fd01c 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Or.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Or.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Or implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Replace.java b/src/main/java/com/metaweb/gridworks/expr/functions/Replace.java similarity index 81% rename from src/main/java/com/metaweb/gridlock/expr/functions/Replace.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Replace.java index 50e00b601..23013e7b9 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Replace.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Replace.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Replace implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Slice.java b/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java similarity index 91% rename from src/main/java/com/metaweb/gridlock/expr/functions/Slice.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Slice.java index 1ef8464c7..ea011efc6 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Slice.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Slice.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Slice implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/Split.java b/src/main/java/com/metaweb/gridworks/expr/functions/Split.java similarity index 78% rename from src/main/java/com/metaweb/gridlock/expr/functions/Split.java rename to src/main/java/com/metaweb/gridworks/expr/functions/Split.java index 615370856..b65ece788 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/Split.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/Split.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class Split implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/ToLowercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java similarity index 74% rename from src/main/java/com/metaweb/gridlock/expr/functions/ToLowercase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java index 070012702..bb9dd4dea 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/ToLowercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToLowercase.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class ToLowercase implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/ToTitlecase.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java similarity index 84% rename from src/main/java/com/metaweb/gridlock/expr/functions/ToTitlecase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java index ef7d1c141..809402114 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/ToTitlecase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToTitlecase.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class ToTitlecase implements Function { diff --git a/src/main/java/com/metaweb/gridlock/expr/functions/ToUppercase.java b/src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java similarity index 74% rename from src/main/java/com/metaweb/gridlock/expr/functions/ToUppercase.java rename to src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java index 3ddb1cab6..f7a4eda99 100644 --- a/src/main/java/com/metaweb/gridlock/expr/functions/ToUppercase.java +++ b/src/main/java/com/metaweb/gridworks/expr/functions/ToUppercase.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.expr.functions; +package com.metaweb.gridworks.expr.functions; import java.util.Properties; -import com.metaweb.gridlock.expr.Function; +import com.metaweb.gridworks.expr.Function; public class ToUppercase implements Function { diff --git a/src/main/java/com/metaweb/gridlock/history/CellChange.java b/src/main/java/com/metaweb/gridworks/history/CellChange.java similarity index 81% rename from src/main/java/com/metaweb/gridlock/history/CellChange.java rename to src/main/java/com/metaweb/gridworks/history/CellChange.java index e77f56376..75430c309 100644 --- a/src/main/java/com/metaweb/gridlock/history/CellChange.java +++ b/src/main/java/com/metaweb/gridworks/history/CellChange.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.io.Serializable; -import com.metaweb.gridlock.model.Cell; +import com.metaweb.gridworks.model.Cell; public class CellChange implements Serializable { private static final long serialVersionUID = -2637405780084390883L; diff --git a/src/main/java/com/metaweb/gridlock/history/Change.java b/src/main/java/com/metaweb/gridworks/history/Change.java similarity index 62% rename from src/main/java/com/metaweb/gridlock/history/Change.java rename to src/main/java/com/metaweb/gridworks/history/Change.java index 6ecf3cb4a..b9b737a00 100644 --- a/src/main/java/com/metaweb/gridlock/history/Change.java +++ b/src/main/java/com/metaweb/gridworks/history/Change.java @@ -1,8 +1,8 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.io.Serializable; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.model.Project; public interface Change extends Serializable { public void apply(Project project); diff --git a/src/main/java/com/metaweb/gridlock/history/History.java b/src/main/java/com/metaweb/gridworks/history/History.java similarity index 90% rename from src/main/java/com/metaweb/gridlock/history/History.java rename to src/main/java/com/metaweb/gridworks/history/History.java index 18b01b187..3ca2ddb8c 100644 --- a/src/main/java/com/metaweb/gridlock/history/History.java +++ b/src/main/java/com/metaweb/gridworks/history/History.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.io.Serializable; import java.util.ArrayList; @@ -9,9 +9,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.ProjectManager; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.model.Project; public class History implements Serializable, Jsonizable { private static final long serialVersionUID = -1529783362243627391L; diff --git a/src/main/java/com/metaweb/gridlock/history/HistoryEntry.java b/src/main/java/com/metaweb/gridworks/history/HistoryEntry.java similarity index 90% rename from src/main/java/com/metaweb/gridlock/history/HistoryEntry.java rename to src/main/java/com/metaweb/gridworks/history/HistoryEntry.java index b86bd4002..125877f51 100644 --- a/src/main/java/com/metaweb/gridlock/history/HistoryEntry.java +++ b/src/main/java/com/metaweb/gridworks/history/HistoryEntry.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.io.File; import java.io.FileInputStream; @@ -14,9 +14,9 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.ProjectManager; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.ProjectManager; +import com.metaweb.gridworks.model.Project; public class HistoryEntry implements Serializable, Jsonizable { private static final long serialVersionUID = 532766467813930262L; diff --git a/src/main/java/com/metaweb/gridlock/history/HistoryProcess.java b/src/main/java/com/metaweb/gridworks/history/HistoryProcess.java similarity index 85% rename from src/main/java/com/metaweb/gridlock/history/HistoryProcess.java rename to src/main/java/com/metaweb/gridworks/history/HistoryProcess.java index 65980188a..c94c5990c 100644 --- a/src/main/java/com/metaweb/gridlock/history/HistoryProcess.java +++ b/src/main/java/com/metaweb/gridworks/history/HistoryProcess.java @@ -1,13 +1,13 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.process.Process; -import com.metaweb.gridlock.process.ProcessManager; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.process.Process; +import com.metaweb.gridworks.process.ProcessManager; public class HistoryProcess extends Process { final protected Project _project; diff --git a/src/main/java/com/metaweb/gridlock/history/MassCellChange.java b/src/main/java/com/metaweb/gridworks/history/MassCellChange.java similarity index 87% rename from src/main/java/com/metaweb/gridlock/history/MassCellChange.java rename to src/main/java/com/metaweb/gridworks/history/MassCellChange.java index 5003c4e6d..742333e3c 100644 --- a/src/main/java/com/metaweb/gridlock/history/MassCellChange.java +++ b/src/main/java/com/metaweb/gridworks/history/MassCellChange.java @@ -1,9 +1,9 @@ -package com.metaweb.gridlock.history; +package com.metaweb.gridworks.history; import java.util.List; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Row; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Row; public class MassCellChange implements Change { private static final long serialVersionUID = -933571199802688027L; diff --git a/src/main/java/com/metaweb/gridlock/model/Cell.java b/src/main/java/com/metaweb/gridworks/model/Cell.java similarity index 82% rename from src/main/java/com/metaweb/gridlock/model/Cell.java rename to src/main/java/com/metaweb/gridworks/model/Cell.java index 8dc4c8d13..ce818075c 100644 --- a/src/main/java/com/metaweb/gridlock/model/Cell.java +++ b/src/main/java/com/metaweb/gridworks/model/Cell.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.Properties; @@ -6,8 +6,8 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.expr.HasFields; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.expr.HasFields; public class Cell implements Serializable, HasFields, Jsonizable { private static final long serialVersionUID = -5891067829205458102L; diff --git a/src/main/java/com/metaweb/gridlock/model/Column.java b/src/main/java/com/metaweb/gridworks/model/Column.java similarity index 90% rename from src/main/java/com/metaweb/gridlock/model/Column.java rename to src/main/java/com/metaweb/gridworks/model/Column.java index 8d8f48422..9e2e23be8 100644 --- a/src/main/java/com/metaweb/gridlock/model/Column.java +++ b/src/main/java/com/metaweb/gridworks/model/Column.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.HashMap; @@ -8,7 +8,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; +import com.metaweb.gridworks.Jsonizable; public class Column implements Serializable, Jsonizable { private static final long serialVersionUID = -1063342490951563563L; diff --git a/src/main/java/com/metaweb/gridlock/model/ColumnModel.java b/src/main/java/com/metaweb/gridworks/model/ColumnModel.java similarity index 89% rename from src/main/java/com/metaweb/gridlock/model/ColumnModel.java rename to src/main/java/com/metaweb/gridworks/model/ColumnModel.java index 3eb897a53..5bd9f2b06 100644 --- a/src/main/java/com/metaweb/gridlock/model/ColumnModel.java +++ b/src/main/java/com/metaweb/gridworks/model/ColumnModel.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.LinkedList; @@ -9,7 +9,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; +import com.metaweb.gridworks.Jsonizable; public class ColumnModel implements Serializable, Jsonizable { private static final long serialVersionUID = 7679639795211544511L; diff --git a/src/main/java/com/metaweb/gridlock/model/Project.java b/src/main/java/com/metaweb/gridworks/model/Project.java similarity index 83% rename from src/main/java/com/metaweb/gridlock/model/Project.java rename to src/main/java/com/metaweb/gridworks/model/Project.java index 0d01397e8..cf419d92a 100644 --- a/src/main/java/com/metaweb/gridlock/model/Project.java +++ b/src/main/java/com/metaweb/gridworks/model/Project.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.IOException; import java.io.ObjectInputStream; @@ -6,8 +6,8 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.metaweb.gridlock.history.History; -import com.metaweb.gridlock.process.ProcessManager; +import com.metaweb.gridworks.history.History; +import com.metaweb.gridworks.process.ProcessManager; public class Project implements Serializable { private static final long serialVersionUID = -5089046824819472570L; diff --git a/src/main/java/com/metaweb/gridlock/model/Recon.java b/src/main/java/com/metaweb/gridworks/model/Recon.java similarity index 91% rename from src/main/java/com/metaweb/gridlock/model/Recon.java rename to src/main/java/com/metaweb/gridworks/model/Recon.java index b7eae8b06..e5472f572 100644 --- a/src/main/java/com/metaweb/gridlock/model/Recon.java +++ b/src/main/java/com/metaweb/gridworks/model/Recon.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.HashMap; @@ -10,8 +10,8 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.expr.HasFields; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.expr.HasFields; public class Recon implements Serializable, HasFields, Jsonizable { private static final long serialVersionUID = 8906257833709315762L; diff --git a/src/main/java/com/metaweb/gridlock/model/ReconCandidate.java b/src/main/java/com/metaweb/gridworks/model/ReconCandidate.java similarity index 87% rename from src/main/java/com/metaweb/gridlock/model/ReconCandidate.java rename to src/main/java/com/metaweb/gridworks/model/ReconCandidate.java index 06d305b78..eb829dcfc 100644 --- a/src/main/java/com/metaweb/gridlock/model/ReconCandidate.java +++ b/src/main/java/com/metaweb/gridworks/model/ReconCandidate.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.Properties; @@ -6,8 +6,8 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.expr.HasFields; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.expr.HasFields; public class ReconCandidate implements Serializable, HasFields, Jsonizable { private static final long serialVersionUID = -8013997214978715606L; diff --git a/src/main/java/com/metaweb/gridlock/model/Row.java b/src/main/java/com/metaweb/gridworks/model/Row.java similarity index 88% rename from src/main/java/com/metaweb/gridlock/model/Row.java rename to src/main/java/com/metaweb/gridworks/model/Row.java index e71dc5b39..f68ff3bac 100644 --- a/src/main/java/com/metaweb/gridlock/model/Row.java +++ b/src/main/java/com/metaweb/gridworks/model/Row.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.model; +package com.metaweb.gridworks.model; import java.io.Serializable; import java.util.ArrayList; @@ -8,8 +8,8 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; -import com.metaweb.gridlock.expr.HasFields; +import com.metaweb.gridworks.Jsonizable; +import com.metaweb.gridworks.expr.HasFields; public class Row implements Serializable, HasFields, Jsonizable { private static final long serialVersionUID = -689264211730915507L; diff --git a/src/main/java/com/metaweb/gridlock/process/LongRunningProcess.java b/src/main/java/com/metaweb/gridworks/process/LongRunningProcess.java similarity index 93% rename from src/main/java/com/metaweb/gridlock/process/LongRunningProcess.java rename to src/main/java/com/metaweb/gridworks/process/LongRunningProcess.java index 924286cfe..c60b12498 100644 --- a/src/main/java/com/metaweb/gridlock/process/LongRunningProcess.java +++ b/src/main/java/com/metaweb/gridworks/process/LongRunningProcess.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.process; +package com.metaweb.gridworks.process; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridlock/process/Process.java b/src/main/java/com/metaweb/gridworks/process/Process.java similarity index 76% rename from src/main/java/com/metaweb/gridlock/process/Process.java rename to src/main/java/com/metaweb/gridworks/process/Process.java index b8eacc215..38b84e284 100644 --- a/src/main/java/com/metaweb/gridlock/process/Process.java +++ b/src/main/java/com/metaweb/gridworks/process/Process.java @@ -1,6 +1,6 @@ -package com.metaweb.gridlock.process; +package com.metaweb.gridworks.process; -import com.metaweb.gridlock.Jsonizable; +import com.metaweb.gridworks.Jsonizable; public abstract class Process implements Jsonizable { abstract public boolean isImmediate(); diff --git a/src/main/java/com/metaweb/gridlock/process/ProcessManager.java b/src/main/java/com/metaweb/gridworks/process/ProcessManager.java similarity index 89% rename from src/main/java/com/metaweb/gridlock/process/ProcessManager.java rename to src/main/java/com/metaweb/gridworks/process/ProcessManager.java index fdab62859..3f9fc5687 100644 --- a/src/main/java/com/metaweb/gridlock/process/ProcessManager.java +++ b/src/main/java/com/metaweb/gridworks/process/ProcessManager.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.process; +package com.metaweb.gridworks.process; import java.util.LinkedList; import java.util.List; @@ -7,7 +7,7 @@ import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.Jsonizable; +import com.metaweb.gridworks.Jsonizable; public class ProcessManager implements Jsonizable { protected List _processes = new LinkedList(); diff --git a/src/main/java/com/metaweb/gridlock/process/QuickHistoryEntryProcess.java b/src/main/java/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java similarity index 86% rename from src/main/java/com/metaweb/gridlock/process/QuickHistoryEntryProcess.java rename to src/main/java/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java index 3bc83424c..c70820ef7 100644 --- a/src/main/java/com/metaweb/gridlock/process/QuickHistoryEntryProcess.java +++ b/src/main/java/com/metaweb/gridworks/process/QuickHistoryEntryProcess.java @@ -1,12 +1,12 @@ -package com.metaweb.gridlock.process; +package com.metaweb.gridworks.process; import java.util.Properties; import org.json.JSONException; import org.json.JSONWriter; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.model.Project; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.model.Project; public class QuickHistoryEntryProcess extends Process { final protected Project _project; diff --git a/src/main/java/com/metaweb/gridlock/process/ReconProcess.java b/src/main/java/com/metaweb/gridworks/process/ReconProcess.java similarity index 91% rename from src/main/java/com/metaweb/gridlock/process/ReconProcess.java rename to src/main/java/com/metaweb/gridworks/process/ReconProcess.java index 7666663f3..f40c7f28c 100644 --- a/src/main/java/com/metaweb/gridlock/process/ReconProcess.java +++ b/src/main/java/com/metaweb/gridworks/process/ReconProcess.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.process; +package com.metaweb.gridworks.process; import java.io.IOException; import java.io.InputStream; @@ -20,14 +20,14 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONWriter; -import com.metaweb.gridlock.history.CellChange; -import com.metaweb.gridlock.history.HistoryEntry; -import com.metaweb.gridlock.history.MassCellChange; -import com.metaweb.gridlock.model.Cell; -import com.metaweb.gridlock.model.Project; -import com.metaweb.gridlock.model.Recon; -import com.metaweb.gridlock.model.ReconCandidate; -import com.metaweb.gridlock.util.ParsingUtilities; +import com.metaweb.gridworks.history.CellChange; +import com.metaweb.gridworks.history.HistoryEntry; +import com.metaweb.gridworks.history.MassCellChange; +import com.metaweb.gridworks.model.Cell; +import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.model.Recon; +import com.metaweb.gridworks.model.ReconCandidate; +import com.metaweb.gridworks.util.ParsingUtilities; public class ReconProcess extends LongRunningProcess implements Runnable { static public class ReconEntry { diff --git a/src/main/java/com/metaweb/gridlock/util/IndentWriter.java b/src/main/java/com/metaweb/gridworks/util/IndentWriter.java similarity index 93% rename from src/main/java/com/metaweb/gridlock/util/IndentWriter.java rename to src/main/java/com/metaweb/gridworks/util/IndentWriter.java index cd58f3bbb..9ce68d74f 100644 --- a/src/main/java/com/metaweb/gridlock/util/IndentWriter.java +++ b/src/main/java/com/metaweb/gridworks/util/IndentWriter.java @@ -2,7 +2,7 @@ * Created on Dec 1, 2005 * Created by dfhuynh */ -package com.metaweb.gridlock.util; +package com.metaweb.gridworks.util; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/com/metaweb/gridlock/util/JSObject.java b/src/main/java/com/metaweb/gridworks/util/JSObject.java similarity index 95% rename from src/main/java/com/metaweb/gridlock/util/JSObject.java rename to src/main/java/com/metaweb/gridworks/util/JSObject.java index 604fe5168..8fb196cdd 100644 --- a/src/main/java/com/metaweb/gridlock/util/JSObject.java +++ b/src/main/java/com/metaweb/gridworks/util/JSObject.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.util; +package com.metaweb.gridworks.util; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/com/metaweb/gridlock/util/ParsingUtilities.java b/src/main/java/com/metaweb/gridworks/util/ParsingUtilities.java similarity index 94% rename from src/main/java/com/metaweb/gridlock/util/ParsingUtilities.java rename to src/main/java/com/metaweb/gridworks/util/ParsingUtilities.java index 88eff7622..9504447b8 100644 --- a/src/main/java/com/metaweb/gridlock/util/ParsingUtilities.java +++ b/src/main/java/com/metaweb/gridworks/util/ParsingUtilities.java @@ -1,4 +1,4 @@ -package com.metaweb.gridlock.util; +package com.metaweb.gridworks.util; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index bd02a1a0b..a59b1b079 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -6,13 +6,13 @@ - Gridlock - com.metaweb.gridlock.GridlockServlet + Gridworks + com.metaweb.gridworks.GridworksServlet 1 - Gridlock + Gridworks /command/*