1.1 --- a/javanavigators/manifest.mf	Wed Jan 05 16:59:54 2011 +0100
     1.2 +++ b/javanavigators/manifest.mf	Thu Jan 06 09:13:01 2011 -0500
     1.3 @@ -2,6 +2,6 @@
     1.4  OpenIDE-Module: org.netbeans.modules.javanavigators
     1.5  OpenIDE-Module-Layer: org/netbeans/modules/javanavigators/layer.xml
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javanavigators/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.5
     1.8 +OpenIDE-Module-Specification-Version: 1.6
     1.9  
    1.10  

     2.1 --- a/javanavigators/src/org/netbeans/modules/javanavigators/AsynchListModel.java	Wed Jan 05 16:59:54 2011 +0100
     2.2 +++ b/javanavigators/src/org/netbeans/modules/javanavigators/AsynchListModel.java	Thu Jan 06 09:13:01 2011 -0500
     2.3 @@ -76,7 +76,19 @@
     2.4                  List <T> nue = new ArrayList <T> (contents);
     2.5                  if (comparator != null) {
     2.6                      Collections.sort (nue, comparator);
     2.7 -                    Diff <T> diff = Diff.<T>create(contents, nue);
     2.8 +                    Diff <T> diff;
     2.9 +                    try {
    2.10 +                        //Try first with the fast algorithm - this
    2.11 +                        //does not tolerated duplicates, but neither does a
    2.12 +                        //Java source file - except when you have two overloaded
    2.13 +                        //methods with, for example, one argument, and the
    2.14 +                        //argument type cannot be resolved by the compiler,
    2.15 +                        //so they both end up as <any>
    2.16 +                        diff = Diff.<T>create(contents, nue, Diff.Algorithm.ITERATIVE);
    2.17 +                    } catch (IllegalStateException e) {
    2.18 +                        //Use the slower algorithm which tolerates duplicates
    2.19 +                        diff = Diff.<T>create(contents, nue, Diff.Algorithm.LONGEST_COMMON_SEQUENCE);
    2.20 +                    }
    2.21                      updateOnEventQueue (diff);
    2.22                  }
    2.23              }

     3.1 --- a/tanui/manifest.mf	Wed Jan 05 16:59:54 2011 +0100
     3.2 +++ b/tanui/manifest.mf	Thu Jan 06 09:13:01 2011 -0500
     3.3 @@ -3,5 +3,5 @@
     3.4  OpenIDE-Module-Install: org/netbeans/modules/tanui/Installer.class
     3.5  OpenIDE-Module-Layer: org/netbeans/modules/tanui/layer.xml
     3.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tanui/Bundle.properties
     3.7 -OpenIDE-Module-Specification-Version: 1.0
     3.8 +OpenIDE-Module-Specification-Version: 1.1
     3.9  

     4.1 --- a/tanui/src/org/netbeans/modules/tanui/Bundle.properties	Wed Jan 05 16:59:54 2011 +0100
     4.2 +++ b/tanui/src/org/netbeans/modules/tanui/Bundle.properties	Thu Jan 06 09:13:01 2011 -0500
     4.3 @@ -2,5 +2,5 @@
     4.4  OpenIDE-Module-Long-Description=\
     4.5      A module for people who don't like black text on white backgrounds.  \
     4.6      Sets all UI background colors to a neutral tan color and installs and activates a similar editor theme.
     4.7 -OpenIDE-Module-Name=Get A Tan
     4.8 +OpenIDE-Module-Name=Tan UI and Editor Theme
     4.9  OpenIDE-Module-Short-Description=A module for people who don't like black text on white backgrounds

     5.1 --- a/tanui/src/org/netbeans/modules/tanui/Editors-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml.content	Wed Jan 05 16:59:54 2011 +0100
     5.2 +++ b/tanui/src/org/netbeans/modules/tanui/Editors-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-highlights.xml.content	Thu Jan 06 09:13:01 2011 -0500
     5.3 @@ -5,11 +5,13 @@
     5.4      <fontcolor foreColor="black" name="caret-color-insert-mode"/>
     5.5      <fontcolor bgColor="ffe0e8f1" foreColor="black" name="block-search"/>
     5.6      <fontcolor bgColor="white" foreColor="fff5f2e0" name="text-limit-line-color"/>
     5.7 +    <fontcolor bgColor="ffdfdfdf" name="readonly-files"/>
     5.8      <fontcolor bgColor="white" foreColor="black" name="nbeditor-bracesMatching-match-multichar"/>
     5.9 -    <fontcolor bgColor="ffe9e8e2" foreColor="black" name="line-number"/>
    5.10 +    <fontcolor bgColor="ffe6e3cd" foreColor="ffaa6e6e" name="line-number"/>
    5.11      <fontcolor foreColor="blue" name="hyperlinks" underline="blue"/>
    5.12 -    <fontcolor bgColor="ffd4d1c2" name="highlight-caret-row"/>
    5.13 +    <fontcolor bgColor="ffe0dcb8" name="highlight-caret-row"/>
    5.14      <fontcolor bgColor="ffc48080" foreColor="white" name="status-bar-bold"/>
    5.15 +    <fontcolor foreColor="black" name="caret-color-overwrite-mode"/>
    5.16      <fontcolor bgColor="ffb4b4b4" foreColor="white" name="selection"/>
    5.17      <fontcolor name="status-bar"/>
    5.18      <fontcolor bgColor="ffece9d8" foreColor="black" name="inc-search"/>

     6.1 --- a/tanui/src/org/netbeans/modules/tanui/Editors-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Wed Jan 05 16:59:54 2011 +0100
     6.2 +++ b/tanui/src/org/netbeans/modules/tanui/Editors-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Thu Jan 06 09:13:01 2011 -0500
     6.3 @@ -15,7 +15,7 @@
     6.4      <fontcolor name="static">
     6.5          <font style="italic"/>
     6.6      </fontcolor>
     6.7 -    <fontcolor bgColor="pink" foreColor="black" name="error"/>
     6.8 +    <fontcolor bgColor="pink" foreColor="black" name="error" waveUnderlined="ffcc0000"/>
     6.9      <fontcolor foreColor="ffa06001" name="method-parameter"/>
    6.10      <fontcolor foreColor="ff000099" name="keyword">
    6.11          <font style="bold"/>
    6.12 @@ -26,12 +26,11 @@
    6.13      <fontcolor foreColor="black" name="enum"/>
    6.14      <fontcolor name="interface"/>
    6.15      <fontcolor name="operator"/>
    6.16 +    <fontcolor name="url" underline="blue"/>
    6.17      <fontcolor foreColor="ff098618" name="field">
    6.18          <font style="bold"/>
    6.19      </fontcolor>
    6.20 -    <fontcolor bgColor="ffc7c5b5" foreColor="black" name="default">
    6.21 -        <font name="Monospaced" size="12" style="plain"/>
    6.22 -    </fontcolor>
    6.23 +    <fontcolor bgColor="ffd6d1af" foreColor="black" name="default"/>
    6.24      <fontcolor foreColor="ff99006b" name="string"/>
    6.25      <fontcolor foreColor="ffb20000" name="entity-reference"/>
    6.26      <fontcolor name="method">
    6.27 @@ -41,6 +40,7 @@
    6.28      <fontcolor foreColor="ff2765c2" name="local-variable"/>
    6.29      <fontcolor name="public"/>
    6.30      <fontcolor name="identifier"/>
    6.31 +    <fontcolor name="warning" waveUnderlined="yellow"/>
    6.32      <fontcolor name="separator"/>
    6.33      <fontcolor foreColor="ff007c00" name="markup-attribute"/>
    6.34  </fontscolors>

     7.1 --- a/tanui/src/org/netbeans/modules/tanui/Editors-text-html-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Wed Jan 05 16:59:54 2011 +0100
     7.2 +++ b/tanui/src/org/netbeans/modules/tanui/Editors-text-html-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Thu Jan 06 09:13:01 2011 -0500
     7.3 @@ -1,7 +1,9 @@
     7.4  <?xml version="1.0" encoding="UTF-8"?>
     7.5  <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
     7.6  <fontscolors>
     7.7 -    <fontcolor default="default" foreColor="ffbf9221" name="sgml-declaration"/>
     7.8 +    <fontcolor default="default" foreColor="ffbf9221" name="sgml-declaration">
     7.9 +        <font style="italic"/>
    7.10 +    </fontcolor>
    7.11      <fontcolor default="markup-attribute" name="argument"/>
    7.12      <fontcolor default="default" name="text"/>
    7.13      <fontcolor name="mod-method">
    7.14 @@ -9,12 +11,19 @@
    7.15      </fontcolor>
    7.16      <fontcolor default="error" name="error"/>
    7.17      <fontcolor bgColor="ffe3f2e1" default="default" name="css-embedded"/>
    7.18 -    <fontcolor default="markup-element" name="tag"/>
    7.19 -    <fontcolor default="comment" name="sgml-comment"/>
    7.20 +    <fontcolor default="markup-element" foreColor="ff156029" name="tag">
    7.21 +        <font style="bold"/>
    7.22 +    </fontcolor>
    7.23 +    <fontcolor default="comment" name="sgml-comment">
    7.24 +        <font style="italic"/>
    7.25 +    </fontcolor>
    7.26      <fontcolor default="whitespace" name="ws"/>
    7.27      <fontcolor default="argument" name="operator"/>
    7.28      <fontcolor default="entity-reference" name="character"/>
    7.29 +    <fontcolor name="mod-class" waveUnderlined="red"/>
    7.30      <fontcolor bgColor="ffe3f2e1" default="default" name="javascript-embedded"/>
    7.31      <fontcolor default="markup-attribute-value" name="value"/>
    7.32 -    <fontcolor default="comment" name="block-comment"/>
    7.33 +    <fontcolor default="comment" name="block-comment">
    7.34 +        <font style="italic"/>
    7.35 +    </fontcolor>
    7.36  </fontscolors>

     8.1 --- a/tanui/src/org/netbeans/modules/tanui/Editors-text-xml-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Wed Jan 05 16:59:54 2011 +0100
     8.2 +++ b/tanui/src/org/netbeans/modules/tanui/Editors-text-xml-FontsColors-Tim-org-netbeans-modules-editor-settings-CustomFontsColors-tokenColorings.xml.content	Thu Jan 06 09:13:01 2011 -0500
     8.3 @@ -1,18 +1,22 @@
     8.4  <?xml version="1.0" encoding="UTF-8"?>
     8.5  <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
     8.6  <fontscolors>
     8.7 -    <fontcolor default="error" name="xml-error"/>
     8.8 +    <fontcolor default="error" name="xml-error" waveUnderlined="ffcc0033"/>
     8.9      <fontcolor default="markup-attribute-value" name="xml-value"/>
    8.10      <fontcolor default="default" foreColor="ff00007c" name="xml-pi-target">
    8.11 -        <font style="bold"/>
    8.12 +        <font style="italic"/>
    8.13      </fontcolor>
    8.14      <fontcolor default="default" foreColor="ff00007c" name="xml-pi-end">
    8.15          <font style="bold"/>
    8.16      </fontcolor>
    8.17 -    <fontcolor default="markup-element" name="xml-tag"/>
    8.18 +    <fontcolor default="markup-element" foreColor="ff7a0000" name="xml-tag">
    8.19 +        <font style="bold"/>
    8.20 +    </fontcolor>
    8.21      <fontcolor default="whitespace" name="xml-EOL"/>
    8.22      <fontcolor default="markup-attribute" name="xml-attribute"/>
    8.23 -    <fontcolor default="default" name="xml-text"/>
    8.24 +    <fontcolor default="default" name="xml-text">
    8.25 +        <font style="bold"/>
    8.26 +    </fontcolor>
    8.27      <fontcolor default="xml-attribute" name="xml-operator"/>
    8.28      <fontcolor default="default" foreColor="ff00007c" name="xml-pi-content"/>
    8.29      <fontcolor default="default" foreColor="ff7c6200" name="xml-cdata-section"/>
    8.30 @@ -23,6 +27,6 @@
    8.31      <fontcolor default="comment" name="xml-comment"/>
    8.32      <fontcolor default="entity-reference" name="xml-ref"/>
    8.33      <fontcolor default="default" foreColor="ff00007c" name="xml-doctype">
    8.34 -        <font style="bold"/>
    8.35 +        <font style="italic"/>
    8.36      </fontcolor>
    8.37  </fontscolors>