You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/03/23 08:33:53 UTC
svn commit: r1668528 [6/9] - in /myfaces/site/publish/tobago/tobago-core: ./
xref-test/ xref-test/org/apache/myfaces/tobago/component/
xref-test/org/apache/myfaces/tobago/context/
xref-test/org/apache/myfaces/tobago/convert/ xref-test/org/apache/myface...
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/Sorter.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/Sorter.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/Sorter.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/Sorter.html Mon Mar 23 07:33:51 2015
@@ -62,191 +62,211 @@
<a class="jxr_linenumber" name="52" href="#52">52</a>
<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">private</strong> Comparator comparator;
<a class="jxr_linenumber" name="54" href="#54">54</a>
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> perform(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/event/SortActionEvent.html">SortActionEvent</a> sortEvent) {
-<a class="jxr_linenumber" name="56" href="#56">56</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a class="jxr_linenumber" name="57" href="#57">57</a> LOG.debug(<span class="jxr_string">"sorterId = {}"</span>, sortEvent.getComponent().getId());
-<a class="jxr_linenumber" name="58" href="#58">58</a> }
-<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">final</strong> UIColumn column = sortEvent.getColumn();
+<a class="jxr_linenumber" name="55" href="#55">55</a> <em class="jxr_javadoccomment">/**</em>
+<a class="jxr_linenumber" name="56" href="#56">56</a> <em class="jxr_javadoccomment"> * @deprecated Please use {@link #perform(org.apache.myfaces.tobago.internal.component.AbstractUISheet)}</em>
+<a class="jxr_linenumber" name="57" href="#57">57</a> <em class="jxr_javadoccomment"> */</em>
+<a class="jxr_linenumber" name="58" href="#58">58</a> @Deprecated
+<a class="jxr_linenumber" name="59" href="#59">59</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> perform(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/event/SortActionEvent.html">SortActionEvent</a> sortEvent) {
<a class="jxr_linenumber" name="60" href="#60">60</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/internal/component/AbstractUISheet.html">AbstractUISheet</a> data = (AbstractUISheet) sortEvent.getComponent();
-<a class="jxr_linenumber" name="61" href="#61">61</a>
-<a class="jxr_linenumber" name="62" href="#62">62</a> Object value = data.getValue();
-<a class="jxr_linenumber" name="63" href="#63">63</a> <strong class="jxr_keyword">if</strong> (value instanceof DataModel) {
-<a class="jxr_linenumber" name="64" href="#64">64</a> value = ((DataModel) value).getWrappedData();
-<a class="jxr_linenumber" name="65" href="#65">65</a> }
-<a class="jxr_linenumber" name="66" href="#66">66</a> <strong class="jxr_keyword">final</strong> FacesContext facesContext = FacesContext.getCurrentInstance();
-<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/model/SheetState.html">SheetState</a> sheetState = data.getSheetState(facesContext);
-<a class="jxr_linenumber" name="68" href="#68">68</a>
-<a class="jxr_linenumber" name="69" href="#69">69</a> <strong class="jxr_keyword">final</strong> Comparator actualComparator;
-<a class="jxr_linenumber" name="70" href="#70">70</a>
-<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">if</strong> (value instanceof List || value instanceof Object[]) {
-<a class="jxr_linenumber" name="72" href="#72">72</a> <strong class="jxr_keyword">final</strong> String sortProperty;
-<a class="jxr_linenumber" name="73" href="#73">73</a>
-<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="75" href="#75">75</a> <strong class="jxr_keyword">final</strong> UIComponent child = getFirstSortableChild(column.getChildren());
-<a class="jxr_linenumber" name="76" href="#76">76</a> <strong class="jxr_keyword">if</strong> (child != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="61" href="#61">61</a> perform(data);
+<a class="jxr_linenumber" name="62" href="#62">62</a> }
+<a class="jxr_linenumber" name="63" href="#63">63</a>
+<a class="jxr_linenumber" name="64" href="#64">64</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> perform(<strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/internal/component/AbstractUISheet.html">AbstractUISheet</a> data) {
+<a class="jxr_linenumber" name="65" href="#65">65</a>
+<a class="jxr_linenumber" name="66" href="#66">66</a> Object value = data.getValue();
+<a class="jxr_linenumber" name="67" href="#67">67</a> <strong class="jxr_keyword">if</strong> (value instanceof DataModel) {
+<a class="jxr_linenumber" name="68" href="#68">68</a> value = ((DataModel) value).getWrappedData();
+<a class="jxr_linenumber" name="69" href="#69">69</a> }
+<a class="jxr_linenumber" name="70" href="#70">70</a> <strong class="jxr_keyword">final</strong> FacesContext facesContext = FacesContext.getCurrentInstance();
+<a class="jxr_linenumber" name="71" href="#71">71</a> <strong class="jxr_keyword">final</strong> <a href="../../../../../org/apache/myfaces/tobago/model/SheetState.html">SheetState</a> sheetState = data.getSheetState(facesContext);
+<a class="jxr_linenumber" name="72" href="#72">72</a>
+<a class="jxr_linenumber" name="73" href="#73">73</a> <strong class="jxr_keyword">final</strong> String sortedColumnId = sheetState.getSortedColumnId();
+<a class="jxr_linenumber" name="74" href="#74">74</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a class="jxr_linenumber" name="75" href="#75">75</a> LOG.debug(<span class="jxr_string">"sorterId = '{}'"</span>, sortedColumnId);
+<a class="jxr_linenumber" name="76" href="#76">76</a> }
<a class="jxr_linenumber" name="77" href="#77">77</a>
-<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">final</strong> String attributeName = child instanceof <a href="../../../../../org/apache/myfaces/tobago/internal/component/AbstractUICommand.html">AbstractUICommand</a> ? Attributes.LABEL : Attributes.VALUE;
-<a class="jxr_linenumber" name="79" href="#79">79</a> <strong class="jxr_keyword">if</strong> (child.getValueExpression(attributeName) != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">var</strong> = data.getVar();
-<a class="jxr_linenumber" name="81" href="#81">81</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">var</strong> == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="82" href="#82">82</a> LOG.error(<span class="jxr_string">"No sorting performed. Property var of sheet is not set!"</span>);
-<a class="jxr_linenumber" name="83" href="#83">83</a> unsetSortableAttribute(column);
-<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="85" href="#85">85</a> }
-<a class="jxr_linenumber" name="86" href="#86">86</a> String expressionString = child.getValueExpression(attributeName).getExpressionString();
-<a class="jxr_linenumber" name="87" href="#87">87</a> <strong class="jxr_keyword">if</strong> (isSimpleProperty(expressionString)) {
-<a class="jxr_linenumber" name="88" href="#88">88</a> <strong class="jxr_keyword">if</strong> (expressionString.startsWith(<span class="jxr_string">"#{"</span>)
-<a class="jxr_linenumber" name="89" href="#89">89</a> && expressionString.endsWith(<span class="jxr_string">"}"</span>)) {
-<a class="jxr_linenumber" name="90" href="#90">90</a> expressionString =
-<a class="jxr_linenumber" name="91" href="#91">91</a> expressionString.substring(2,
-<a class="jxr_linenumber" name="92" href="#92">92</a> expressionString.length() - 1);
-<a class="jxr_linenumber" name="93" href="#93">93</a> }
-<a class="jxr_linenumber" name="94" href="#94">94</a> sortProperty = expressionString.substring(<strong class="jxr_keyword">var</strong>.length() + 1);
-<a class="jxr_linenumber" name="95" href="#95">95</a>
-<a class="jxr_linenumber" name="96" href="#96">96</a> actualComparator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/myfaces/tobago/util/BeanComparator.html">BeanComparator</a>(
-<a class="jxr_linenumber" name="97" href="#97">97</a> sortProperty, comparator, !sheetState.isAscending());
-<a class="jxr_linenumber" name="98" href="#98">98</a>
-<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a class="jxr_linenumber" name="100" href="#100">100</a> LOG.debug(<span class="jxr_string">"Sort property is {}"</span>, sortProperty);
-<a class="jxr_linenumber" name="101" href="#101">101</a> }
-<a class="jxr_linenumber" name="102" href="#102">102</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="103" href="#103">103</a>
-<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> descending = !sheetState.isAscending();
-<a class="jxr_linenumber" name="105" href="#105">105</a> <strong class="jxr_keyword">final</strong> ValueExpression expression = child.getValueExpression(<span class="jxr_string">"value"</span>);
-<a class="jxr_linenumber" name="106" href="#106">106</a> actualComparator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/myfaces/tobago/util/ValueExpressionComparator.html">ValueExpressionComparator</a>(facesContext, <strong class="jxr_keyword">var</strong>, expression, descending, comparator);
-<a class="jxr_linenumber" name="107" href="#107">107</a> }
-<a class="jxr_linenumber" name="108" href="#108">108</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="109" href="#109">109</a> LOG.error(<span class="jxr_string">"No sorting performed. No Expression target found for sorting!"</span>);
-<a class="jxr_linenumber" name="110" href="#110">110</a> unsetSortableAttribute(column);
-<a class="jxr_linenumber" name="111" href="#111">111</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="112" href="#112">112</a> }
-<a class="jxr_linenumber" name="113" href="#113">113</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="114" href="#114">114</a> LOG.error(<span class="jxr_string">"No sorting performed. Value is not instanceof List or Object[]!"</span>);
-<a class="jxr_linenumber" name="115" href="#115">115</a> unsetSortableAttribute(column);
-<a class="jxr_linenumber" name="116" href="#116">116</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="117" href="#117">117</a> }
-<a class="jxr_linenumber" name="118" href="#118">118</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> Exception e) {
-<a class="jxr_linenumber" name="119" href="#119">119</a> LOG.error(<span class="jxr_string">"Error while extracting sortMethod :"</span> + e.getMessage(), e);
-<a class="jxr_linenumber" name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> (column != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="121" href="#121">121</a> unsetSortableAttribute(column);
-<a class="jxr_linenumber" name="122" href="#122">122</a> }
-<a class="jxr_linenumber" name="123" href="#123">123</a> <strong class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="124" href="#124">124</a> }
-<a class="jxr_linenumber" name="125" href="#125">125</a>
-<a class="jxr_linenumber" name="126" href="#126">126</a> <em class="jxr_comment">// TODO: locale / comparator parameter?</em>
-<a class="jxr_linenumber" name="127" href="#127">127</a> <em class="jxr_comment">// don't compare numbers with Collator.getInstance() comparator</em>
-<a class="jxr_linenumber" name="128" href="#128">128</a> <em class="jxr_comment">// Comparator comparator = Collator.getInstance();</em>
-<a class="jxr_linenumber" name="129" href="#129">129</a> <em class="jxr_comment">// comparator = new RowComparator(ascending, method);</em>
-<a class="jxr_linenumber" name="130" href="#130">130</a>
-<a class="jxr_linenumber" name="131" href="#131">131</a> <em class="jxr_comment">// memorize selected rows</em>
-<a class="jxr_linenumber" name="132" href="#132">132</a> List<Object> selectedDataRows = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong> (sheetState.getSelectedRows().size() > 0) {
-<a class="jxr_linenumber" name="134" href="#134">134</a> selectedDataRows = <strong class="jxr_keyword">new</strong> ArrayList<Object>(sheetState.getSelectedRows().size());
-<a class="jxr_linenumber" name="135" href="#135">135</a> Object dataRow;
-<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Integer index : sheetState.getSelectedRows()) {
-<a class="jxr_linenumber" name="137" href="#137">137</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
-<a class="jxr_linenumber" name="138" href="#138">138</a> dataRow = ((List) value).get(index);
-<a class="jxr_linenumber" name="139" href="#139">139</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="140" href="#140">140</a> dataRow = ((Object[]) value)[index];
-<a class="jxr_linenumber" name="141" href="#141">141</a> }
-<a class="jxr_linenumber" name="142" href="#142">142</a> selectedDataRows.add(dataRow);
-<a class="jxr_linenumber" name="143" href="#143">143</a> }
+<a class="jxr_linenumber" name="78" href="#78">78</a> <strong class="jxr_keyword">if</strong> (sortedColumnId == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="79" href="#79">79</a> <em class="jxr_comment">// not to be sorted</em>
+<a class="jxr_linenumber" name="80" href="#80">80</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="81" href="#81">81</a> }
+<a class="jxr_linenumber" name="82" href="#82">82</a>
+<a class="jxr_linenumber" name="83" href="#83">83</a> <strong class="jxr_keyword">final</strong> UIColumn column = (UIColumn) data.findComponent(sortedColumnId);
+<a class="jxr_linenumber" name="84" href="#84">84</a> <strong class="jxr_keyword">if</strong> (column == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="85" href="#85">85</a> LOG.warn(<span class="jxr_string">"No column to sort found, sorterId = '{}'"</span>, sortedColumnId);
+<a class="jxr_linenumber" name="86" href="#86">86</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="87" href="#87">87</a> }
+<a class="jxr_linenumber" name="88" href="#88">88</a>
+<a class="jxr_linenumber" name="89" href="#89">89</a> <strong class="jxr_keyword">final</strong> Comparator actualComparator;
+<a class="jxr_linenumber" name="90" href="#90">90</a>
+<a class="jxr_linenumber" name="91" href="#91">91</a> <strong class="jxr_keyword">if</strong> (value instanceof List || value instanceof Object[]) {
+<a class="jxr_linenumber" name="92" href="#92">92</a> <strong class="jxr_keyword">final</strong> String sortProperty;
+<a class="jxr_linenumber" name="93" href="#93">93</a>
+<a class="jxr_linenumber" name="94" href="#94">94</a> <strong class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="95" href="#95">95</a> <strong class="jxr_keyword">final</strong> UIComponent child = getFirstSortableChild(column.getChildren());
+<a class="jxr_linenumber" name="96" href="#96">96</a> <strong class="jxr_keyword">if</strong> (child != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="97" href="#97">97</a>
+<a class="jxr_linenumber" name="98" href="#98">98</a> <strong class="jxr_keyword">final</strong> String attributeName = child instanceof <a href="../../../../../org/apache/myfaces/tobago/internal/component/AbstractUICommand.html">AbstractUICommand</a> ? Attributes.LABEL : Attributes.VALUE;
+<a class="jxr_linenumber" name="99" href="#99">99</a> <strong class="jxr_keyword">if</strong> (child.getValueExpression(attributeName) != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="100" href="#100">100</a> <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">var</strong> = data.getVar();
+<a class="jxr_linenumber" name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong> (<strong class="jxr_keyword">var</strong> == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="102" href="#102">102</a> LOG.error(<span class="jxr_string">"No sorting performed. Property var of sheet is not set!"</span>);
+<a class="jxr_linenumber" name="103" href="#103">103</a> unsetSortableAttribute(column);
+<a class="jxr_linenumber" name="104" href="#104">104</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="105" href="#105">105</a> }
+<a class="jxr_linenumber" name="106" href="#106">106</a> String expressionString = child.getValueExpression(attributeName).getExpressionString();
+<a class="jxr_linenumber" name="107" href="#107">107</a> <strong class="jxr_keyword">if</strong> (isSimpleProperty(expressionString)) {
+<a class="jxr_linenumber" name="108" href="#108">108</a> <strong class="jxr_keyword">if</strong> (expressionString.startsWith(<span class="jxr_string">"#{"</span>)
+<a class="jxr_linenumber" name="109" href="#109">109</a> && expressionString.endsWith(<span class="jxr_string">"}"</span>)) {
+<a class="jxr_linenumber" name="110" href="#110">110</a> expressionString =
+<a class="jxr_linenumber" name="111" href="#111">111</a> expressionString.substring(2,
+<a class="jxr_linenumber" name="112" href="#112">112</a> expressionString.length() - 1);
+<a class="jxr_linenumber" name="113" href="#113">113</a> }
+<a class="jxr_linenumber" name="114" href="#114">114</a> sortProperty = expressionString.substring(<strong class="jxr_keyword">var</strong>.length() + 1);
+<a class="jxr_linenumber" name="115" href="#115">115</a>
+<a class="jxr_linenumber" name="116" href="#116">116</a> actualComparator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/myfaces/tobago/util/BeanComparator.html">BeanComparator</a>(
+<a class="jxr_linenumber" name="117" href="#117">117</a> sortProperty, comparator, !sheetState.isAscending());
+<a class="jxr_linenumber" name="118" href="#118">118</a>
+<a class="jxr_linenumber" name="119" href="#119">119</a> <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a class="jxr_linenumber" name="120" href="#120">120</a> LOG.debug(<span class="jxr_string">"Sort property is {}"</span>, sortProperty);
+<a class="jxr_linenumber" name="121" href="#121">121</a> }
+<a class="jxr_linenumber" name="122" href="#122">122</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="123" href="#123">123</a>
+<a class="jxr_linenumber" name="124" href="#124">124</a> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> descending = !sheetState.isAscending();
+<a class="jxr_linenumber" name="125" href="#125">125</a> <strong class="jxr_keyword">final</strong> ValueExpression expression = child.getValueExpression(<span class="jxr_string">"value"</span>);
+<a class="jxr_linenumber" name="126" href="#126">126</a> actualComparator = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/myfaces/tobago/util/ValueExpressionComparator.html">ValueExpressionComparator</a>(facesContext, <strong class="jxr_keyword">var</strong>, expression, descending, comparator);
+<a class="jxr_linenumber" name="127" href="#127">127</a> }
+<a class="jxr_linenumber" name="128" href="#128">128</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="129" href="#129">129</a> LOG.error(<span class="jxr_string">"No sorting performed. No Expression target found for sorting!"</span>);
+<a class="jxr_linenumber" name="130" href="#130">130</a> unsetSortableAttribute(column);
+<a class="jxr_linenumber" name="131" href="#131">131</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="132" href="#132">132</a> }
+<a class="jxr_linenumber" name="133" href="#133">133</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="134" href="#134">134</a> LOG.error(<span class="jxr_string">"No sorting performed. Value is not instanceof List or Object[]!"</span>);
+<a class="jxr_linenumber" name="135" href="#135">135</a> unsetSortableAttribute(column);
+<a class="jxr_linenumber" name="136" href="#136">136</a> <strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="137" href="#137">137</a> }
+<a class="jxr_linenumber" name="138" href="#138">138</a> } <strong class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong> Exception e) {
+<a class="jxr_linenumber" name="139" href="#139">139</a> LOG.error(<span class="jxr_string">"Error while extracting sortMethod :"</span> + e.getMessage(), e);
+<a class="jxr_linenumber" name="140" href="#140">140</a> <strong class="jxr_keyword">if</strong> (column != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="141" href="#141">141</a> unsetSortableAttribute(column);
+<a class="jxr_linenumber" name="142" href="#142">142</a> }
+<a class="jxr_linenumber" name="143" href="#143">143</a> <strong class="jxr_keyword">return</strong>;
<a class="jxr_linenumber" name="144" href="#144">144</a> }
<a class="jxr_linenumber" name="145" href="#145">145</a>
-<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// do sorting</em>
-<a class="jxr_linenumber" name="147" href="#147">147</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
-<a class="jxr_linenumber" name="148" href="#148">148</a> Collections.sort((List) value, actualComparator);
-<a class="jxr_linenumber" name="149" href="#149">149</a> } <strong class="jxr_keyword">else</strong> { <em class="jxr_comment">// value is instanceof Object[]</em>
-<a class="jxr_linenumber" name="150" href="#150">150</a> Arrays.sort((Object[]) value, actualComparator);
-<a class="jxr_linenumber" name="151" href="#151">151</a> }
-<a class="jxr_linenumber" name="152" href="#152">152</a>
-<a class="jxr_linenumber" name="153" href="#153">153</a> <em class="jxr_comment">// restore selected rows</em>
-<a class="jxr_linenumber" name="154" href="#154">154</a> <strong class="jxr_keyword">if</strong> (selectedDataRows != <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="155" href="#155">155</a> sheetState.getSelectedRows().clear();
-<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Object dataRow : selectedDataRows) {
-<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">int</strong> index = -1;
-<a class="jxr_linenumber" name="158" href="#158">158</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
-<a class="jxr_linenumber" name="159" href="#159">159</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < ((List) value).size() && index < 0; i++) {
-<a class="jxr_linenumber" name="160" href="#160">160</a> <strong class="jxr_keyword">if</strong> (dataRow == ((List) value).get(i)) {
-<a class="jxr_linenumber" name="161" href="#161">161</a> index = i;
-<a class="jxr_linenumber" name="162" href="#162">162</a> }
-<a class="jxr_linenumber" name="163" href="#163">163</a> }
-<a class="jxr_linenumber" name="164" href="#164">164</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < ((Object[]) value).length && index < 0; i++) {
-<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">if</strong> (dataRow == ((Object[]) value)[i]) {
-<a class="jxr_linenumber" name="167" href="#167">167</a> index = i;
-<a class="jxr_linenumber" name="168" href="#168">168</a> }
-<a class="jxr_linenumber" name="169" href="#169">169</a> }
-<a class="jxr_linenumber" name="170" href="#170">170</a> }
-<a class="jxr_linenumber" name="171" href="#171">171</a> <strong class="jxr_keyword">if</strong> (index >= 0) {
-<a class="jxr_linenumber" name="172" href="#172">172</a> sheetState.getSelectedRows().add(index);
-<a class="jxr_linenumber" name="173" href="#173">173</a> }
-<a class="jxr_linenumber" name="174" href="#174">174</a> }
-<a class="jxr_linenumber" name="175" href="#175">175</a> }
-<a class="jxr_linenumber" name="176" href="#176">176</a>
-<a class="jxr_linenumber" name="177" href="#177">177</a> } <strong class="jxr_keyword">else</strong> { <em class="jxr_comment">// DataModel?, ResultSet, Result or Object</em>
-<a class="jxr_linenumber" name="178" href="#178">178</a> LOG.warn(<span class="jxr_string">"Sorting not supported for type "</span>
-<a class="jxr_linenumber" name="179" href="#179">179</a> + (value != <strong class="jxr_keyword">null</strong> ? value.getClass().toString() : <span class="jxr_string">"null"</span>));
-<a class="jxr_linenumber" name="180" href="#180">180</a> }
-<a class="jxr_linenumber" name="181" href="#181">181</a> }
-<a class="jxr_linenumber" name="182" href="#182">182</a>
-<a class="jxr_linenumber" name="183" href="#183">183</a> <em class="jxr_comment">// XXX needs to be tested</em>
-<a class="jxr_linenumber" name="184" href="#184">184</a> <em class="jxr_comment">// XXX was based on ^#\{(\w+(\.\w)*)\}$ which is wrong, because there is a + missing after the last \w</em>
-<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">boolean</strong> isSimpleProperty(<strong class="jxr_keyword">final</strong> String expressionString) {
-<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">if</strong> (expressionString.startsWith(<span class="jxr_string">"#{"</span>) && expressionString.endsWith(<span class="jxr_string">"}"</span>)) {
-<a class="jxr_linenumber" name="187" href="#187">187</a> <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">inner</strong> = expressionString.substring(2, expressionString.length() - 1);
-<a class="jxr_linenumber" name="188" href="#188">188</a> <strong class="jxr_keyword">final</strong> String[] parts = StringUtils.split(<strong class="jxr_keyword">inner</strong>, '.');
-<a class="jxr_linenumber" name="189" href="#189">189</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String part : parts) {
-<a class="jxr_linenumber" name="190" href="#190">190</a> <strong class="jxr_keyword">if</strong> (!StringUtils.isAlpha(part)) {
-<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="192" href="#192">192</a> }
-<a class="jxr_linenumber" name="193" href="#193">193</a> }
-<a class="jxr_linenumber" name="194" href="#194">194</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="195" href="#195">195</a> }
-<a class="jxr_linenumber" name="196" href="#196">196</a> <strong class="jxr_keyword">return</strong> false;
-<a class="jxr_linenumber" name="197" href="#197">197</a> }
-<a class="jxr_linenumber" name="198" href="#198">198</a>
-<a class="jxr_linenumber" name="199" href="#199">199</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> unsetSortableAttribute(<strong class="jxr_keyword">final</strong> UIColumn uiColumn) {
-<a class="jxr_linenumber" name="200" href="#200">200</a> LOG.warn(<span class="jxr_string">"removing attribute sortable from column "</span> + uiColumn.getId());
-<a class="jxr_linenumber" name="201" href="#201">201</a> uiColumn.getAttributes().put(Attributes.SORTABLE, Boolean.FALSE);
-<a class="jxr_linenumber" name="202" href="#202">202</a> }
-<a class="jxr_linenumber" name="203" href="#203">203</a>
-<a class="jxr_linenumber" name="204" href="#204">204</a> <strong class="jxr_keyword">private</strong> UIComponent getFirstSortableChild(<strong class="jxr_keyword">final</strong> List<UIComponent> children) {
-<a class="jxr_linenumber" name="205" href="#205">205</a> UIComponent result = <strong class="jxr_keyword">null</strong>;
-<a class="jxr_linenumber" name="206" href="#206">206</a>
-<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">for</strong> (UIComponent child : children) {
-<a class="jxr_linenumber" name="208" href="#208">208</a> result = child;
-<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">if</strong> (child instanceof UISelectMany
-<a class="jxr_linenumber" name="210" href="#210">210</a> || child instanceof UISelectOne
-<a class="jxr_linenumber" name="211" href="#211">211</a> || child instanceof UISelectBoolean
-<a class="jxr_linenumber" name="212" href="#212">212</a> || (child instanceof AbstractUICommand && child.getChildren().isEmpty())
-<a class="jxr_linenumber" name="213" href="#213">213</a> || (child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType()))) {
-<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="215" href="#215">215</a> <em class="jxr_comment">// look for a better component if any</em>
-<a class="jxr_linenumber" name="216" href="#216">216</a> }
-<a class="jxr_linenumber" name="217" href="#217">217</a> <strong class="jxr_keyword">if</strong> (child instanceof UIOutput) {
-<a class="jxr_linenumber" name="218" href="#218">218</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="219" href="#219">219</a> }
-<a class="jxr_linenumber" name="220" href="#220">220</a> <strong class="jxr_keyword">if</strong> (child instanceof UICommand
-<a class="jxr_linenumber" name="221" href="#221">221</a> || child instanceof javax.faces.component.UIPanel) {
-<a class="jxr_linenumber" name="222" href="#222">222</a> child = getFirstSortableChild(child.getChildren());
-<a class="jxr_linenumber" name="223" href="#223">223</a> <strong class="jxr_keyword">if</strong> (child instanceof UIOutput) {
-<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">break</strong>;
-<a class="jxr_linenumber" name="225" href="#225">225</a> }
-<a class="jxr_linenumber" name="226" href="#226">226</a> }
-<a class="jxr_linenumber" name="227" href="#227">227</a> }
-<a class="jxr_linenumber" name="228" href="#228">228</a> <strong class="jxr_keyword">return</strong> result;
-<a class="jxr_linenumber" name="229" href="#229">229</a> }
-<a class="jxr_linenumber" name="230" href="#230">230</a>
-<a class="jxr_linenumber" name="231" href="#231">231</a> <strong class="jxr_keyword">public</strong> Comparator getComparator() {
-<a class="jxr_linenumber" name="232" href="#232">232</a> <strong class="jxr_keyword">return</strong> comparator;
-<a class="jxr_linenumber" name="233" href="#233">233</a> }
-<a class="jxr_linenumber" name="234" href="#234">234</a>
-<a class="jxr_linenumber" name="235" href="#235">235</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setComparator(<strong class="jxr_keyword">final</strong> Comparator comparator) {
-<a class="jxr_linenumber" name="236" href="#236">236</a> <strong class="jxr_keyword">this</strong>.comparator = comparator;
-<a class="jxr_linenumber" name="237" href="#237">237</a> }
-<a class="jxr_linenumber" name="238" href="#238">238</a> }
-<a class="jxr_linenumber" name="239" href="#239">239</a>
+<a class="jxr_linenumber" name="146" href="#146">146</a> <em class="jxr_comment">// TODO: locale / comparator parameter?</em>
+<a class="jxr_linenumber" name="147" href="#147">147</a> <em class="jxr_comment">// don't compare numbers with Collator.getInstance() comparator</em>
+<a class="jxr_linenumber" name="148" href="#148">148</a> <em class="jxr_comment">// Comparator comparator = Collator.getInstance();</em>
+<a class="jxr_linenumber" name="149" href="#149">149</a> <em class="jxr_comment">// comparator = new RowComparator(ascending, method);</em>
+<a class="jxr_linenumber" name="150" href="#150">150</a>
+<a class="jxr_linenumber" name="151" href="#151">151</a> <em class="jxr_comment">// memorize selected rows</em>
+<a class="jxr_linenumber" name="152" href="#152">152</a> List<Object> selectedDataRows = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="153" href="#153">153</a> <strong class="jxr_keyword">if</strong> (sheetState.getSelectedRows().size() > 0) {
+<a class="jxr_linenumber" name="154" href="#154">154</a> selectedDataRows = <strong class="jxr_keyword">new</strong> ArrayList<Object>(sheetState.getSelectedRows().size());
+<a class="jxr_linenumber" name="155" href="#155">155</a> Object dataRow;
+<a class="jxr_linenumber" name="156" href="#156">156</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Integer index : sheetState.getSelectedRows()) {
+<a class="jxr_linenumber" name="157" href="#157">157</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
+<a class="jxr_linenumber" name="158" href="#158">158</a> dataRow = ((List) value).get(index);
+<a class="jxr_linenumber" name="159" href="#159">159</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="160" href="#160">160</a> dataRow = ((Object[]) value)[index];
+<a class="jxr_linenumber" name="161" href="#161">161</a> }
+<a class="jxr_linenumber" name="162" href="#162">162</a> selectedDataRows.add(dataRow);
+<a class="jxr_linenumber" name="163" href="#163">163</a> }
+<a class="jxr_linenumber" name="164" href="#164">164</a> }
+<a class="jxr_linenumber" name="165" href="#165">165</a>
+<a class="jxr_linenumber" name="166" href="#166">166</a> <em class="jxr_comment">// do sorting</em>
+<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
+<a class="jxr_linenumber" name="168" href="#168">168</a> Collections.sort((List) value, actualComparator);
+<a class="jxr_linenumber" name="169" href="#169">169</a> } <strong class="jxr_keyword">else</strong> { <em class="jxr_comment">// value is instanceof Object[]</em>
+<a class="jxr_linenumber" name="170" href="#170">170</a> Arrays.sort((Object[]) value, actualComparator);
+<a class="jxr_linenumber" name="171" href="#171">171</a> }
+<a class="jxr_linenumber" name="172" href="#172">172</a>
+<a class="jxr_linenumber" name="173" href="#173">173</a> <em class="jxr_comment">// restore selected rows</em>
+<a class="jxr_linenumber" name="174" href="#174">174</a> <strong class="jxr_keyword">if</strong> (selectedDataRows != <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="175" href="#175">175</a> sheetState.getSelectedRows().clear();
+<a class="jxr_linenumber" name="176" href="#176">176</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> Object dataRow : selectedDataRows) {
+<a class="jxr_linenumber" name="177" href="#177">177</a> <strong class="jxr_keyword">int</strong> index = -1;
+<a class="jxr_linenumber" name="178" href="#178">178</a> <strong class="jxr_keyword">if</strong> (value instanceof List) {
+<a class="jxr_linenumber" name="179" href="#179">179</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < ((List) value).size() && index < 0; i++) {
+<a class="jxr_linenumber" name="180" href="#180">180</a> <strong class="jxr_keyword">if</strong> (dataRow == ((List) value).get(i)) {
+<a class="jxr_linenumber" name="181" href="#181">181</a> index = i;
+<a class="jxr_linenumber" name="182" href="#182">182</a> }
+<a class="jxr_linenumber" name="183" href="#183">183</a> }
+<a class="jxr_linenumber" name="184" href="#184">184</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="185" href="#185">185</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i = 0; i < ((Object[]) value).length && index < 0; i++) {
+<a class="jxr_linenumber" name="186" href="#186">186</a> <strong class="jxr_keyword">if</strong> (dataRow == ((Object[]) value)[i]) {
+<a class="jxr_linenumber" name="187" href="#187">187</a> index = i;
+<a class="jxr_linenumber" name="188" href="#188">188</a> }
+<a class="jxr_linenumber" name="189" href="#189">189</a> }
+<a class="jxr_linenumber" name="190" href="#190">190</a> }
+<a class="jxr_linenumber" name="191" href="#191">191</a> <strong class="jxr_keyword">if</strong> (index >= 0) {
+<a class="jxr_linenumber" name="192" href="#192">192</a> sheetState.getSelectedRows().add(index);
+<a class="jxr_linenumber" name="193" href="#193">193</a> }
+<a class="jxr_linenumber" name="194" href="#194">194</a> }
+<a class="jxr_linenumber" name="195" href="#195">195</a> }
+<a class="jxr_linenumber" name="196" href="#196">196</a>
+<a class="jxr_linenumber" name="197" href="#197">197</a> } <strong class="jxr_keyword">else</strong> { <em class="jxr_comment">// DataModel?, ResultSet, Result or Object</em>
+<a class="jxr_linenumber" name="198" href="#198">198</a> LOG.warn(<span class="jxr_string">"Sorting not supported for type "</span>
+<a class="jxr_linenumber" name="199" href="#199">199</a> + (value != <strong class="jxr_keyword">null</strong> ? value.getClass().toString() : <span class="jxr_string">"null"</span>));
+<a class="jxr_linenumber" name="200" href="#200">200</a> }
+<a class="jxr_linenumber" name="201" href="#201">201</a> }
+<a class="jxr_linenumber" name="202" href="#202">202</a>
+<a class="jxr_linenumber" name="203" href="#203">203</a> <em class="jxr_comment">// XXX needs to be tested</em>
+<a class="jxr_linenumber" name="204" href="#204">204</a> <em class="jxr_comment">// XXX was based on ^#\{(\w+(\.\w)*)\}$ which is wrong, because there is a + missing after the last \w</em>
+<a class="jxr_linenumber" name="205" href="#205">205</a> <strong class="jxr_keyword">boolean</strong> isSimpleProperty(<strong class="jxr_keyword">final</strong> String expressionString) {
+<a class="jxr_linenumber" name="206" href="#206">206</a> <strong class="jxr_keyword">if</strong> (expressionString.startsWith(<span class="jxr_string">"#{"</span>) && expressionString.endsWith(<span class="jxr_string">"}"</span>)) {
+<a class="jxr_linenumber" name="207" href="#207">207</a> <strong class="jxr_keyword">final</strong> String <strong class="jxr_keyword">inner</strong> = expressionString.substring(2, expressionString.length() - 1);
+<a class="jxr_linenumber" name="208" href="#208">208</a> <strong class="jxr_keyword">final</strong> String[] parts = StringUtils.split(<strong class="jxr_keyword">inner</strong>, '.');
+<a class="jxr_linenumber" name="209" href="#209">209</a> <strong class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong> String part : parts) {
+<a class="jxr_linenumber" name="210" href="#210">210</a> <strong class="jxr_keyword">if</strong> (!StringUtils.isAlpha(part)) {
+<a class="jxr_linenumber" name="211" href="#211">211</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="212" href="#212">212</a> }
+<a class="jxr_linenumber" name="213" href="#213">213</a> }
+<a class="jxr_linenumber" name="214" href="#214">214</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="215" href="#215">215</a> }
+<a class="jxr_linenumber" name="216" href="#216">216</a> <strong class="jxr_keyword">return</strong> false;
+<a class="jxr_linenumber" name="217" href="#217">217</a> }
+<a class="jxr_linenumber" name="218" href="#218">218</a>
+<a class="jxr_linenumber" name="219" href="#219">219</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> unsetSortableAttribute(<strong class="jxr_keyword">final</strong> UIColumn uiColumn) {
+<a class="jxr_linenumber" name="220" href="#220">220</a> LOG.warn(<span class="jxr_string">"removing attribute sortable from column "</span> + uiColumn.getId());
+<a class="jxr_linenumber" name="221" href="#221">221</a> uiColumn.getAttributes().put(Attributes.SORTABLE, Boolean.FALSE);
+<a class="jxr_linenumber" name="222" href="#222">222</a> }
+<a class="jxr_linenumber" name="223" href="#223">223</a>
+<a class="jxr_linenumber" name="224" href="#224">224</a> <strong class="jxr_keyword">private</strong> UIComponent getFirstSortableChild(<strong class="jxr_keyword">final</strong> List<UIComponent> children) {
+<a class="jxr_linenumber" name="225" href="#225">225</a> UIComponent result = <strong class="jxr_keyword">null</strong>;
+<a class="jxr_linenumber" name="226" href="#226">226</a>
+<a class="jxr_linenumber" name="227" href="#227">227</a> <strong class="jxr_keyword">for</strong> (UIComponent child : children) {
+<a class="jxr_linenumber" name="228" href="#228">228</a> result = child;
+<a class="jxr_linenumber" name="229" href="#229">229</a> <strong class="jxr_keyword">if</strong> (child instanceof UISelectMany
+<a class="jxr_linenumber" name="230" href="#230">230</a> || child instanceof UISelectOne
+<a class="jxr_linenumber" name="231" href="#231">231</a> || child instanceof UISelectBoolean
+<a class="jxr_linenumber" name="232" href="#232">232</a> || (child instanceof AbstractUICommand && child.getChildren().isEmpty())
+<a class="jxr_linenumber" name="233" href="#233">233</a> || (child instanceof UIInput && RendererTypes.HIDDEN.equals(child.getRendererType()))) {
+<a class="jxr_linenumber" name="234" href="#234">234</a> <strong class="jxr_keyword">continue</strong>;
+<a class="jxr_linenumber" name="235" href="#235">235</a> <em class="jxr_comment">// look for a better component if any</em>
+<a class="jxr_linenumber" name="236" href="#236">236</a> }
+<a class="jxr_linenumber" name="237" href="#237">237</a> <strong class="jxr_keyword">if</strong> (child instanceof UIOutput) {
+<a class="jxr_linenumber" name="238" href="#238">238</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="239" href="#239">239</a> }
+<a class="jxr_linenumber" name="240" href="#240">240</a> <strong class="jxr_keyword">if</strong> (child instanceof UICommand
+<a class="jxr_linenumber" name="241" href="#241">241</a> || child instanceof javax.faces.component.UIPanel) {
+<a class="jxr_linenumber" name="242" href="#242">242</a> child = getFirstSortableChild(child.getChildren());
+<a class="jxr_linenumber" name="243" href="#243">243</a> <strong class="jxr_keyword">if</strong> (child instanceof UIOutput) {
+<a class="jxr_linenumber" name="244" href="#244">244</a> <strong class="jxr_keyword">break</strong>;
+<a class="jxr_linenumber" name="245" href="#245">245</a> }
+<a class="jxr_linenumber" name="246" href="#246">246</a> }
+<a class="jxr_linenumber" name="247" href="#247">247</a> }
+<a class="jxr_linenumber" name="248" href="#248">248</a> <strong class="jxr_keyword">return</strong> result;
+<a class="jxr_linenumber" name="249" href="#249">249</a> }
+<a class="jxr_linenumber" name="250" href="#250">250</a>
+<a class="jxr_linenumber" name="251" href="#251">251</a> <strong class="jxr_keyword">public</strong> Comparator getComparator() {
+<a class="jxr_linenumber" name="252" href="#252">252</a> <strong class="jxr_keyword">return</strong> comparator;
+<a class="jxr_linenumber" name="253" href="#253">253</a> }
+<a class="jxr_linenumber" name="254" href="#254">254</a>
+<a class="jxr_linenumber" name="255" href="#255">255</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setComparator(<strong class="jxr_keyword">final</strong> Comparator comparator) {
+<a class="jxr_linenumber" name="256" href="#256">256</a> <strong class="jxr_keyword">this</strong>.comparator = comparator;
+<a class="jxr_linenumber" name="257" href="#257">257</a> }
+<a class="jxr_linenumber" name="258" href="#258">258</a> }
+<a class="jxr_linenumber" name="259" href="#259">259</a>
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.component</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.component</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/component/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.component</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.component</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.config</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.config</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/config/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.config</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.config</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/ResourceManagerUtils.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/ResourceManagerUtils.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/ResourceManagerUtils.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/ResourceManagerUtils.html Mon Mar 23 07:33:51 2015
@@ -267,7 +267,7 @@
<a class="jxr_linenumber" name="257" href="#257">257</a> <strong class="jxr_keyword">final</strong> FacesContext facesContext, <strong class="jxr_keyword">final</strong> String image, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> disabled, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> ignoreMissing) {
<a class="jxr_linenumber" name="258" href="#258">258</a> String imageWithPath = <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="259" href="#259">259</a> <strong class="jxr_keyword">if</strong> (disabled) {
-<a class="jxr_linenumber" name="260" href="#260">260</a> imageWithPath = ResourceManagerUtils.getDisabledImageWithPath(facesContext, image, ignoreMissing);
+<a class="jxr_linenumber" name="260" href="#260">260</a> imageWithPath = ResourceManagerUtils.getDisabledImageWithPath(facesContext, image, false);
<a class="jxr_linenumber" name="261" href="#261">261</a> }
<a class="jxr_linenumber" name="262" href="#262">262</a> <strong class="jxr_keyword">if</strong> (imageWithPath == <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="263" href="#263">263</a> imageWithPath = ResourceManagerUtils.getImageWithPath(facesContext, image, ignoreMissing);
@@ -284,7 +284,7 @@
<a class="jxr_linenumber" name="274" href="#274">274</a> <strong class="jxr_keyword">final</strong> FacesContext facesContext, <strong class="jxr_keyword">final</strong> String image, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> disabled, <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> ignoreMissing) {
<a class="jxr_linenumber" name="275" href="#275">275</a> String imageWithPath = <strong class="jxr_keyword">null</strong>;
<a class="jxr_linenumber" name="276" href="#276">276</a> <strong class="jxr_keyword">if</strong> (disabled) {
-<a class="jxr_linenumber" name="277" href="#277">277</a> imageWithPath = ResourceManagerUtils.getDisabledImage(facesContext, image, ignoreMissing);
+<a class="jxr_linenumber" name="277" href="#277">277</a> imageWithPath = ResourceManagerUtils.getDisabledImage(facesContext, image, false);
<a class="jxr_linenumber" name="278" href="#278">278</a> }
<a class="jxr_linenumber" name="279" href="#279">279</a> <strong class="jxr_keyword">if</strong> (imageWithPath == <strong class="jxr_keyword">null</strong>) {
<a class="jxr_linenumber" name="280" href="#280">280</a> imageWithPath = ResourceManagerUtils.getImage(facesContext, image, ignoreMissing);
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.context</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.context</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/context/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.context</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.context</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.convert</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.convert</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/convert/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.convert</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.convert</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.el</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.el</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/el/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.el</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.el</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.event</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.event</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/event/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.event</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.event</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets.extension</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets.extension</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/extension/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets.extension</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets.extension</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/facelets/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.facelets</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/AjaxNavigationState.html Mon Mar 23 07:33:51 2015
@@ -171,7 +171,7 @@
<a class="jxr_linenumber" name="161" href="#161">161</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="162" href="#162">162</a> facesContext.getExceptionHandler().handle();
<a class="jxr_linenumber" name="163" href="#163">163</a> } <strong class="jxr_keyword">catch</strong> (ViewExpiredException e) {
-<a class="jxr_linenumber" name="164" href="#164">164</a> LOG.error(<span class="jxr_string">"Caught: "</span> + e.getMessage(), e);
+<a class="jxr_linenumber" name="164" href="#164">164</a> LOG.debug(<span class="jxr_string">"Caught: "</span> + e.getMessage(), e);
<a class="jxr_linenumber" name="165" href="#165">165</a> <strong class="jxr_keyword">try</strong> {
<a class="jxr_linenumber" name="166" href="#166">166</a> <strong class="jxr_keyword">final</strong> ExternalContext externalContext = facesContext.getExternalContext();
<a class="jxr_linenumber" name="167" href="#167">167</a> <strong class="jxr_keyword">final</strong> String url = externalContext.getRequestContextPath()
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-frame.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-frame.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-frame.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-frame.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.internal.ajax</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.internal.ajax</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-summary.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-summary.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-summary.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/ajax/package-summary.html Mon Mar 23 07:33:51 2015
@@ -3,7 +3,7 @@
<html xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title>Tobago Core 2.0.7-SNAPSHOT Reference Package org.apache.myfaces.tobago.internal.ajax</title>
+ <title>Tobago Core 2.0.8-SNAPSHOT Reference Package org.apache.myfaces.tobago.internal.ajax</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html
URL: http://svn.apache.org/viewvc/myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html?rev=1668528&r1=1668527&r2=1668528&view=diff
==============================================================================
--- myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html (original)
+++ myfaces/site/publish/tobago/tobago-core/xref/org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html Mon Mar 23 07:33:51 2015
@@ -29,42 +29,43 @@
<a class="jxr_linenumber" name="19" href="#19">19</a>
<a class="jxr_linenumber" name="20" href="#20">20</a> <strong class="jxr_keyword">package</strong> org.apache.myfaces.tobago.internal.component;
<a class="jxr_linenumber" name="21" href="#21">21</a>
-<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.myfaces.tobago.component.OnComponentPopulated;
-<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.apache.myfaces.tobago.util.ComponentUtils;
-<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
-<a class="jxr_linenumber" name="25" href="#25">25</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
-<a class="jxr_linenumber" name="26" href="#26">26</a>
-<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> javax.faces.component.UIComponent;
-<a class="jxr_linenumber" name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> javax.faces.component.UISelectItem;
-<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> javax.faces.context.FacesContext;
+<a class="jxr_linenumber" name="22" href="#22">22</a> <strong class="jxr_keyword">import</strong> org.apache.myfaces.tobago.util.ComponentUtils;
+<a class="jxr_linenumber" name="23" href="#23">23</a> <strong class="jxr_keyword">import</strong> org.slf4j.Logger;
+<a class="jxr_linenumber" name="24" href="#24">24</a> <strong class="jxr_keyword">import</strong> org.slf4j.LoggerFactory;
+<a class="jxr_linenumber" name="25" href="#25">25</a>
+<a class="jxr_linenumber" name="26" href="#26">26</a> <strong class="jxr_keyword">import</strong> javax.faces.component.UISelectItem;
+<a class="jxr_linenumber" name="27" href="#27">27</a> <strong class="jxr_keyword">import</strong> javax.faces.context.FacesContext;
+<a class="jxr_linenumber" name="28" href="#28">28</a>
+<a class="jxr_linenumber" name="29" href="#29">29</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html">AbstractUISelectItem</a> <strong class="jxr_keyword">extends</strong> UISelectItem {
<a class="jxr_linenumber" name="30" href="#30">30</a>
-<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/myfaces/tobago/internal/component/AbstractUISelectItem.html">AbstractUISelectItem</a> <strong class="jxr_keyword">extends</strong> UISelectItem <strong class="jxr_keyword">implements</strong> <a href="../../../../../../org/apache/myfaces/tobago/component/OnComponentPopulated.html">OnComponentPopulated</a> {
+<a class="jxr_linenumber" name="31" href="#31">31</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(AbstractUISelectItem.<strong class="jxr_keyword">class</strong>);
<a class="jxr_linenumber" name="32" href="#32">32</a>
-<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Logger LOG = LoggerFactory.getLogger(AbstractUISelectItem.<strong class="jxr_keyword">class</strong>);
+<a class="jxr_linenumber" name="33" href="#33">33</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> itemValueLiteral;
<a class="jxr_linenumber" name="34" href="#34">34</a>
-<a class="jxr_linenumber" name="35" href="#35">35</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> itemValueLiteral;
-<a class="jxr_linenumber" name="36" href="#36">36</a>
-<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> onComponentPopulated(<strong class="jxr_keyword">final</strong> FacesContext facesContext, <strong class="jxr_keyword">final</strong> UIComponent parent) {
-<a class="jxr_linenumber" name="38" href="#38">38</a> <strong class="jxr_keyword">if</strong> (itemValueLiteral) {
-<a class="jxr_linenumber" name="39" href="#39">39</a> <strong class="jxr_keyword">final</strong> Object converted = ComponentUtils.getConvertedValue(
-<a class="jxr_linenumber" name="40" href="#40">40</a> FacesContext.getCurrentInstance(), parent, (String) getItemValue());
-<a class="jxr_linenumber" name="41" href="#41">41</a> <strong class="jxr_keyword">super</strong>.setItemValue(converted);
-<a class="jxr_linenumber" name="42" href="#42">42</a> }
-<a class="jxr_linenumber" name="43" href="#43">43</a> }
-<a class="jxr_linenumber" name="44" href="#44">44</a>
-<a class="jxr_linenumber" name="45" href="#45">45</a> @Override
-<a class="jxr_linenumber" name="46" href="#46">46</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setItemValue(<strong class="jxr_keyword">final</strong> Object itemValue) {
-<a class="jxr_linenumber" name="47" href="#47">47</a> <strong class="jxr_keyword">if</strong> (itemValue instanceof String) {
-<a class="jxr_linenumber" name="48" href="#48">48</a> itemValueLiteral = <strong class="jxr_keyword">true</strong>;
-<a class="jxr_linenumber" name="49" href="#49">49</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (itemValue == <strong class="jxr_keyword">null</strong>) {
-<a class="jxr_linenumber" name="50" href="#50">50</a> <em class="jxr_comment">// ignore</em>
-<a class="jxr_linenumber" name="51" href="#51">51</a> } <strong class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="52" href="#52">52</a> LOG.warn(<span class="jxr_string">"Unexpected type of literal for attribute 'itemValue': "</span>
-<a class="jxr_linenumber" name="53" href="#53">53</a> + <span class="jxr_string">"type="</span> + itemValue.getClass().getName() + <span class="jxr_string">" value='"</span> + itemValue + <span class="jxr_string">"'."</span>);
-<a class="jxr_linenumber" name="54" href="#54">54</a> }
-<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">super</strong>.setItemValue(itemValue);
-<a class="jxr_linenumber" name="56" href="#56">56</a> }
-<a class="jxr_linenumber" name="57" href="#57">57</a> }
+<a class="jxr_linenumber" name="35" href="#35">35</a> @Override
+<a class="jxr_linenumber" name="36" href="#36">36</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setItemValue(<strong class="jxr_keyword">final</strong> Object itemValue) {
+<a class="jxr_linenumber" name="37" href="#37">37</a> <strong class="jxr_keyword">if</strong> (itemValue instanceof String) {
+<a class="jxr_linenumber" name="38" href="#38">38</a> itemValueLiteral = <strong class="jxr_keyword">true</strong>;
+<a class="jxr_linenumber" name="39" href="#39">39</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (itemValue == <strong class="jxr_keyword">null</strong>) {
+<a class="jxr_linenumber" name="40" href="#40">40</a> <em class="jxr_comment">// ignore</em>
+<a class="jxr_linenumber" name="41" href="#41">41</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="42" href="#42">42</a> LOG.warn(<span class="jxr_string">"Unexpected type of literal for attribute 'itemValue': "</span>
+<a class="jxr_linenumber" name="43" href="#43">43</a> + <span class="jxr_string">"type="</span> + itemValue.getClass().getName() + <span class="jxr_string">" value='"</span> + itemValue + <span class="jxr_string">"'."</span>);
+<a class="jxr_linenumber" name="44" href="#44">44</a> }
+<a class="jxr_linenumber" name="45" href="#45">45</a> <strong class="jxr_keyword">super</strong>.setItemValue(itemValue);
+<a class="jxr_linenumber" name="46" href="#46">46</a> }
+<a class="jxr_linenumber" name="47" href="#47">47</a>
+<a class="jxr_linenumber" name="48" href="#48">48</a> @Override
+<a class="jxr_linenumber" name="49" href="#49">49</a> <strong class="jxr_keyword">public</strong> Object getItemValue() {
+<a class="jxr_linenumber" name="50" href="#50">50</a> <strong class="jxr_keyword">if</strong> (itemValueLiteral) {
+<a class="jxr_linenumber" name="51" href="#51">51</a> <strong class="jxr_keyword">final</strong> Object converted = ComponentUtils.getConvertedValue(
+<a class="jxr_linenumber" name="52" href="#52">52</a> FacesContext.getCurrentInstance(), getParent(), (String) <strong class="jxr_keyword">super</strong>.getItemValue());
+<a class="jxr_linenumber" name="53" href="#53">53</a> <strong class="jxr_keyword">return</strong> converted;
+<a class="jxr_linenumber" name="54" href="#54">54</a> } <strong class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="55" href="#55">55</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">super</strong>.getItemValue();
+<a class="jxr_linenumber" name="56" href="#56">56</a> }
+<a class="jxr_linenumber" name="57" href="#57">57</a> }
+<a class="jxr_linenumber" name="58" href="#58">58</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>