Changeset 1158 for trunk/autoquest-core-usability-evaluation/src/main/java

Timestamp:

04/19/13 19:28:32 (12 years ago)

Author:

adeicke

Message:

Renaming from *Tree to *Model.

File:

• trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/CMDperformUsabilityEvaluation.java (modified) (5 diffs)

trunk/autoquest-core-usability-evaluation/src/main/java/de/ugoe/cs/autoquest/usability/CMDperformUsabilityEvaluation.java

@@ -36 +36 @@
 public class CMDperformUsabilityEvaluation implements Command {
 
-    private final int taskTreeParamaterIndex = 0;
+    private final int taskModelParamaterIndex = 0;
     
     private final int evaluationResultParameterIndex = 1;
@@ -49 +49 @@
     @Override
     public void run(List<Object> parameters) {
-        String nameOfTaskTree = getTaskTreeParameter(parameters);
-        Optional<ITaskModel> taskModel = getTaskModelFromDataContainer(nameOfTaskTree);
+        String nameOfTaskModel = getTaskModelParameter(parameters);
+        Optional<ITaskModel> taskModel = getTaskModelFromDataContainer(nameOfTaskModel);
         if (taskModel.isPresent()) {
             UsabilityRuleset ruleset = getUsabilityRuleset();
@@ -68 +68 @@
      * @return
      */
-    private String getTaskTreeParameter(List<Object> parameters) {
+    private String getTaskModelParameter(List<Object> parameters) {
         try {
-            return (String) parameters.get(taskTreeParamaterIndex);
+            return (String) parameters.get(taskModelParamaterIndex);
         } catch (Exception e) {
-            throw new IllegalArgumentException("must provide a task tree name");
+            throw new IllegalArgumentException("must provide a task model name");
         }
     }
@@ -96 +96 @@
      * </p>
      *
-     * @param nameOfTaskTree
+     * @param nameOfTaskModel
      * @return
      */
-    private Optional<ITaskModel> getTaskModelFromDataContainer(String nameOfTaskTree) {
-        Object dataObject = GlobalDataContainer.getInstance().getData(nameOfTaskTree);
+    private Optional<ITaskModel> getTaskModelFromDataContainer(String nameOfTaskModel) {
+        Object dataObject = GlobalDataContainer.getInstance().getData(nameOfTaskModel);
         if(dataObject != null) {
             if(dataObject instanceof ITaskModel) {
-                ITaskModel taskTree = (ITaskModel) dataObject;
-                return Optional.of(taskTree);
+                ITaskModel taskModel = (ITaskModel) dataObject;
+                return Optional.of(taskModel);
             } else {
-                CommandHelpers.objectNotType(nameOfTaskTree, "ITaskModel");
+                CommandHelpers.objectNotType(nameOfTaskModel, "ITaskModel");
                 return Optional.absent();
             }
         }
-        CommandHelpers.objectNotFoundMessage(nameOfTaskTree);
+        CommandHelpers.objectNotFoundMessage(nameOfTaskModel);
         return Optional.absent();
     }
@@ -145 +145 @@
     @Override
     public String help() {
-        return "peformUsabilityEvaluation <taskTree> {evaluationResult}";
+        return "peformUsabilityEvaluation <taskModel> {evaluationResult}";
     }