[jboss-cvs] jboss-seam/examples/itext/view ...

[Norman Richards]

  User: nrichards
  Date: 07/07/27 14:47:45

  Modified:    examples/itext/view   chart.xhtml chartimage.xhtml
  Log:
  update attributes
  
  Revision  Changes    Path
  1.7       +16 -16    jboss-seam/examples/itext/view/chart.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: chart.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/itext/view/chart.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- chart.xhtml	4 Jul 2007 19:07:06 -0000	1.6
  +++ chart.xhtml	27 Jul 2007 18:47:45 -0000	1.7
  @@ -37,12 +37,12 @@
                     seriesOutlinePaint="pink" seriesOutlineStroke="dot1">
               
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value}" />
  +                <p:data key="#{item.name}" value="#{item.value}" />
               </ui:repeat>
           </p:series>
           <p:series key="data2" seriesPaint="green"  seriesStroke="dot2">
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value+10}" />
  +                <p:data key="#{item.name}" value="#{item.value+10}" />
               </ui:repeat>
           </p:series>
       </p:barchart>
  @@ -53,12 +53,12 @@
                     seriesOutlinePaint="pink" seriesOutlineStroke="dot1">
               
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value}" />
  +                <p:data key="#{item.name}" value="#{item.value}" />
               </ui:repeat>
           </p:series>
           <p:series key="data2" seriesPaint="green"  seriesStroke="dot2">
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value-10}" />
  +                <p:data key="#{item.name}" value="#{item.value-10}" />
               </ui:repeat>
           </p:series>
       </p:barchart>
  @@ -70,22 +70,22 @@
   
           <p:series key="data1" seriesPaint="bar"  seriesStroke="dot2">
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value}" />
  +                <p:data key="#{item.name}" value="#{item.value}" />
               </ui:repeat>
  -            <p:data columnKey="foo" value="75.1" />
  +            <p:data key="foo" value="75.1" />
           </p:series>
   
           <p:series key="data2" seriesPaint="green"  seriesStroke="dot2">
  -            <p:data columnKey="foo" value="75.1" />
  +            <p:data key="foo" value="75.1" />
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value+5}" />
  +                <p:data key="#{item.name}" value="#{item.value+5}" />
               </ui:repeat>
           </p:series>
   
           <p:series key="data3">
  -            <p:data columnKey="foo" value="10" />
  +            <p:data key="foo" value="10" />
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value+12}" />
  +                <p:data key="#{item.name}" value="#{item.value+12}" />
               </ui:repeat>
           </p:series>
   
  @@ -97,22 +97,22 @@
   
           <p:series key="data1" seriesPaint="green"  seriesStroke="dot2">
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value}" />
  +                <p:data key="#{item.name}" value="#{item.value}" />
               </ui:repeat>
  -            <p:data columnKey="foo" value="75.1" />
  +            <p:data key="foo" value="75.1" />
           </p:series>
   
           <p:series key="data2" seriesPaint="bar"  seriesStroke="dot2">
  -            <p:data columnKey="foo" value="75.1" />
  +            <p:data key="foo" value="75.1" />
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}"  value="#{item.value+5}" />
  +                <p:data key="#{item.name}"  value="#{item.value+5}" />
               </ui:repeat>
           </p:series>
   
           <p:series key="data3">
  -            <p:data columnKey="foo" value="10" />
  +            <p:data key="foo" value="10" />
               <ui:repeat value="#{data.pieData}" var="item">
  -                <p:data columnKey="#{item.name}" value="#{item.value+6}" />
  +                <p:data key="#{item.name}" value="#{item.value+6}" />
               </ui:repeat>
           </p:series>
   
  
  
  
  1.10      +11 -2     jboss-seam/examples/itext/view/chartimage.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: chartimage.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/itext/view/chartimage.xhtml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- chartimage.xhtml	6 Jul 2007 23:38:45 -0000	1.9
  +++ chartimage.xhtml	27 Jul 2007 18:47:45 -0000	1.10
  @@ -59,7 +59,7 @@
                                 seriesOutlineStroke="#{dataset.seriesOutlineStroke}">
                           
                           <ui:repeat value="#{chart.categories}" var="category">
  -                            <p:data columnKey="#{category}" value="#{dataset.values[category]}" />
  +                            <p:data key="#{category}" value="#{dataset.values[category]}" />
                           </ui:repeat>
                       </p:series>
                   </ui:repeat>
  @@ -188,7 +188,7 @@
                       <a:support  event="onchange" reRender="chart" />
                   </rich:inputNumberSlider>
               </rich:tab>
  -            <rich:tab label="Range">
  +            <rich:tab label="Border">
                   Border: 
                   <h:selectBooleanCheckbox value="#{chart.borderVisible}">
                       <a:support  event="onchange" reRender="chart" />
  @@ -296,6 +296,15 @@
                                       <s:selectItems value="#{strokes}" var="i" label="#{i}" noSelectionLabel="Default..." />
                                       <a:support  event="onchange" reRender="chart" />
                                   </h:selectOneMenu> 
  +
  +                                <ui:remove>
  +                                <h:selectOneMenu value="#{dataset.seriesFillPaint}">             
  +                                    <s:selectItems value="#{colors}" var="i" label="#{i}"
  +                                                   noSelectionLabel="Fill ... "/> 
  +                                    <a:support  event="onchange" reRender="chart" />
  +                                </h:selectOneMenu> 
  +                                </ui:remove>
  +
                               </td>
                               <td class="dr-table-cell rich-table-cell">
                                   <h:selectOneMenu value="#{dataset.seriesOutlinePaint}">