Changeset 1047 for trunk/src/org/expeditee/items/widgets

Timestamp:

04/28/16 19:37:35 (8 years ago)

Author:

davidb

Message:

Anchor top and left added as minus options to an @i item. Relocation of ParseArgsApache(). Addition of getData type function for Bool. Some typos fixed in comments. Left click on image refinement: it check the pixel clicked on in the image, and if the same as the background, it does a back() operation rather than forming a new link

File:

• trunk/src/org/expeditee/items/widgets/InteractiveWidget.java (modified) (6 diffs)

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -197 +197 @@
                 //     @iw: <class name> [options] width height : <rest...>
                 //
-                //   Parse the 'core' part of the X-rayable text item
+                //    the 'core' part of the X-rayable text item
                 //   i.e, the text between the first ':' and the second ':'
                 //  
@@ -204 +204 @@
                 String tokens_str = (index == -1) ? text : text.substring(0, index);
 
-                String[] tokens = parseArgsApache(tokens_str);
+                String[] tokens = Text.parseArgsApache(tokens_str);
 
                 // make anything starting with a '-' lowercase
@@ -342 +342 @@
                                 String args_str = text.substring(index + 1);
                                 
-                                 args = parseArgsApache(args_str);
+                                 args = Text.parseArgsApache(args_str);
                 
                         }       
@@ -559 +559 @@
 
 
-    /**
-     * Similar to parseArgs() above.  
-     * Code based on routine used in Apache Ant:
-     *   org.apache.tools.ant.types.Commandline::translateCommandline()
-     * @param toProcess the command line to process.
-     * @return the command line broken into strings.
-     * An empty or null toProcess parameter results in a zero sized array.
-     */
-    public static String[] parseArgsApache(String toProcess) {
-        if (toProcess == null || toProcess.length() == 0) {
-            //no command? no string
-            return new String[0];
-        }
-        // parse with a simple finite state machine
-
-        final int normal = 0;
-        final int inQuote = 1;
-        final int inDoubleQuote = 2;
-        int state = normal;
-        final StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
-        final ArrayList<String> result = new ArrayList<String>();
-        final StringBuilder current = new StringBuilder();
-        boolean lastTokenHasBeenQuoted = false;
-
-        while (tok.hasMoreTokens()) {
-            String nextTok = tok.nextToken();
-            switch (state) {
-            case inQuote:
-                if ("\'".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
-                }
-                break;
-            case inDoubleQuote:
-                if ("\"".equals(nextTok)) {
-                    lastTokenHasBeenQuoted = true;
-                    state = normal;
-                } else {
-                    current.append(nextTok);
-                }
-                break;
-            default:
-                if ("\'".equals(nextTok)) {
-                    state = inQuote;
-                } else if ("\"".equals(nextTok)) {
-                    state = inDoubleQuote;
-                } else if (" ".equals(nextTok)) {
-                    if (lastTokenHasBeenQuoted || current.length() != 0) {
-                        result.add(current.toString());
-                        current.setLength(0);
-                    }
-                } else {
-                    current.append(nextTok);
-                }
-                lastTokenHasBeenQuoted = false;
-                break;
-            }
-        }
-        if (lastTokenHasBeenQuoted || current.length() != 0) {
-            result.add(current.toString());
-        }
-        if (state == inQuote || state == inDoubleQuote) {
-            System.err.println("Error: Unbalanced quotes -- failed to parse '" + toProcess + "'");
-            return null;
-        }
-
-        return result.toArray(new String[result.size()]);
-    }
-
+    
 
 
@@ -1716 +1646 @@
                 return defaultValue;
         }
-
-        /**
-         * Looks fors a dataline in the current representation of the widget.
+        
+        
+
+        /**
+         * Looks for a dataline in the current representation of the widget.
          * 
          * @see #getCurrentRepresentation
@@ -1759 +1691 @@
         }
 
+        /**
+         * Looks for a data-line in the current representation of the widget.
+         * 
+         * @see #getCurrentRepresentation
+         * @see #getStrippedDataString(String)
+         * @see #getStrippedDataLong(String, long)
+         * 
+         * @param tag
+         *            The prefix of a data-line that will be matched. Must be larger
+         *            the zero and not null.
+         * 
+         * @param defaultValue
+         *            The default value if the tag does not exist or contains
+         *            invalid data.
+         * 
+         * @return The <i>first</i> data-line that matched the prefix - if
+         *         case insensitive match is 'true' then return true, otherwise
+         *         false. defaultValue if their was no data that
+         *         matched the given prefix or the data was invalid.
+         *         
+         * @throws IllegalArgumentException
+         *             If tag is null.
+         * 
+         * @throws NullPointerException
+         *             If tag is empty.
+         * 
+         */
+        protected Boolean getStrippedDataBool(String tag, Boolean defaultValue) {
+
+                String strippedStr = getStrippedDataString(tag);
+
+                if (strippedStr != null) {
+                        strippedStr = strippedStr.trim();
+                        if (strippedStr.length() > 0) {
+                                return strippedStr.equalsIgnoreCase("true") ? true : false;
+                        }
+                }
+
+                return defaultValue;
+        }
+        
+        
         /**
          * All data is removed that is prefixed with the given tag.