diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java index 018871dc3..8cf3ebfb8 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/AddColumnCommand.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; -import com.metaweb.gridworks.model.operations.ColumnAdditionOperation; +import com.metaweb.gridworks.operations.ColumnAdditionOperation; public class AddColumnCommand extends EngineDependentCommand { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/ApplyOperationsCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/ApplyOperationsCommand.java index 90e39c450..f14299d89 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/ApplyOperationsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/ApplyOperationsCommand.java @@ -15,7 +15,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.model.operations.OperationRegistry; +import com.metaweb.gridworks.operations.OperationRegistry; import com.metaweb.gridworks.process.Process; public class ApplyOperationsCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java index e48aad9f3..cbef0c650 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/DoTextTransformCommand.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.operations.TextTransformOperation; +import com.metaweb.gridworks.operations.TextTransformOperation; public class DoTextTransformCommand extends EngineDependentCommand { @Override diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java index 316fde289..b1abd9a7e 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/JoinMultiValueCellsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/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.model.operations.MultiValuedCellJoinOperation; +import com.metaweb.gridworks.operations.MultiValuedCellJoinOperation; import com.metaweb.gridworks.process.Process; public class JoinMultiValueCellsCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java index a87fef71c..42b51597a 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/RemoveColumnCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/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.model.operations.ColumnRemovalOperation; +import com.metaweb.gridworks.operations.ColumnRemovalOperation; import com.metaweb.gridworks.process.Process; public class RemoveColumnCommand extends Command { diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/SaveProtographCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/SaveProtographCommand.java index 782563285..37a6024d3 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/SaveProtographCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/SaveProtographCommand.java @@ -12,7 +12,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.Command; import com.metaweb.gridworks.model.AbstractOperation; import com.metaweb.gridworks.model.Project; -import com.metaweb.gridworks.model.operations.SaveProtographOperation; +import com.metaweb.gridworks.operations.SaveProtographOperation; import com.metaweb.gridworks.process.Process; import com.metaweb.gridworks.protograph.Protograph; diff --git a/src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java b/src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java index 3ac34b72d..94e413055 100644 --- a/src/main/java/com/metaweb/gridworks/commands/edit/SplitMultiValueCellsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/edit/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.model.operations.MultiValuedCellSplitOperation; +import com.metaweb.gridworks.operations.MultiValuedCellSplitOperation; import com.metaweb.gridworks.process.Process; public class SplitMultiValueCellsCommand extends Command { 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 8a591c5ef..9205eb666 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconDiscardJudgmentsCommand.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; -import com.metaweb.gridworks.model.operations.ReconDiscardJudgmentsOperation; +import com.metaweb.gridworks.operations.ReconDiscardJudgmentsOperation; public class ReconDiscardJudgmentsCommand extends EngineDependentCommand { @Override 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 78be6eece..164932c1d 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMarkNewTopicsCommand.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; -import com.metaweb.gridworks.model.operations.ReconMarkNewTopicsOperation; +import com.metaweb.gridworks.operations.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 d292c051c..cf822e8d1 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchBestCandidatesCommand.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; -import com.metaweb.gridworks.model.operations.ReconMatchBestCandidatesOperation; +import com.metaweb.gridworks.operations.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 e2bc7aaa4..0493e48b6 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconMatchSpecificTopicCommand.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.ReconCandidate; -import com.metaweb.gridworks.model.operations.ReconMatchSpecificTopicOperation; +import com.metaweb.gridworks.operations.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 387d12cdd..2dd9904f9 100644 --- a/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java +++ b/src/main/java/com/metaweb/gridworks/commands/recon/ReconcileCommand.java @@ -6,7 +6,7 @@ import org.json.JSONObject; import com.metaweb.gridworks.commands.EngineDependentCommand; import com.metaweb.gridworks.model.AbstractOperation; -import com.metaweb.gridworks.model.operations.ReconOperation; +import com.metaweb.gridworks.operations.ReconOperation; public class ReconcileCommand extends EngineDependentCommand { diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ColumnAdditionOperation.java b/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/model/operations/ColumnAdditionOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java index e257d8313..249fae70f 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ColumnAdditionOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ColumnAdditionOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ColumnRemovalOperation.java b/src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/model/operations/ColumnRemovalOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java index b3cd8a43d..40d72bb6d 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ColumnRemovalOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ColumnRemovalOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/EngineDependentMassCellOperation.java b/src/main/java/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/EngineDependentMassCellOperation.java rename to src/main/java/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java index e10356420..bf07db565 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/EngineDependentMassCellOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/EngineDependentMassCellOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/EngineDependentOperation.java b/src/main/java/com/metaweb/gridworks/operations/EngineDependentOperation.java similarity index 92% rename from src/main/java/com/metaweb/gridworks/model/operations/EngineDependentOperation.java rename to src/main/java/com/metaweb/gridworks/operations/EngineDependentOperation.java index 2df5b35ee..46cec5cf5 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/EngineDependentOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/EngineDependentOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import org.json.JSONException; import org.json.JSONObject; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellJoinOperation.java b/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellJoinOperation.java rename to src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java index b697ed039..37ed3a7c1 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellJoinOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellJoinOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellSplitOperation.java b/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellSplitOperation.java rename to src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java index 31a9e51cf..946dcbcb9 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/MultiValuedCellSplitOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/MultiValuedCellSplitOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/OperationRegistry.java b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java similarity index 97% rename from src/main/java/com/metaweb/gridworks/model/operations/OperationRegistry.java rename to src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java index 4958842aa..794e1346a 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/OperationRegistry.java +++ b/src/main/java/com/metaweb/gridworks/operations/OperationRegistry.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ReconDiscardJudgmentsOperation.java b/src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/ReconDiscardJudgmentsOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java index 139719b7a..9b7e3c53d 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ReconDiscardJudgmentsOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ReconDiscardJudgmentsOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.List; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ReconMarkNewTopicsOperation.java b/src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/ReconMarkNewTopicsOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java index 83501cf1a..96f62e669 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ReconMarkNewTopicsOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ReconMarkNewTopicsOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.List; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ReconMatchBestCandidatesOperation.java b/src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/ReconMatchBestCandidatesOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java index be8ae886c..2c78bd0c4 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ReconMatchBestCandidatesOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ReconMatchBestCandidatesOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.List; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ReconMatchSpecificTopicOperation.java b/src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/model/operations/ReconMatchSpecificTopicOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java index 667cf6b62..ced354daa 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ReconMatchSpecificTopicOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ReconMatchSpecificTopicOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.List; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/ReconOperation.java b/src/main/java/com/metaweb/gridworks/operations/ReconOperation.java similarity index 96% rename from src/main/java/com/metaweb/gridworks/model/operations/ReconOperation.java rename to src/main/java/com/metaweb/gridworks/operations/ReconOperation.java index 231848960..30bb14e71 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/ReconOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/ReconOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.io.InputStream; import java.io.StringWriter; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/SaveProtographOperation.java b/src/main/java/com/metaweb/gridworks/operations/SaveProtographOperation.java similarity index 94% rename from src/main/java/com/metaweb/gridworks/model/operations/SaveProtographOperation.java rename to src/main/java/com/metaweb/gridworks/operations/SaveProtographOperation.java index d87d1aeef..ac9251424 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/SaveProtographOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/SaveProtographOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.Properties; diff --git a/src/main/java/com/metaweb/gridworks/model/operations/TextTransformOperation.java b/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java similarity index 95% rename from src/main/java/com/metaweb/gridworks/model/operations/TextTransformOperation.java rename to src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java index dce8dce13..33befb4ac 100644 --- a/src/main/java/com/metaweb/gridworks/model/operations/TextTransformOperation.java +++ b/src/main/java/com/metaweb/gridworks/operations/TextTransformOperation.java @@ -1,4 +1,4 @@ -package com.metaweb.gridworks.model.operations; +package com.metaweb.gridworks.operations; import java.util.List; import java.util.Properties;