Author: michiel
Date: 2010-05-10 16:51:21 +0200 (Mon, 10 May 2010)
New Revision: 42130
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/Form.java
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormNode.java
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsCloud.java
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsTransaction.java
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NodeWrapperForm.java
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NotWrapped.java
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AAForm.java
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AANode.java
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/BBNode.java
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/FormsCloudTest.java
Log:
Modified: speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/Form.java
===================================================================
--- speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/Form.java
2010-05-10 14:46:08 UTC (rev 42129)
+++ speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/Form.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -41,7 +41,7 @@
* {...@link FormsCloud#getNode} will call this method for every of its
Forms.
* The first one not returning <code>null</code> will be used.
*
- * This default implemetnation returns <code>null</code>, you may want to
override this.
+ * This default implementation returns <code>null</code>, you may want to
override this.
*/
public Node getNode(int number) {
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormNode.java
===================================================================
--- speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormNode.java
2010-05-10 14:46:08 UTC (rev 42129)
+++ speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormNode.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -18,7 +18,7 @@
* A test/example form that deals with nodes of the type 'aa'.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class FormNode extends NodeWrapper {
Property changes on:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormNode.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsCloud.java
===================================================================
---
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsCloud.java
2010-05-10 14:46:08 UTC (rev 42129)
+++
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsCloud.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -77,9 +77,9 @@
} else {
try {
Class<?> clazz = (Class<?>) Class.forName(className);
+ Form newInstance;
if (! NodeManager.class.isAssignableFrom(clazz)) {
- Form newInstance = new NodeWrapperForm(this, nm, (Class<?
extends Form>) clazz);
- return newInstance;
+ newInstance = new NodeWrapperForm(this, nm, (Class<?
extends Form>) clazz);
} else {
Class<? extends Form> formClazz = (Class<? extends Form>)
clazz;
Constructor<? extends Form> constructor;
@@ -88,9 +88,11 @@
} catch (NoSuchMethodException nsme) {
constructor = formClazz.getConstructor(Cloud.class,
NodeManagerDescription.class);
}
- Form newInstance = constructor.newInstance(this, nm);
- return newInstance;
+ newInstance = constructor.newInstance(this, nm);
}
+ for (Map.Entry<String, String> entry : nm.properties) {
+ Instantiator.setProperty(entry.getKey(), newInstance,
entry.getValue());
+ }
} catch (ClassNotFoundException cnfe) {
throw new BridgeException(cnfe);
} catch (NoSuchMethodException nsme) {
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsTransaction.java
===================================================================
---
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsTransaction.java
2010-05-10 14:46:08 UTC (rev 42129)
+++
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsTransaction.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -20,7 +20,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloud.java 39221 2009-10-19 16:39:47Z michiel $
+ * @version $Id$
*/
public class FormsTransaction extends FormsCloud implements Transaction {
Property changes on:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/FormsTransaction.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NodeWrapperForm.java
===================================================================
---
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NodeWrapperForm.java
2010-05-10 14:46:08 UTC (rev 42129)
+++
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NodeWrapperForm.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -21,7 +21,7 @@
* FormsCloud} be wrapped into an instance of this class.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class NodeWrapperForm extends Form {
Property changes on:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NodeWrapperForm.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NotWrapped.java
===================================================================
---
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NotWrapped.java
2010-05-10 14:46:08 UTC (rev 42129)
+++
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NotWrapped.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -19,7 +19,7 @@
* indicate to {...@link NodeWrapperForm} that we don't want to wrap a given
Node.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class NotWrapped extends Exception {
Property changes on:
speeltuin/mihxil/forms/src/main/java/org/mmbase/bridge/forms/NotWrapped.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AAForm.java
===================================================================
--- speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AAForm.java
2010-05-10 14:46:08 UTC (rev 42129)
+++ speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AAForm.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -18,7 +18,7 @@
* A test/example form that deals with nodes of the type 'aa'.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class AAForm extends Form {
Property changes on:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AAForm.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AANode.java
===================================================================
--- speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AANode.java
2010-05-10 14:46:08 UTC (rev 42129)
+++ speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AANode.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -18,7 +18,7 @@
* A test/example form that deals with nodes of the type 'aa'.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class AANode extends FormNode {
public AANode(Node n, Form f) throws NotWrapped {
Property changes on:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/AANode.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/BBNode.java
===================================================================
--- speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/BBNode.java
2010-05-10 14:46:08 UTC (rev 42129)
+++ speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/BBNode.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -18,7 +18,7 @@
* A test/example form that deals with nodes of the type 'bb'.
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class BBNode extends FormNode {
public BBNode(Node n, Form f) throws NotWrapped {
Property changes on:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/BBNode.java
___________________________________________________________________
Name: svn:keywords
+ Id
Modified:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/FormsCloudTest.java
===================================================================
---
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/FormsCloudTest.java
2010-05-10 14:46:08 UTC (rev 42129)
+++
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/FormsCloudTest.java
2010-05-10 14:51:21 UTC (rev 42130)
@@ -21,7 +21,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: FormsCloudContextTest.java 39128 2009-10-13 14:58:02Z michiel
$
+ * @version $Id$
*/
public class FormsCloudTest {
Property changes on:
speeltuin/mihxil/forms/src/test/java/org/mmbase/bridge/forms/FormsCloudTest.java
___________________________________________________________________
Name: svn:keywords
+ Id
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
