[waffle-scm] [903] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view: Removed deprecated elements of 1.x codebase.

Sun, 18 Jan 2009 07:12:39 -0800

Title: [waffle-scm] [903] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view: Removed deprecated elements of 1.x codebase.

Diff

Modified: sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/action/UsersController.java (902 => 903)

--- sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/action/UsersController.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/action/UsersController.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -22,7 +22,7 @@
         User user = this.persistenceManager.getUserDao().search(login, password);
         this.passport.setUser(user);
 
-        return new RedirectView("dvds.waffle", this);
+        return new RedirectView("dvds.waffle");
     }
 
     @ActionMethod(parameters = {"name", "login", "password"})
@@ -31,11 +31,11 @@
         this.persistenceManager.getUserDao().add(new User(name, login, password));
         this.persistenceManager.commit();
 
-        return new View("user-added", this);
+        return new View("user-added");
     }
 
     public View logout() {
         this.passport.invalidate();
-        return new RedirectView("users.waffle", this);
+        return new RedirectView("users.waffle");
     }
 }

Modified: sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/interceptor/AuthorizationInterceptor.java (902 => 903)

--- sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/interceptor/AuthorizationInterceptor.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/interceptor/AuthorizationInterceptor.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -45,7 +45,7 @@
             return chain.proceed(controllerDefinition, method, arguments);
         } else {
             System.out.println("Not Authenticated");
-            return new RedirectView("users.waffle", controllerDefinition.getController());
+            return new RedirectView("users.waffle");
         }
     }

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -30,13 +30,6 @@
         this.locale = locale;
     }
 
-    /**
-     * @deprecated Use DefaultMessageResourcesConfiguration(String uri, Locale locale)
-     */
-    public DefaultMessageResourcesConfiguration(Locale locale, String uri) {
-        this(uri, locale);
-    }
-
     public Locale getLocale() {
         return locale;
     }

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -15,16 +15,6 @@
  */
 public interface MessageResources {
 
-    /**
-     * @deprecated Use getURI()
-     */
-    String getResource();
-
-    /**
-     * @deprecated Use useURI(String)
-     */
-    void useResource(String resource);
-    
     String getURI();
 
     void useURI(String uri);

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -13,17 +13,7 @@
  */
 public interface MessageResourcesConfiguration {
 
-    /**
-     * @deprecated Use getURI()
-     */
-    String getDefaultResource();
-
     String getURI();
 
-    /**
-     * @deprecated Use getLocale()
-     */
-    Locale geDefaultLocale();
-
     Locale getLocale();
 }

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/ExportView.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/ExportView.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/ExportView.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -13,13 +13,6 @@
     private final byte[] content;
     private final String filename;
 
-    /*
-     * @deprecated Use {...@link #ExportView(String,byte[],String)} instead
-     */
-    public ExportView(Object controller, String contentType, byte[] content, String filename) {
-        this(contentType, content, filename);
-    }
-
     public ExportView(String contentType, byte[] content, String filename) {
         super((String)null);
         this.contentType = contentType;

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/RedirectView.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/RedirectView.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/RedirectView.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -16,14 +16,7 @@
     public RedirectView(String path) {
         this(path, null, HttpServletResponse.SC_SEE_OTHER);
     }
-    
-    /**
-     * @deprecated - Use RedirectView(path)
-     */
-    public RedirectView(String path, Object controller) {
-        this(path, controller, HttpServletResponse.SC_SEE_OTHER);
-    }
-
+  
     public RedirectView(String path, Object controller, int statusCode) {
         super((String)path);
         this.statusCode = statusCode;

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/View.java (902 => 903)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/View.java	2009-01-18 15:04:56 UTC (rev 902)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/view/View.java	2009-01-18 15:12:37 UTC (rev 903)
@@ -39,20 +39,8 @@
        this.path = null;
        this.controllerDefinition = controllerDefinition;
     }
-    
+   
     /**
-     * Creates a View
-     * 
-     * @param path represents the path of the View to be resolved
-     * @param controller the controller where the view originated from
-     * @deprecated Use View(String) or View(ControllerDefinition) instead
-     */
-    public View(String path, Object controller) {
-        this.path = path;
-        this.controllerDefinition = new ControllerDefinition(null, controller, null);
-    }
-
-    /**
      * Returns the view path
      * 
      * @return The View path

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to