openutils-svn

[Openutils-svn] SF.net SVN: openutils:[2084] trunk/openutils-mgnlstripes/src/main/java/it/ openutils/magnoliastripes

[<luc...@us...>]

Revision: 2084
          http://openutils.svn.sourceforge.net/openutils/?rev=2084&view=rev
Author:   lucaboati
Date:     2010-03-02 21:32:19 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
[MGNLSTRIPES-1] add an annotation on stripes action to define which mgnl dialog binds to the action

Modified Paths:
--------------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java

Added Paths:
-----------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-03-02 11:04:18 UTC (rev 2083)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-03-02 21:32:19 UTC (rev 2084)
@@ -3,24 +3,24 @@
  * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
  * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package it.openutils.magnoliastripes;
 
 import info.magnolia.module.templating.Paragraph;
 import info.magnolia.module.templating.ParagraphManager;
+import it.openutils.magnoliastripes.annotations.Dialog;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -34,8 +34,8 @@
 
 
 /**
- * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a Magnolia
- * paragraph.
+ * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a
+ * Magnolia paragraph.
  * @author fgiust
  * @version $Id: $
  */
@@ -63,13 +63,45 @@
         // Only process the class if it's properly annotated
         if (binding != null)
         {
-            String dialogName = actionNameToParagraphName(binding);
-            collectStripesParagraphs(dialogName, binding);
+            String paragraphName = actionNameToParagraphName(binding);
+            String dialogName = annotationDialogToParagraphName(clazz);
+            if (StringUtils.isBlank(dialogName))
+            {
+                dialogName = paragraphName;
+            }
+            collectStripesParagraphs(paragraphName, dialogName, binding);
             super.addActionBean(clazz);
         }
     }
 
     /**
+     * Generate a paragraph name from "Dialog" Annotation.
+     * @param binding Stripe action binding
+     * @return paragraph name
+     */
+    protected String annotationDialogToParagraphName(Class< ? extends ActionBean> clazz)
+    {
+        return processDialogAnnotation(clazz);
+    }
+
+    protected String processDialogAnnotation(Class< ? extends ActionBean> clazz)
+    {
+        // check that class is annotated
+        Dialog annotation = clazz.getAnnotation(Dialog.class);
+        if (annotation == null)
+        {
+            return null;
+        }
+        // check that value is not null or empty
+        String pattern = annotation.value();
+        if (StringUtils.isBlank(pattern))
+        {
+            return null;
+        }
+        return pattern;
+    }
+
+    /**
      * Generate a paragraph name from a Stripes binding. This method will take the last token after "/", strip any
      * extension and convert everything to lowercase.
      * @param binding Stripe action binding
@@ -89,20 +121,20 @@
      * @param binding Stripes action binding
      */
     @SuppressWarnings("unchecked")
-    private void collectStripesParagraphs(String name, String binding)
+    private void collectStripesParagraphs(String paragraphName, String dialogName, String binding)
     {
         Paragraph paragraph = new Paragraph();
 
-        paragraph.setName(name);
-        paragraph.setTitle("paragraph." + name + ".title");
-        paragraph.setDescription("paragraph." + name + ".description");
-        paragraph.setDialog(name);
+        paragraph.setName(paragraphName);
+        paragraph.setTitle("paragraph." + paragraphName + ".title");
+        paragraph.setDescription("paragraph." + paragraphName + ".description");
+        paragraph.setDialog(dialogName);
         paragraph.setTemplatePath(binding);
         paragraph.setType("stripes");
         paragraph.setI18nBasename(StripesModule.getInstance().getI18nbasename());
         paragraphs.add(paragraph);
 
-        log.info("Registering stripes paragraph {}", paragraph.getName()); //$NON-NLS-1$
+        log.info("Registering stripes paragraph {} with dialog {}", paragraph.getName(), paragraph.getDialog()); //$NON-NLS-1$ /$NON-NLS-2$
         ParagraphManager.getInstance().getParagraphs().put(paragraph.getName(), paragraph);
     }
 
@@ -116,4 +148,9 @@
         }
     }
 
+    public static Set<Paragraph> getParagraphs()
+    {
+        return paragraphs;
+    }
+
 }

Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java	                        (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/annotations/Dialog.java	2010-03-02 21:32:19 UTC (rev 2084)
@@ -0,0 +1,36 @@
+/**
+ *
+ * Magnolia Stripes module (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) null-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.openutils.magnoliastripes.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+
+/**
+ * @author luca boati
+ * @version $Id: $
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE })
+public @interface Dialog {
+
+    String value();
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3171] trunk/openutils-mgnlstripes/src/main/java/it/ openutils/magnoliastripes

[<fg...@us...>]

Revision: 3171
          http://openutils.svn.sourceforge.net/openutils/?rev=3171&view=rev
Author:   fgiust
Date:     2010-12-08 20:43:32 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
MGNLSTRIPES-7 update to magnolia 4.4

Modified Paths:
--------------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-12-08 20:35:51 UTC (rev 3170)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MgnlActionResolver.java	2010-12-08 20:43:32 UTC (rev 3171)
@@ -35,8 +35,8 @@
 
 
 /**
- * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a
- * Magnolia paragraph.
+ * ActionResolver that extends <code>NameBasedActionResolver</code>, registering any found Stripe action as a Magnolia
+ * paragraph.
  * @author fgiust
  * @version $Id: $
  */
@@ -77,7 +77,6 @@
 
     /**
      * Generate a paragraph name from "Dialog" Annotation.
-     * @param binding Stripe action binding
      * @return paragraph name
      */
     protected String annotationDialogToParagraphName(Class< ? extends ActionBean> clazz)
@@ -110,9 +109,9 @@
      */
     protected String actionNameToParagraphName(String binding)
     {
-        String dialogName = StringUtils.lowerCase(StringUtils.substringBeforeLast(StringUtils.substringAfterLast(
-            binding,
-            "/"), "."));
+        String dialogName = StringUtils.lowerCase(StringUtils.substringBeforeLast(
+            StringUtils.substringAfterLast(binding, "/"),
+            "."));
         return dialogName;
     }
 

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java	2010-12-08 20:35:51 UTC (rev 3170)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesMagnoliaFilter.java	2010-12-08 20:43:32 UTC (rev 3171)
@@ -19,17 +19,29 @@
 
 package it.openutils.magnoliastripes;
 
+import info.magnolia.cms.filters.DispatchRule;
+import info.magnolia.cms.filters.DispatchRules;
+import info.magnolia.cms.filters.Mapping;
 import info.magnolia.cms.filters.MgnlFilter;
+import info.magnolia.cms.filters.WebContainerResources;
+import info.magnolia.cms.util.RequestHeaderUtil;
+import info.magnolia.cms.util.ServletUtils;
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.RepositoryAcquiringStrategy;
 import info.magnolia.context.WebContext;
 import info.magnolia.context.WebContextImpl;
+import info.magnolia.objectfactory.Components;
 import info.magnolia.voting.Voter;
 import info.magnolia.voting.Voting;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.regex.Pattern;
+
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import net.sourceforge.stripes.config.Configuration;
 import net.sourceforge.stripes.controller.StripesFilter;
@@ -52,19 +64,97 @@
 
     private boolean enabled = true;
 
-    public boolean bypasses(HttpServletRequest request)
+    private DispatchRules dispatchRules = new DispatchRules();
+
+    private Mapping mapping = new Mapping();
+
+    private WebContainerResources webContainerResources = Components.getSingleton(WebContainerResources.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException
     {
-        if (!isEnabled())
+        super.init(filterConfig);
+        filterConfig.getServletContext().setAttribute(Configuration.class.getName(), getInstanceConfiguration());
+    }
+
+    /**
+     * Wraps the HttpServletRequest with a StripesServletRequest. This is done to ensure that any form posts that
+     * contain file uploads get handled appropriately.
+     * @param servletRequest the HttpServletRequest handed to the dispatcher by the container
+     * @return an instance of StripesRequestWrapper, which is an HttpServletRequestWrapper
+     * @throws StripesServletException if the wrapper cannot be constructed
+     */
+    @Override
+    protected StripesRequestWrapper wrapRequest(HttpServletRequest servletRequest) throws StripesServletException
+    {
+        try
         {
+            return StripesRequestWrapper.findStripesWrapper(servletRequest);
+        }
+        catch (IllegalStateException e)
+        {
+            StripesRequestWrapper srw = new StripesRequestWrapper(servletRequest);
+
+            if (MgnlContext.hasInstance())
+            {
+                // be sure that the request wrapper gets setted in mgnlcontext too
+                WebContext webContext = (WebContext) MgnlContext.getInstance();
+                RepositoryAcquiringStrategy strategy = ((WebContextImpl) webContext).getRepositoryStrategy();
+                webContext.init(servletRequest, webContext.getResponse(), webContext.getServletContext());
+                ((WebContextImpl) webContext).setRepositoryStrategy(strategy);
+            }
+            return srw;
+        }
+    }
+
+    public boolean matches(HttpServletRequest request)
+    {
+        return isEnabled() && matchesDispatching(request) && mapsTo(request) && !bypasses(request);
+    }
+
+    protected boolean mapsTo(HttpServletRequest request)
+    {
+        if (getMapping().getMappings().isEmpty())
+        {
             return true;
         }
-        if (MgnlContext.hasInstance())
+        return getMapping().match(request).isMatching();
+    }
+
+    protected boolean matchesDispatching(HttpServletRequest request)
+    {
+        if (webContainerResources == null)
         {
-            return Voting.Factory.getDefaultVoting().vote(bypasses, request) > 0;
+            return true;
         }
+        boolean toWebContainerResource = webContainerResources.isWebContainerResource(request);
+        boolean toMagnoliaResource = !toWebContainerResource;
+
+        DispatchRule dispatchRule = getDispatchRules().getDispatchRule(ServletUtils.getDispatcherType(request));
+        if (toMagnoliaResource && dispatchRule.isToMagnoliaResources())
+            return true;
+        if (toWebContainerResource && dispatchRule.isToWebContainerResources())
+            return true;
         return false;
     }
 
+    protected boolean bypasses(HttpServletRequest request)
+    {
+        Voting voting = Voting.HIGHEST_LEVEL;
+        if (voting.vote(bypasses, request) > 0)
+            return true;
+
+        return false;
+    }
+
+    public void destroy()
+    {
+        // nothing to do here
+    }
+
     public Voter[] getBypasses()
     {
         return this.bypasses;
@@ -95,44 +185,54 @@
         this.enabled = enabled;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException
+    public DispatchRules getDispatchRules()
     {
-        super.init(filterConfig);
-        filterConfig.getServletContext().setAttribute(Configuration.class.getName(), getInstanceConfiguration());
+        return dispatchRules;
     }
 
-    /**
-     * Wraps the HttpServletRequest with a StripesServletRequest. This is done to ensure that any form posts that
-     * contain file uploads get handled appropriately.
-     * @param servletRequest the HttpServletRequest handed to the dispatcher by the container
-     * @return an instance of StripesRequestWrapper, which is an HttpServletRequestWrapper
-     * @throws StripesServletException if the wrapper cannot be constructed
-     */
-    @Override
-    protected StripesRequestWrapper wrapRequest(HttpServletRequest servletRequest) throws StripesServletException
+    public void setDispatchRules(DispatchRules dispatching)
     {
-        try
+        this.dispatchRules = dispatching;
+    }
+
+    public Collection<String> getMappings()
+    {
+        ArrayList<String> result = new ArrayList<String>();
+        for (Pattern pattern : getMapping().getMappings())
         {
-            return StripesRequestWrapper.findStripesWrapper(servletRequest);
+            result.add(pattern.pattern());
         }
-        catch (IllegalStateException e)
-        {
-            StripesRequestWrapper srw = new StripesRequestWrapper(servletRequest);
+        return result;
+    }
 
-            if (MgnlContext.hasInstance())
-            {
-                // be sure that the request wrapper gets setted in mgnlcontext too
-                WebContext webContext = (WebContext) MgnlContext.getInstance();
-                RepositoryAcquiringStrategy strategy = ((WebContextImpl) webContext).getRepositoryStrategy();
-                webContext.init(servletRequest, webContext.getResponse(), webContext.getServletContext());
-                ((WebContextImpl) webContext).setRepositoryStrategy(strategy);
-            }
-            return srw;
-        }
+    protected Mapping getMapping()
+    {
+        return mapping;
     }
 
+    public void addMapping(String mapping)
+    {
+        this.getMapping().addMapping(mapping);
+    }
+
+    // ---- utility methods -----
+    protected boolean acceptsGzipEncoding(HttpServletRequest request)
+    {
+        return RequestHeaderUtil.acceptsGzipEncoding(request);
+    }
+
+    protected boolean acceptsEncoding(final HttpServletRequest request, final String name)
+    {
+        return RequestHeaderUtil.acceptsEncoding(request, name);
+    }
+
+    protected boolean headerContains(final HttpServletRequest request, final String header, final String value)
+    {
+        return RequestHeaderUtil.headerContains(request, header, value);
+    }
+
+    protected void addAndVerifyHeader(HttpServletResponse response, String name, String value)
+    {
+        RequestHeaderUtil.addAndVerifyHeader(response, name, value);
+    }
 }

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2010-12-08 20:35:51 UTC (rev 3170)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/StripesRenderer.java	2010-12-08 20:43:32 UTC (rev 3171)
@@ -165,9 +165,6 @@
         return MgnlContext.getWebContext("StripesRenderer can only be used with a WebContext");
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected void renderCommon(String templatePath, Map<String, String[]> nodeDataMap, Writer out) throws IOException
     {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3597] trunk/openutils-mgnlstripes/src/main/java/it/ openutils/magnoliastripes

[<fg...@us...>]

Revision: 3597
          http://openutils.svn.sourceforge.net/openutils/?rev=3597&view=rev
Author:   fgiust
Date:     2011-08-08 12:53:59 +0000 (Mon, 08 Aug 2011)

Log Message:
-----------
useful formatter for Calendars

Added Paths:
-----------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java

Added: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java	                        (rev 0)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java	2011-08-08 12:53:59 UTC (rev 3597)
@@ -0,0 +1,149 @@
+/**
+ *
+ * Stripes module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlstripes.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.openutils.magnoliastripes.extra;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import net.sourceforge.stripes.exception.StripesRuntimeException;
+import net.sourceforge.stripes.format.Formatter;
+
+
+/**
+ * Date formatter with support for Calendars. Copied from default Stripes DateFormatter.
+ * @author Danilo Ghirardelli
+ */
+public class CalendarFormatter implements Formatter<Calendar>
+{
+
+    protected static final Map<String, Integer> NAMED_PATTERNS = new HashMap<String, Integer>();
+    static
+    {
+        NAMED_PATTERNS.put("short", DateFormat.SHORT);
+        NAMED_PATTERNS.put("medium", DateFormat.MEDIUM);
+        NAMED_PATTERNS.put("long", DateFormat.LONG);
+        NAMED_PATTERNS.put("full", DateFormat.FULL);
+    }
+
+    private String formatType;
+
+    private String formatPattern;
+
+    private Locale locale;
+
+    private DateFormat format;
+
+    @Override
+    public void setFormatType(String formatType)
+    {
+        this.formatType = formatType;
+    }
+
+    public String getFormatType()
+    {
+        return formatType;
+    }
+
+    @Override
+    public void setFormatPattern(String formatPattern)
+    {
+        this.formatPattern = formatPattern;
+    }
+
+    public String getFormatPattern()
+    {
+        return formatPattern;
+    }
+
+    @Override
+    public void setLocale(Locale locale)
+    {
+        this.locale = locale;
+    }
+
+    public Locale getLocale()
+    {
+        return locale;
+    }
+
+    /**
+     * Constructs the DateFormat used for formatting, based on the values passed to the various setter methods on the
+     * class. If the formatString is one of the named formats then a DateFormat instance is created of the specified
+     * type and format, otherwise a SimpleDateFormat is constructed using the pattern provided and the formatType is
+     * ignored.
+     */
+    @Override
+    public void init()
+    {
+        // Default these values if they were not supplied
+        if (formatPattern == null)
+        {
+            formatPattern = "short";
+        }
+        if (formatType == null)
+        {
+            formatType = "date";
+        }
+        String lcFormatString = formatPattern.toLowerCase();
+        String lcFormatType = formatType.toLowerCase();
+        // Now figure out how to construct our date format for our locale
+        if (NAMED_PATTERNS.containsKey(lcFormatString))
+        {
+            if (lcFormatType.equals("date"))
+            {
+                format = DateFormat.getDateInstance(NAMED_PATTERNS.get(lcFormatString), locale);
+            }
+            else if (lcFormatType.equals("datetime"))
+            {
+                format = DateFormat.getDateTimeInstance(
+                    NAMED_PATTERNS.get(lcFormatString),
+                    NAMED_PATTERNS.get(lcFormatString),
+                    locale);
+            }
+            else if (lcFormatType.equals("time"))
+            {
+                format = DateFormat.getTimeInstance(NAMED_PATTERNS.get(lcFormatString), locale);
+            }
+            else
+            {
+                throw new StripesRuntimeException("Invalid formatType for Date: "
+                    + formatType
+                    + ". Allowed types are 'date', 'time' and 'datetime'.");
+            }
+        }
+        else
+        {
+            format = new SimpleDateFormat(formatPattern, locale);
+        }
+    }
+
+    @Override
+    public String format(Calendar input)
+    {
+        if (input != null)
+        {
+            return this.format.format(input.getTime());
+        }
+        return null;
+    }
+}
\ No newline at end of file


Property changes on: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3694] trunk/openutils-mgnlstripes/src/main/java/it/ openutils/magnoliastripes

[<fg...@us...>]

Revision: 3694
          http://openutils.svn.sourceforge.net/openutils/?rev=3694&view=rev
Author:   fgiust
Date:     2011-11-19 17:13:22 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
java 5 source compatibility

Modified Paths:
--------------
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
    trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2011-11-19 17:10:34 UTC (rev 3693)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/MagnoliaMultipartWrapper.java	2011-11-19 17:13:22 UTC (rev 3694)
@@ -74,13 +74,11 @@
         return new Enumeration<String>()
         {
 
-            @Override
             public boolean hasMoreElements()
             {
                 return false;
             }
 
-            @Override
             public String nextElement()
             {
                 return null;

Modified: trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java
===================================================================
--- trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java	2011-11-19 17:10:34 UTC (rev 3693)
+++ trunk/openutils-mgnlstripes/src/main/java/it/openutils/magnoliastripes/extra/CalendarFormatter.java	2011-11-19 17:13:22 UTC (rev 3694)
@@ -53,7 +53,6 @@
 
     private DateFormat format;
 
-    @Override
     public void setFormatType(String formatType)
     {
         this.formatType = formatType;
@@ -64,7 +63,6 @@
         return formatType;
     }
 
-    @Override
     public void setFormatPattern(String formatPattern)
     {
         this.formatPattern = formatPattern;
@@ -75,7 +73,6 @@
         return formatPattern;
     }
 
-    @Override
     public void setLocale(Locale locale)
     {
         this.locale = locale;
@@ -92,7 +89,6 @@
      * type and format, otherwise a SimpleDateFormat is constructed using the pattern provided and the formatType is
      * ignored.
      */
-    @Override
     public void init()
     {
         // Default these values if they were not supplied
@@ -137,7 +133,6 @@
         }
     }
 
-    @Override
     public String format(Calendar input)
     {
         if (input != null)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.