Author: ehillenius
Date: Mon May 7 10:33:52 2007
New Revision: 535937
URL: http://svn.apache.org/viewvc?view=rev&rev=535937
Log:
formats and other tweaks
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Field.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?view=diff&rev=535937&r1=535936&r2=535937
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
Mon May 7 10:33:52 2007
@@ -38,7 +38,8 @@
public class DynamicPage extends WicketExamplePage
{
/** the current template contents. */
- private PackageResourceStream template = new
PackageResourceStream(DynamicPage.class, "fields.vm");
+ private PackageResourceStream template = new
PackageResourceStream(DynamicPage.class,
+ "fields.vm");
/** context to be used by the template. */
private final Model templateContext;
@@ -56,21 +57,25 @@
templateContext = Model.valueOf(map);
VelocityPanel panel;
- add(panel = new VelocityPanel("templatePanel", templateContext)
{
+ add(panel = new VelocityPanel("templatePanel", templateContext)
+ {
@Override
protected IStringResourceStream getTemplateResource()
{
return template;
}
+
@Override
protected boolean parseGeneratedMarkup()
{
return true;
}
});
- for (Field field : fields) {
+ for (Field field : fields)
+ {
panel.add(new TextField(field.getFieldName()));
- panel.add(new Label("label_"+field.getFieldName(), new
ResourceModel(field.getFieldName())));
+ panel.add(new Label("label_" + field.getFieldName(),
new ResourceModel(field
+ .getFieldName())));
}
}
}
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Field.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Field.java?view=diff&rev=535937&r1=535936&r2=535937
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Field.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Field.java
Mon May 7 10:33:52 2007
@@ -15,27 +15,36 @@
public class Field implements Serializable
{
private String fieldName;
+
private int fieldSize;
+
/**
+ * Construct.
*
+ * @param fieldName
+ * @param fieldSize
*/
public Field(String fieldName, int fieldSize)
{
this.fieldName = fieldName;
this.fieldSize = fieldSize;
}
+
public String getFieldName()
{
return fieldName;
}
- public void setFieldName(String fieldName)
- {
- this.fieldName = fieldName;
- }
+
public int getFieldSize()
{
return fieldSize;
}
+
+ public void setFieldName(String fieldName)
+ {
+ this.fieldName = fieldName;
+ }
+
public void setFieldSize(int fieldSize)
{
this.fieldSize = fieldSize;
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java?view=diff&rev=535937&r1=535936&r2=535937
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/Home.java
Mon May 7 10:33:52 2007
@@ -18,6 +18,9 @@
import org.apache.wicket.examples.WicketExamplePage;
+/**
+ * Home page of this example.
+ */
public class Home extends WicketExamplePage
{
}
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?view=diff&rev=535937&r1=535936&r2=535937
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
Mon May 7 10:33:52 2007
@@ -27,7 +27,6 @@
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.IStringResourceStream;
import org.apache.wicket.util.resource.PackageResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -69,7 +68,8 @@
}
/** the current template contents. */
- private IStringResourceStream template = new
PackageResourceStream(DynamicPage.class, "persons.vm");
+ private IStringResourceStream template = new
PackageResourceStream(DynamicPage.class,
+ "persons.vm");
/** context to be used by the template. */
private final Model templateContext;
@@ -87,7 +87,8 @@
templateContext = Model.valueOf(map);
add(new TemplateForm("templateForm"));
- add(new VelocityPanel("templatePanel", templateContext) {
+ add(new VelocityPanel("templatePanel", templateContext)
+ {
@Override
protected IStringResourceStream getTemplateResource()
{
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java?view=diff&rev=535937&r1=535936&r2=535937
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/VelocityTemplateApplication.java
Mon May 7 10:33:52 2007
@@ -31,8 +31,11 @@
*/
public class VelocityTemplateApplication extends WebApplication
{
+ private static List<Field> fields = new ArrayList<Field>();
+
/** simple persons db. */
private static List<Person> persons = new ArrayList<Person>();
+
static
{
persons.add(new Person("Joe", "Down"));
@@ -42,14 +45,17 @@
persons.add(new Person("Sue", "Hazel"));
persons.add(new Person("Bush", "Gump"));
}
-
- private static List<Field> fields = new ArrayList<Field>();
static
{
fields.add(new Field("firstName", 50));
fields.add(new Field("lastName", 80));
}
- public static List<Field> getFields() {
+
+ /**
+ * @return Fields
+ */
+ public static List<Field> getFields()
+ {
return fields;
}
