Changeset 1354 for trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands

Timestamp:

02/07/14 17:11:39 (10 years ago)

Author:

pharms

Message:

• added support for id replacements

Location:

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands

Files:

• CMDcondenseHTMLGUIModel.java (modified) (2 diffs)
• CMDparseDirHTML.java (modified) (2 diffs)
• CMDparseHTML.java (modified) (2 diffs)

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDcondenseHTMLGUIModel.java

@@ -927 +927 @@
 
         /* (non-Javadoc)
+         * @see java.lang.Object#equals(java.lang.Object)
+         */
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) {
+                return true;
+            }
+            else if (obj instanceof SimilarGUIElement) {
+                return (similarGUIElement.equals(((SimilarGUIElement) obj).similarGUIElement));
+            }
+            else {
+                return false;
+            }
+        }
+
+        /* (non-Javadoc)
+         * @see java.lang.Object#hashCode()
+         */
+        @Override
+        public int hashCode() {
+            return similarGUIElement.hashCode();
+        }
+
+        /* (non-Javadoc)
          * @see java.lang.Object#toString()
          */
@@ -933 +957 @@
             return similarGUIElement + " (" + mainClusterParent + ")";
         }
+
     }
         

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseDirHTML.java

@@ -69 +69 @@
                 }
                 else {
-                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/]*)");
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.]*)");
                     Matcher matcher = parseParamPattern.matcher(param);
                     
@@ -161 +161 @@
     @Override
     public String help() {
-        return "parseDirHTML <directory> {<sequencesName>} {<clearId>} {<clearIndex>}";
+        return "parseDirHTML <directory> [<sequencesName>] " +
+            "{-idReplacements=path/to/replacementfile} {-clearId=path/to[0]/gui(htmlId=element)} " +
+            "{-clearIndex=path/to[0]/gui(htmlId=element)}";
     }
 

trunk/autoquest-plugin-html/src/main/java/de/ugoe/cs/autoquest/plugin/html/commands/CMDparseHTML.java

@@ -64 +64 @@
                 }
                 else {
-                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/]*)");
+                    Pattern parseParamPattern = Pattern.compile("-(\\w*)=([\\w=\\[\\]\\(\\)/\\.]*)");
                     Matcher matcher = parseParamPattern.matcher(param);
                     
@@ -124 +124 @@
     @Override
     public String help() {
-        return "parseHTML <filename> {<sequencesName>}";
+        return "parseHTML <filename> [<sequencesName>] " +
+            "{-idReplacements=path/to/replacementfile} {-clearId=path/to[0]/gui(htmlId=element)} " +
+            "{-clearIndex=path/to[0]/gui(htmlId=element)}";
     }