[icedtea-web] RFC: fix whitespace in parsing text

[Deepak Bhole]

* Omair Majid <omajid at redhat.com> [2010-12-08 15:35]:
> Hi,
> 
> The attached patch makes netx's Parser convert sequences of
> whitespace characters into a single space.
> 
> This means that all other places (GUI, command line) see consistent
> titles, descriptions and vendors. As it is, some GUI elements like
> JLabels will simply skip over new line characters while other places
> may show them. This make the strings sanitized for display and
> consistent.
>

Where on command line does the info show up?

Also, do you have an example jnlp where this is an issue?

Cheers,
Deepak
 
> ChangeLog:
> 2010-12-08  Omair Majid  <omajid at redhat.com>
> 
>     * netx/net/sourceforge/jnlp/Parser.java
>     (getInformationDesc): Fix whitespace in title, vendor and
>     description elements.
>     (getRelatedContent): Fix whitespace in title and description
>     elements.
>     (getSpanText(Node)): Delegate to ...
>     (getSpanText(Node,boolean)): New method. Return the text in an
>     element, optionally fixing whitespace.
> 
> Thoughts? Comments?
> 
> Cheers,
> Omair

> diff -r 964617719f05 netx/net/sourceforge/jnlp/Parser.java
> --- a/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 14:06:22 2010 -0500
> +++ b/netx/net/sourceforge/jnlp/Parser.java	Wed Dec 08 15:11:16 2010 -0500
> @@ -446,9 +446,9 @@
>              String name = child.getNodeName();
>  
>              if ("title".equals(name))
> -                addInfo

(info, child, null, getSpanText(child));
> +                addInfo(info, child, null, getSpanText(child, false));
>              if ("vendor".equals(name))
> -                addInfo(info, child, null, getSpanText(child));
> +                addInfo(info, child, null, getSpanText(child, false));
>              if ("description".equals(name)) {
>                  String kind = getAttribute(child, "kind", "default");
>                  if (descriptionsUsed.contains(kind))
> @@ -456,7 +456,7 @@
>                          throw new ParseException(R("PTwoDescriptions", kind));
>  
>                  descriptionsUsed.add(kind);
> -                addInfo(info, child, kind, getSpanText(child));
> +                addInfo(info, child, kind, getSpanText(child, false));
>              }
>              if ("homepage".equals(name))
>                  addInfo(info, child, null, getRequiredURL(child, "href", base));
> @@ -774,12 +774,12 @@
>                  if (title != null && strict) {
>                      throw new ParseException(R("PTwoTitles"));
>                  }
> -                title = getSpanText(child);
> +                title = getSpanText(child, false);
>              } else if ("description".equals(name)) {
>                  if (description != null && strict) {
>                      throw new ParseException(R("PTwoDescriptions"));
>                  }
> -                description = getSpanText(child);
> +                description = getSpanText(child, false);
>              } else if ("icon".equals(name)) {
>                  if (icon != null && strict) {
>                      throw new ParseException(R("PTwoIcons"));
> @@ -876,7 +876,6 @@
>      }
>  
>      // XML junk
> -
>      /**
>       * Returns the implied text under a node, for example "text" in
>       * "<description>text</description>".
> @@ -885,11 +884,35 @@
>       * @throws ParseException if the JNLP file is invalid
>       */
>      public String getSpanText(Node node) throws ParseException {
> +        return getSpanText(node, true);
> +    }
> +
> +    /**
> +     * Returns the implied text under a node, for example "text" in
> +     * "<description>text</description>". If preserveSpacing is false,
> +     * sequences of whitespace characters are turned into a single
> +     * space character.
> +     *
> +     * @param node the node with text under it
> +     * @param preserveSpacing if true, preserve whitespace
> +     * @throws ParseException if the JNLP file is invalid
> +     */
> +    public String getSpanText(Node node, boolean preserveSpacing)
> +            throws ParseException {
>          if (node == null)
>              return null;
>  
>          // NANO
> -        return node.getNodeValue();
> +        String val = node.getNodeValue();
> +        if (preserveSpacing) {
> +            return val;
> +        } else {
> +            if (val == null) {
> +                return null;
> +            } else {
> +                return val.replaceAll("\\s+", " ");
> +            }
> +        }
>  
>          /* TINY
>          Node child = node.getFirstChild();