diff --git a/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java index ba9692616..a88956feb 100644 --- a/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/cell/JoinMultiValueCellsCommand.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.MultiValuedCellJoinOperation; +import com.metaweb.gridworks.operations.cell.MultiValuedCellJoinOperation; import com.metaweb.gridworks.process.Process; public class JoinMultiValueCellsCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java index 5dab4bb60..30facd64b 100644 --- a/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/cell/MassEditCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.MassEditOperation; +import com.metaweb.gridworks.operations.cell.MassEditOperation; import com.metaweb.gridworks.util.ParsingUtilities; public class MassEditCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java index eb4ed0499..6111850d5 100644 --- a/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/cell/SplitMultiValueCellsCommand.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.MultiValuedCellSplitOperation; +import com.metaweb.gridworks.operations.cell.MultiValuedCellSplitOperation; import com.metaweb.gridworks.process.Process; public class SplitMultiValueCellsCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java b/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java index 573bf663c..d91d98f60 100644 --- a/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/cell/TextTransformCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.TextTransformOperation; +import com.metaweb.gridworks.operations.cell.TextTransformOperation; public class TextTransformCommand extends EngineDependentCommand { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java index 2fa615f93..03ddbacc1 100644 --- a/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/column/AddColumnCommand.java @@ -7,8 +7,8 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ColumnAdditionOperation; -import com.metaweb.gridworks.operations.TextTransformOperation; +import com.metaweb.gridworks.operations.cell.TextTransformOperation; +import com.metaweb.gridworks.operations.column.ColumnAdditionOperation; public class AddColumnCommand extends EngineDependentCommand { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java index 8e9b03647..fe73fff85 100644 --- a/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/column/ExtendDataCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ExtendDataOperation; +import com.metaweb.gridworks.operations.column.ExtendDataOperation; import com.metaweb.gridworks.util.ParsingUtilities; public class ExtendDataCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java index 6d1902780..a3a584c5a 100644 --- a/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/column/RemoveColumnCommand.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ColumnRemovalOperation; +import com.metaweb.gridworks.operations.column.ColumnRemovalOperation; import com.metaweb.gridworks.process.Process; public class RemoveColumnCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java index e8521424e..d4ee0150f 100644 --- a/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/column/RenameColumnCommand.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ColumnRenameOperation; +import com.metaweb.gridworks.operations.column.ColumnRenameOperation; import com.metaweb.gridworks.process.Process; public class RenameColumnCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java index f2d5410b9..97fc8d764 100644 --- a/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/column/SplitColumnCommand.java @@ -8,7 +8,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ColumnSplitOperation; +import com.metaweb.gridworks.operations.column.ColumnSplitOperation; import com.metaweb.gridworks.util.ParsingUtilities; public class SplitColumnCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java index 1c2086865..5684a766c 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ReconDiscardJudgmentsOperation; +import com.metaweb.gridworks.operations.recon.ReconDiscardJudgmentsOperation; public class ReconDiscardJudgmentsCommand extends EngineDependentCommand { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java index 403907871..923456368 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconJudgeSimilarCellsCommand.java @@ -10,7 +10,7 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Recon; import com.metaweb.gridworks.model.ReconCandidate; import com.metaweb.gridworks.model.Recon.Judgment; -import com.metaweb.gridworks.operations.ReconJudgeSimilarCellsOperation; +import com.metaweb.gridworks.operations.recon.ReconJudgeSimilarCellsOperation; public class ReconJudgeSimilarCellsCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java index 6613ecdf1..5b83f2d77 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ReconMarkNewTopicsOperation; +import com.metaweb.gridworks.operations.recon.ReconMarkNewTopicsOperation; public class ReconMarkNewTopicsCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java index a9ea558a8..f17194155 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.ReconMatchBestCandidatesOperation; +import com.metaweb.gridworks.operations.recon.ReconMatchBestCandidatesOperation; public class ReconMatchBestCandidatesCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java index e00a82ee8..2c775b7c2 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java @@ -8,7 +8,7 @@ import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.ReconCandidate; -import com.metaweb.gridworks.operations.ReconMatchSpecificTopicOperation; +import com.metaweb.gridworks.operations.recon.ReconMatchSpecificTopicOperation; public class ReconMatchSpecificTopicCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java b/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java index 984acbe79..c16957c7d 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java @@ -9,7 +9,7 @@ import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.recon.ReconConfig; -import com.metaweb.gridworks.operations.ReconOperation; +import com.metaweb.gridworks.operations.recon.ReconOperation; public class ReconcileCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java b/src/main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java index 6446b889d..6414d4b45 100644 --- a/src/main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/row/AnnotateRowsCommand.java @@ -7,8 +7,8 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.RowFlagOperation; -import com.metaweb.gridworks.operations.RowStarOperation; +import com.metaweb.gridworks.operations.row.RowFlagOperation; +import com.metaweb.gridworks.operations.row.RowStarOperation; public class AnnotateRowsCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java b/src/main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java index 8b6fb19ed..4dafa103c 100644 --- a/src/main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/row/DenormalizeCommand.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.DenormalizeOperation; +import com.metaweb.gridworks.operations.row.DenormalizeOperation; import com.metaweb.gridworks.process.Process; public class DenormalizeCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java b/src/main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java index ce9a65fc0..ceb46d4ef 100644 --- a/src/main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/row/RemoveRowsCommand.java @@ -7,7 +7,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.operations.RowRemovalOperation; +import com.metaweb.gridworks.operations.row.RowRemovalOperation; public class RemoveRowsCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java index 57407e3db..cabb9bbe8 100644 --- a/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java +++ b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java @@ -8,6 +8,25 @@ import org.json.JSONObject; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; +import com.metaweb.gridworks.operations.cell.MassEditOperation; +import com.metaweb.gridworks.operations.cell.MultiValuedCellJoinOperation; +import com.metaweb.gridworks.operations.cell.MultiValuedCellSplitOperation; +import com.metaweb.gridworks.operations.cell.TextTransformOperation; +import com.metaweb.gridworks.operations.column.ColumnAdditionOperation; +import com.metaweb.gridworks.operations.column.ColumnRemovalOperation; +import com.metaweb.gridworks.operations.column.ColumnRenameOperation; +import com.metaweb.gridworks.operations.column.ColumnSplitOperation; +import com.metaweb.gridworks.operations.column.ExtendDataOperation; +import com.metaweb.gridworks.operations.recon.ReconDiscardJudgmentsOperation; +import com.metaweb.gridworks.operations.recon.ReconJudgeSimilarCellsOperation; +import com.metaweb.gridworks.operations.recon.ReconMarkNewTopicsOperation; +import com.metaweb.gridworks.operations.recon.ReconMatchBestCandidatesOperation; +import com.metaweb.gridworks.operations.recon.ReconMatchSpecificTopicOperation; +import com.metaweb.gridworks.operations.recon.ReconOperation; +import com.metaweb.gridworks.operations.row.DenormalizeOperation; +import com.metaweb.gridworks.operations.row.RowFlagOperation; +import com.metaweb.gridworks.operations.row.RowRemovalOperation; +import com.metaweb.gridworks.operations.row.RowStarOperation; public abstract class OperationRegistry { diff --git a/src/main/java/com/metaweb/gridworks/operations/MassEditOperation.java b/src/main/java/com/metaweb/gridworks/operations/cell/MassEditOperation.java similarity index 98% rename from src/main/java/com/metaweb/gridworks/operations/MassEditOperation.java rename to src/main/java/com/metaweb/gridworks/operations/cell/MassEditOperation.java index e7eda4aa8..842b54ce5 100644 --- a/src/main/java/com/metaweb/gridworks/operations/MassEditOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/cell/MassEditOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.cell; import java.io.Serializable; import java.util.ArrayList; @@ -23,6 +23,8 @@ import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.CellChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; import com.metaweb.gridworks.util.ParsingUtilities; public class MassEditOperation extends EngineDependentMassCellOperation { diff --git a/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java b/src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java rename to src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java index fb382df0c..dafba7be2 100644 --- a/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellJoinOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.cell; import java.util.ArrayList; import java.util.List; @@ -16,6 +16,7 @@ import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.MassRowChange; +import com.metaweb.gridworks.operations.OperationRegistry; public class MultiValuedCellJoinOperation extends AbstractOperation { final protected String _columnName; diff --git a/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java b/src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java rename to src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java index f170523d5..d14e92a85 100644 --- a/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/cell/MultiValuedCellSplitOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.cell; import java.util.ArrayList; import java.util.List; @@ -16,6 +16,7 @@ import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.MassRowChange; +import com.metaweb.gridworks.operations.OperationRegistry; public class MultiValuedCellSplitOperation extends AbstractOperation { final protected String _columnName; diff --git a/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java b/src/main/java/com/metaweb/gridworks/operations/cell/TextTransformOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java rename to src/main/java/com/metaweb/gridworks/operations/cell/TextTransformOperation.java index a099b502d..192ebfbeb 100644 --- a/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/cell/TextTransformOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.cell; import java.io.Serializable; import java.util.List; @@ -19,6 +19,9 @@ import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.CellChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OnError; +import com.metaweb.gridworks.operations.OperationRegistry; public class TextTransformOperation extends EngineDependentMassCellOperation { final protected String _expression; diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java b/src/main/java/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java rename to src/main/java/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java index c83d8d776..d818ea935 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/column/ColumnAdditionOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.column; import java.io.Serializable; import java.util.ArrayList; @@ -25,6 +25,10 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.CellAtRow; import com.metaweb.gridworks.model.changes.ColumnAdditionChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OnError; +import com.metaweb.gridworks.operations.OperationRegistry; +import com.metaweb.gridworks.operations.cell.TextTransformOperation; public class ColumnAdditionOperation extends EngineDependentOperation { final protected String _baseColumnName; diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java b/src/main/java/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java rename to src/main/java/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java index 1c5e4ede6..44846261c 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/column/ColumnRemovalOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.column; import java.util.Properties; @@ -12,6 +12,7 @@ import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.changes.ColumnRemovalChange; +import com.metaweb.gridworks.operations.OperationRegistry; public class ColumnRemovalOperation extends AbstractOperation { final protected String _columnName; diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnRenameOperation.java b/src/main/java/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/operations/ColumnRenameOperation.java rename to src/main/java/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java index 7107dc271..f79cd5738 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnRenameOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/column/ColumnRenameOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.column; import java.util.Properties; @@ -11,6 +11,7 @@ import com.metaweb.gridworks.history.HistoryEntry; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.changes.ColumnRenameChange; +import com.metaweb.gridworks.operations.OperationRegistry; public class ColumnRenameOperation extends AbstractOperation { final protected String _oldColumnName; diff --git a/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java b/src/main/java/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java similarity index 98% rename from src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java rename to src/main/java/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java index eaac625e1..af19ba939 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ColumnSplitOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/column/ColumnSplitOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.column; import java.io.Serializable; import java.util.ArrayList; @@ -23,6 +23,8 @@ import com.metaweb.gridworks.model.Column; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.ColumnSplitChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; import com.metaweb.gridworks.util.JSONUtilities; public class ColumnSplitOperation extends EngineDependentOperation { diff --git a/src/main/java/com/metaweb/gridworks/operations/ExtendDataOperation.java b/src/main/java/com/metaweb/gridworks/operations/column/ExtendDataOperation.java similarity index 98% rename from src/main/java/com/metaweb/gridworks/operations/ExtendDataOperation.java rename to src/main/java/com/metaweb/gridworks/operations/column/ExtendDataOperation.java index 8f92ba19e..8d553b206 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ExtendDataOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/column/ExtendDataOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.column; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +25,8 @@ import com.metaweb.gridworks.model.ReconCandidate; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.CellAtRow; import com.metaweb.gridworks.model.changes.DataExtensionChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; import com.metaweb.gridworks.process.LongRunningProcess; import com.metaweb.gridworks.process.Process; import com.metaweb.gridworks.protograph.FreebaseType; diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java index e56c69445..287ac328a 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconDiscardJudgmentsOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.HashMap; import java.util.List; @@ -20,6 +20,8 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.Recon.Judgment; import com.metaweb.gridworks.model.changes.CellChange; import com.metaweb.gridworks.model.changes.ReconChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class ReconDiscardJudgmentsOperation extends EngineDependentMassCellOperation { static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception { diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconJudgeSimilarCellsOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java similarity index 98% rename from src/main/java/com/metaweb/gridworks/operations/ReconJudgeSimilarCellsOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java index f06798690..cf76fa02c 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconJudgeSimilarCellsOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconJudgeSimilarCellsOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.HashMap; import java.util.List; @@ -23,6 +23,8 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.Recon.Judgment; import com.metaweb.gridworks.model.changes.CellChange; import com.metaweb.gridworks.model.changes.ReconChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class ReconJudgeSimilarCellsOperation extends EngineDependentMassCellOperation { final protected String _similarValue; diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java index 1f00597da..7efae9d7c 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMarkNewTopicsOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.HashMap; import java.util.List; @@ -20,6 +20,8 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.Recon.Judgment; import com.metaweb.gridworks.model.changes.CellChange; import com.metaweb.gridworks.model.changes.ReconChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperation { final protected boolean _shareNewTopics; diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java index 76ecb3ad1..e72d888fd 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchBestCandidatesOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.HashMap; import java.util.List; @@ -21,6 +21,8 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.Recon.Judgment; import com.metaweb.gridworks.model.changes.CellChange; import com.metaweb.gridworks.model.changes.ReconChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class ReconMatchBestCandidatesOperation extends EngineDependentMassCellOperation { static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception { diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java index a7ae3333b..50007e46a 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconMatchSpecificTopicOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.HashMap; import java.util.List; @@ -22,6 +22,8 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.Recon.Judgment; import com.metaweb.gridworks.model.changes.CellChange; import com.metaweb.gridworks.model.changes.ReconChange; +import com.metaweb.gridworks.operations.EngineDependentMassCellOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class ReconMatchSpecificTopicOperation extends EngineDependentMassCellOperation { final protected ReconCandidate match; diff --git a/src/main/java/com/metaweb/gridworks/operations/ReconOperation.java b/src/main/java/com/metaweb/gridworks/operations/recon/ReconOperation.java similarity index 98% rename from src/main/java/com/metaweb/gridworks/operations/ReconOperation.java rename to src/main/java/com/metaweb/gridworks/operations/recon/ReconOperation.java index 3b93541e5..6964150de 100644 --- a/src/main/java/com/metaweb/gridworks/operations/ReconOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/recon/ReconOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.recon; import java.util.ArrayList; import java.util.HashMap; @@ -27,6 +27,8 @@ import com.metaweb.gridworks.model.changes.ReconChange; import com.metaweb.gridworks.model.recon.HeuristicReconConfig; import com.metaweb.gridworks.model.recon.ReconConfig; import com.metaweb.gridworks.model.recon.ReconJob; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; import com.metaweb.gridworks.process.LongRunningProcess; import com.metaweb.gridworks.process.Process; diff --git a/src/main/java/com/metaweb/gridworks/operations/DenormalizeOperation.java b/src/main/java/com/metaweb/gridworks/operations/row/DenormalizeOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/operations/DenormalizeOperation.java rename to src/main/java/com/metaweb/gridworks/operations/row/DenormalizeOperation.java index 3e6890420..ec176c902 100644 --- a/src/main/java/com/metaweb/gridworks/operations/DenormalizeOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/row/DenormalizeOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.row; import java.util.ArrayList; import java.util.List; @@ -16,6 +16,7 @@ import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.RecordModel.CellDependency; import com.metaweb.gridworks.model.RecordModel.RowDependency; import com.metaweb.gridworks.model.changes.MassRowChange; +import com.metaweb.gridworks.operations.OperationRegistry; public class DenormalizeOperation extends AbstractOperation { static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception { diff --git a/src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java b/src/main/java/com/metaweb/gridworks/operations/row/RowFlagOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java rename to src/main/java/com/metaweb/gridworks/operations/row/RowFlagOperation.java index 955a0cd6d..53e953202 100644 --- a/src/main/java/com/metaweb/gridworks/operations/RowFlagOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/row/RowFlagOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.row; import java.util.ArrayList; import java.util.List; @@ -18,6 +18,8 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.MassChange; import com.metaweb.gridworks.model.changes.RowFlagChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class RowFlagOperation extends EngineDependentOperation { final protected boolean _flagged; diff --git a/src/main/java/com/metaweb/gridworks/operations/RowRemovalOperation.java b/src/main/java/com/metaweb/gridworks/operations/row/RowRemovalOperation.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/operations/RowRemovalOperation.java rename to src/main/java/com/metaweb/gridworks/operations/row/RowRemovalOperation.java index c7946e1b8..a08aa9717 100644 --- a/src/main/java/com/metaweb/gridworks/operations/RowRemovalOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/row/RowRemovalOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.row; import java.util.ArrayList; import java.util.List; @@ -16,6 +16,8 @@ import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.RowRemovalChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class RowRemovalOperation extends EngineDependentOperation { static public AbstractOperation reconstruct(Project project, JSONObject obj) throws Exception { diff --git a/src/main/java/com/metaweb/gridworks/operations/RowStarOperation.java b/src/main/java/com/metaweb/gridworks/operations/row/RowStarOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/operations/RowStarOperation.java rename to src/main/java/com/metaweb/gridworks/operations/row/RowStarOperation.java index 7ff9a9635..a37db65c9 100644 --- a/src/main/java/com/metaweb/gridworks/operations/RowStarOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/row/RowStarOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.operations; +package com.metaweb.gridworks.operations.row; import java.util.ArrayList; import java.util.List; @@ -18,6 +18,8 @@ import com.metaweb.gridworks.model.Project; import com.metaweb.gridworks.model.Row; import com.metaweb.gridworks.model.changes.MassChange; import com.metaweb.gridworks.model.changes.RowStarChange; +import com.metaweb.gridworks.operations.EngineDependentOperation; +import com.metaweb.gridworks.operations.OperationRegistry; public class RowStarOperation extends EngineDependentOperation { final protected boolean _starred;