[waffle-scm] [900] sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple: Working through example issues.

Sun, 18 Jan 2009 06:48:40 -0800

Title: [waffle-scm] [900] sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple: Working through example issues.

Diff

Modified: sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java (899 => 900)

--- sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java	2009-01-18 11:39:23 UTC (rev 899)
+++ sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java	2009-01-18 14:48:38 UTC (rev 900)
@@ -1,17 +1,24 @@
 package org.codehaus.waffle.example.freemarker;
 
+import static java.util.Arrays.asList;
+import static org.codehaus.waffle.bind.converters.DateValueConverter.DAY_FORMAT_KEY;
+import static org.codehaus.waffle.bind.converters.DateValueConverter.TIME_FORMAT_KEY;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+
 import org.codehaus.waffle.bind.ValueConverter;
 import org.codehaus.waffle.bind.ValueConverterFinder;
-import org.codehaus.waffle.bind.converters.AbstractValueConverter;
 import org.codehaus.waffle.bind.converters.DateValueConverter;
-import org.codehaus.waffle.bind.converters.NumberValueConverter;
-import org.codehaus.waffle.bind.converters.StringListValueConverter;
 import org.codehaus.waffle.bind.converters.NumberListValueConverter;
+import org.codehaus.waffle.bind.converters.NumberValueConverter;
 import org.codehaus.waffle.bind.converters.StringListMapValueConverter;
+import org.codehaus.waffle.bind.converters.StringListValueConverter;
 import org.codehaus.waffle.bind.converters.StringNumberListMapValueConverter;
-import static org.codehaus.waffle.bind.converters.DateValueConverter.DAY_FORMAT_KEY;
-import static org.codehaus.waffle.bind.converters.DateValueConverter.TIME_FORMAT_KEY;
-
 import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.example.freemarker.controller.DateProvider;
 import org.codehaus.waffle.example.freemarker.controller.PersonController;
@@ -24,14 +31,6 @@
 import org.codehaus.waffle.view.ViewResolver;
 import org.picocontainer.MutablePicoContainer;
 
-import javax.servlet.ServletContext;
-import static java.util.Arrays.asList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-
 public class FreemarkerExampleWebappComposer extends WaffleWebappComposer {
 
     @Override
@@ -39,7 +38,7 @@
         super.composeApplication(picoContainer, servletContext);
         picoContainer.addComponent("DateValueConverter", DateValueConverter.class);
         DateProvider dateProvider = new DateProvider("dd/MM/yyyy", "hh:mm:ss", "dd/MM/yyyy");
-        AbstractValueConverter converter = (AbstractValueConverter) picoContainer.getComponent(DateValueConverter.class);
+        DateValueConverter converter = picoContainer.getComponent(DateValueConverter.class);
         if (converter != null) {
             Properties patterns = new Properties();
             patterns.setProperty(DAY_FORMAT_KEY, dateProvider.getDayPattern());
@@ -60,7 +59,6 @@
         finder.registerConverter((ValueConverter) picoContainer.getComponent(PersonListValueConverter.class));
         MessageResources resources = picoContainer.getComponent(MessageResources.class);
         resources.useURI("waffle-core-bundle,FreemarkerResources");
-        resources.useLocale(Locale.ITALIAN);
         picoContainer.addComponent("people/manage", PersonController.class);
         picoContainer.addComponent("home", MenuAwareController.class);
         ViewResolver viewResolver = picoContainer.getComponent(ViewResolver.class);

Modified: sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java (899 => 900)

--- sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java	2009-01-18 11:39:23 UTC (rev 899)
+++ sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java	2009-01-18 14:48:38 UTC (rev 900)
@@ -90,10 +90,6 @@
         this.person = persister.findById(id);
     }
 
-    public void select() {
-        this.person = persister.findById(id);
-    }
-
     public void show() {
         // do nothing: the selected Ids and people are automatically populated
     }

Modified: sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java (899 => 900)

--- sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java	2009-01-18 11:39:23 UTC (rev 899)
+++ sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/AjaxExample.java	2009-01-18 14:48:38 UTC (rev 900)
@@ -1,10 +1,10 @@
 package org.codehaus.waffle.example.simple;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.codehaus.waffle.view.View;
 
-import java.util.List;
-import java.util.ArrayList;
-
 public class AjaxExample {
     private final List<Item> selected;
     private final List<Item> available;
@@ -32,14 +32,14 @@
         AjaxExample.Item item = available.remove(index);
         selected.add(item);
 
-        return new View("selection.jspx", this);
+        return new View("selection.jspx");
     }
 
     public View remove(int index) {
         AjaxExample.Item item = selected.remove(index);
         available.add(item);
 
-        return new View("selection.jspx", this);
+        return new View("selection.jspx");
     }
 
     public class Item {

Modified: sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleWebappComposer.java (899 => 900)

--- sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleWebappComposer.java	2009-01-18 11:39:23 UTC (rev 899)
+++ sandbox/v2experiment/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleWebappComposer.java	2009-01-18 14:48:38 UTC (rev 900)
@@ -2,7 +2,10 @@
 
 import static org.codehaus.waffle.registrar.RequestParameterReference.requestParameter;
 
+import javax.servlet.ServletContext;
+
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.example.simple.controllers.AutomobileController;
 import org.codehaus.waffle.example.simple.controllers.CalculatorController;
 import org.codehaus.waffle.example.simple.controllers.HelloWorldController;
@@ -11,13 +14,8 @@
 import org.codehaus.waffle.example.simple.controllers.UploadController;
 import org.codehaus.waffle.example.simple.dao.SimplePersonDAO;
 import org.codehaus.waffle.io.RequestFileUploader;
-import org.codehaus.waffle.context.pico.WaffleWebappComposer;
-import org.codehaus.waffle.monitor.ActionMonitor;
-import org.codehaus.waffle.monitor.BindMonitor;
 import org.picocontainer.MutablePicoContainer;
 
-import javax.servlet.ServletContext;
-
 public class SimpleExampleWebappComposer extends WaffleWebappComposer {
 
     @Override
@@ -49,7 +47,7 @@
         picoContainer.addComponent("uploader", RequestFileUploader.class);
         picoContainer.addComponent("upload", UploadController.class);
         picoContainer.addComponent("parameter_example", ParameterExampleController.class,
-                picoParameters("Mike", requestParameter("age", 30)));
+        picoParameters("Mike", requestParameter("age", 30)));
     }
 
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to