You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@apache.org on 2007/10/31 13:10:54 UTC
svn commit: r590638 - in
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype:
FlowJXPathSelectionList.java FlowJXPathSelectionListBuilder.java
Author: giacomo
Date: Wed Oct 31 05:10:53 2007
New Revision: 590638
URL: http://svn.apache.org/viewvc?rev=590638&view=rev
Log:
fixing issues with stale objectModel in jx-path selction-lists
Modified:
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java?rev=590638&r1=590637&r2=590638&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java Wed Oct 31 05:10:53 2007
@@ -24,6 +24,7 @@
import org.apache.cocoon.forms.FormsConstants;
import org.apache.cocoon.forms.util.I18nMessage;
import org.apache.cocoon.el.objectmodel.ObjectModel;
+import org.apache.cocoon.processing.ProcessInfoProvider;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.commons.jxpath.JXPathContext;
@@ -41,7 +42,7 @@
*/
public class FlowJXPathSelectionList implements SelectionList {
- private Map objectModel;
+ private ProcessInfoProvider processInfoProvider;
private String listPath;
private String valuePath;
private String labelPath;
@@ -53,7 +54,7 @@
private String i18nCatalog;
private boolean labelIsI18nKey = false;
- public FlowJXPathSelectionList(Map objectModel,
+ public FlowJXPathSelectionList(ProcessInfoProvider processInfoProvider,
String listPath,
String valuePath,
String labelPath,
@@ -62,7 +63,7 @@
boolean nullTextIsI18nKey,
String i18nCatalog,
boolean labelIsI18nKey) {
- this.objectModel = objectModel;
+ this.processInfoProvider = processInfoProvider;
this.listPath = listPath;
this.valuePath = valuePath;
this.labelPath = labelPath;
@@ -99,7 +100,7 @@
JXPathContext ctx = null;
Iterator iter = null;
if (model == null) {
- Object flowData = FlowHelper.getContextObject(objectModel);
+ Object flowData = FlowHelper.getContextObject(processInfoProvider.getObjectModel());
if (flowData == null) {
throw new SAXException("No flow data to produce selection list");
}
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java?rev=590638&r1=590637&r2=590638&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java Wed Oct 31 05:10:53 2007
@@ -82,7 +82,7 @@
String i18nCatalog = DomHelper.getAttribute(selectionListElement, "catalogue", null);
- return new FlowJXPathSelectionList(processInfoProvider.getObjectModel(),
+ return new FlowJXPathSelectionList(processInfoProvider,
listPath,
valuePath,
labelPath,
Re: svn commit: r590638 - in /cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype:
FlowJXPathSelectionList.java FlowJXPathSelectionListBuilder.java
Posted by Grzegorz Kossakowski <gr...@tuffmail.com>.
Hi Giacomo!
giacomo@apache.org pisze:
> Author: giacomo
> Date: Wed Oct 31 05:10:53 2007
> New Revision: 590638
>
> URL: http://svn.apache.org/viewvc?rev=590638&view=rev
> Log:
> fixing issues with stale objectModel in jx-path selction-lists
>
> Modified:
> cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionList.java
> cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListBuilder.java
>
This commit caused compilation error of FlowJXPathSelectionListTestCase
that I fixed in r591496.
It wasn't a big deal for me but next time I would suggest to forget
about -Dmaven.test.skip=true ;)
Actually, this message is addressed to all committers: you don't need to
skip tests because they are supposed to always pass now.
BTW. Continuum has not reported any problem because of this problem:
https://issues.apache.org/jira/browse/INFRA-1394
that is fixed now.
--
Grzegorz Kossakowski