4:09 a.m.
Author: manaRH
Date: 2012-02-03 05:09:55 -0500 (Fri, 03 Feb 2012)
New Revision: 14293
Modified:
branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml
branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java
branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
Log:
reverting changes not related to JBPAPP-7183
Modified: branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml
===================================================================
--- branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml 2012-02-03 09:52:54 UTC
(rev 14292)
+++ branches/enterprise/JBPAPP_5_0/examples/itext/view/index.xhtml 2012-02-03 10:09:55 UTC
(rev 14293)
@@ -45,7 +45,6 @@
</li>
<li><s:link view="/swing.xhtml" value="Swing
Component" /></li>
<li><s:link view="/fillform.xhtml"
value="Fill-in-forms" /></li>
- <li><s:link view="/piechart.xhtml" value="Bug in
Piechart?" /></li>
<ui:remove>
Modified:
branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java 2012-02-03
09:52:54 UTC (rev 14292)
+++
branches/enterprise/JBPAPP_5_0/src/gen/org/jboss/seam/tool/EclipseClasspathTask.java 2012-02-03
10:09:55 UTC (rev 14293)
@@ -37,10 +37,9 @@
for (String path : uberPath.list())
{
- // avoid placing modules on classpath and pom files
- if (!path.contains("jboss-seam") &&
!path.contains(".pom"))
+ // avoid placing modules on classpath
+ if (!path.contains("jboss-seam"))
{
- System.out.println("PATH " + path);
String sourcePath = path.substring(0, path.lastIndexOf(".jar")) +
"-sources.jar";
String javadocPath = path.substring(0, path.lastIndexOf(".jar")) +
"-javadoc.jar";
String eclipsepath = "\t<classpathentry kind=\"lib\"
path=\""
Modified: branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java 2012-02-03
09:52:54 UTC (rev 14292)
+++ branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChart.java 2012-02-03
10:09:55 UTC (rev 14293)
@@ -342,9 +342,13 @@
}
@Override
- public void encodeBegin(FacesContext context) throws IOException {
+ public void encodeBegin(FacesContext context) throws IOException {
+ dataset = getDataset();
// bypass super to avoid createITextObject() before the chart is ready
- dataset = createDataset();
+ if (dataset == null) {
+ dataset = createDataset();
+ }
+
chart = getChart();
if (chart == null) {
chart = createChart(context);
Modified: branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java 2012-02-03
09:52:54 UTC (rev 14292)
+++
branches/enterprise/JBPAPP_5_0/src/pdf/org/jboss/seam/pdf/ui/UIChartData.java 2012-02-03
10:09:55 UTC (rev 14293)
@@ -141,10 +141,7 @@
if (dataset instanceof DefaultPieDataset) {
DefaultPieDataset piedata = (DefaultPieDataset) dataset;
- System.out.println("Number of items in dataset " +
piedata.getItemCount());
- System.out.println("Adding value " + getNumericValue() + "
into dataset " + getKey() );
piedata.setValue(getKey(), getNumericValue());
- System.out.println("Number of items in dataset " +
piedata.getItemCount());
PiePlot plot = (PiePlot) chart.getChart().getPlot();
@@ -168,9 +165,7 @@
// CategoryPlot plot = (CategoryPlot)
// chart.getChart().getPlot();
- System.out.println("Adding value " + getNumericValue() + "
into dataset " + data.getValue(getSeries(), getKey()));
- data.addValue(getNumericValue(), getSeries(), getKey());
-
+ data.addValue(getNumericValue(), getSeries(), getKey());
// } else if (dataset instanceof DefaultXYDataset) {
// DefaultXYDataset data = (DefaultXYDataset) dataset;
Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2012-02-03 09:52:54 UTC
(rev 14292)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/ftest.properties 2012-02-03 10:09:55 UTC
(rev 14293)
@@ -96,6 +96,4 @@
test.package=com.example.test
richfaces.skin=classic
jboss.domain=default
-openid.account=seamqa.myopenid.com
-openid.password=jboss42
# ant.exec=/usr/bin/ant