[waffle-scm] [882] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context: killin some more of the old

Thu, 15 Jan 2009 12:03:00 -0800

Title: [waffle-scm] [882] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context: killin some more of the old

Diff

Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextLevel.java (881 => 882)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextLevel.java	2009-01-15 19:58:25 UTC (rev 881)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextLevel.java	2009-01-15 20:02:55 UTC (rev 882)
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) terms as published in http://waffle.codehaus.org/license.html
- */
-package org.codehaus.waffle.context;
-
-/**
- * Represents the common "levels" within a web application.
- *
- * @author Michael Ward
- */
-public enum ContextLevel {
-    APPLICATION,
-    SESSION,
-    REQUEST
-}

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/DelegatingTypeConverterTest.java (881 => 882)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/DelegatingTypeConverterTest.java	2009-01-15 19:58:25 UTC (rev 881)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/DelegatingTypeConverterTest.java	2009-01-15 20:02:55 UTC (rev 882)
@@ -9,7 +9,6 @@
 
 import org.codehaus.waffle.bind.ValueConverter;
 import org.codehaus.waffle.bind.converters.StringListValueConverter;
-import org.codehaus.waffle.context.ContextLevel;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
 import org.codehaus.waffle.monitor.BindMonitor;
 import org.codehaus.waffle.monitor.SilentMonitor;
@@ -31,12 +30,6 @@
     private BindMonitor bindMonitor = new SilentMonitor();
 
     @Test
-    public void canConvertValueForEnum() {
-        DelegatingTypeConverter converter = new DelegatingTypeConverter();
-        assertEquals(ContextLevel.APPLICATION, converter.convertValue("foobar", "APPLICATION", ContextLevel.class));
-    }
-
-    @Test
     public void canConvertValueForIntegers() {
         DelegatingTypeConverter converter = new DelegatingTypeConverter();
         assertEquals(15, converter.convertValue("foobar", "15", Integer.class));

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java (881 => 882)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java	2009-01-15 19:58:25 UTC (rev 881)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java	2009-01-15 20:02:55 UTC (rev 882)
@@ -18,7 +18,6 @@
 import org.codehaus.waffle.bind.ControllerDataBinder;
 import org.codehaus.waffle.bind.converters.NumberValueConverter;
 import org.codehaus.waffle.bind.converters.StringListValueConverter;
-import org.codehaus.waffle.context.ContextLevel;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
 import org.codehaus.waffle.i18n.MessageResources;
 import org.codehaus.waffle.monitor.SilentMonitor;
@@ -72,7 +71,6 @@
         binder.bind(request, null, errorsContext, fakeController);
 
         assertEquals("foobar", fakeController.getName());
-        assertEquals(ContextLevel.APPLICATION, fakeController.getContextLevel());
         assertFalse(errorsContext.hasErrorMessages());
     }
     
@@ -155,7 +153,6 @@
         ErrorsContext errorsContext = new DefaultErrorsContext(null);
         binder.bind(request, null, errorsContext, fakeController);
 
-        assertNull(fakeController.getContextLevel());
         assertFalse(errorsContext.hasErrorMessages());
     }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java (881 => 882)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java	2009-01-15 19:58:25 UTC (rev 881)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java	2009-01-15 20:02:55 UTC (rev 882)
@@ -11,7 +11,6 @@
 
 import org.codehaus.waffle.action.ActionMethodException;
 import org.codehaus.waffle.action.ActionMethodInvocationException;
-import org.codehaus.waffle.context.ContextLevel;
 import org.codehaus.waffle.view.View;
 
 public class FakeController {
@@ -19,7 +18,6 @@
     private String[] values;
     private List<String> list;
     private Number number;
-    private ContextLevel contextLevel;
     private HttpServletRequest request;
     private HttpServletResponse response;
     private HttpSession session;
@@ -40,14 +38,6 @@
         this.number = number;
     }
 
-    public ContextLevel getContextLevel() {
-        return contextLevel;
-    }
-
-    public void setContextLevel(ContextLevel contextLevel) {
-        this.contextLevel = contextLevel;
-    }
-
     public String passThruMethod(String value) {
         return value;
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to