Changeset 130

Timestamp:

08/18/11 12:39:22 (13 years ago)

Author:

vmipsl

Message:

[Visualization] interface quite finish

Location:

ether_megapoli/trunk

Files:

• common/implementation/com/ether/EtherException.java (moved) (moved from ether_megapoli/trunk/common/implementation/com/ether/WebException.java) (1 diff)
• common/implementation/com/ether/WebHelper.java (modified) (4 diffs)
• domain/interface/com/ether/AxeType.java (added)
• persistence/implementation/hibernate-domain.cfg.xml (modified) (2 diffs)
• service/implementation/com/ether/EtherPlotServiceImpl.java (modified) (13 diffs)
• service/implementation/com/ether/JPanelToImageManager.java (modified) (2 diffs)
• service/implementation/com/ether/MegapoliPlot.java (modified) (3 diffs)
• service/interface/com/ether/EtherPlotService.java (modified) (2 diffs)
• service/test/com/ether/SGTTest.java (modified) (4 diffs)
• web/resources/css/button.css (modified) (3 diffs)
• web/resources/css/visu_parameter_by_pf.css (modified) (3 diffs)
• web/resources/images/arrow.png (added)
• web/resources/images/bg.gif (added)
• web/resources/js/etherClasses.js (modified) (10 diffs)
• web/resources/jsp/etherHead.jsp (modified) (1 diff)
• web/resources/templates/template.jsp (modified) (1 diff)
• web/src/ApplicationResources.properties (modified) (3 diffs)
• web/src/ApplicationResources_en.properties (modified) (3 diffs)
• web/src/com/ether/Controller.java (modified) (4 diffs)
• web/src/com/ether/ControllerEther.java (modified) (10 diffs)
• web/src/com/ether/ControllerPlot.java (modified) (5 diffs)
• web/src/com/ether/Vincent.java (deleted)
• web/src/com/ether/WebException.java (modified) (1 diff)
• web/visualization/visu_parameter_by_pf-script.jsp (modified) (10 diffs)
• web/visualization/visu_parameter_by_pf.jsp (modified) (5 diffs)

ether_megapoli/trunk/common/implementation/com/ether/EtherException.java

@@ -5 +5 @@
  * @date 02 feb 2011
  */
-public class WebException
+public class EtherException
         extends FormattedException
 {
-    public WebException( final Enum<? extends Code> code )
+    public EtherException( final Enum<? extends Code> code )
     {
         super( code );
     }
 
-    public WebException( final Enum<? extends Code> code, final Throwable cause, final Object... parameters )
+    public EtherException( final Enum<? extends Code> code, final Throwable cause, final Object... parameters )
     {
         this( code, cause.getMessage(), cause, parameters );
     }
 
-    protected WebException( final Enum<? extends Code> code, final String message, final Throwable cause, final Object... parameters )
+    protected EtherException( final Enum<? extends Code> code, final String message, final Throwable cause, final Object... parameters )
     {
         super( prefix( code, message ), cause, parameters );
     }
 
-    public WebException( final Throwable cause )
+    public EtherException( final Throwable cause )
     {
         super( cause );
     }
 
-    public WebException( final Enum<? extends Code> code, final String string )
+    public EtherException( final Enum<? extends Code> code, final String string )
     {
         super( code, string );
     }
 
-    public static enum WebCode
+    public static enum EtherCode
             implements Code
     {
-        UNKNOWN,
-        PERSISTENCE,
-        SERVICE_PROBLEM,
-        PLATEFORME_ID_NOT_FOUND,
         IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM,
-        ERROR_UNSUPPORTED_UTF8_ENCODING,
-        ERROR_NO_REQUEST_HANDLING_METHOD,
-        ERROR_NUMBER_OF_PARAM_TYPES_NOT_EQUAL_TO_PARAM_ANNOTATIONS,
-        FILE_NOT_FOUND;
     }
 }

ether_megapoli/trunk/common/implementation/com/ether/WebHelper.java

@@ -4 +4 @@
 import java.io.PrintWriter;
 import java.security.InvalidParameterException;
+import java.util.Locale;
+import java.util.ResourceBundle;
 
 import javax.servlet.ServletOutputStream;
@@ -14 +16 @@
 import org.jetbrains.annotations.Nullable;
 
-import com.ether.WebException.WebCode;
+import com.ether.EtherException.EtherCode;
 
 public final class WebHelper
@@ -23 +25 @@
 
     @NotNull
-    public static String getRequestParameter(@NotNull final HttpServletRequest httpServletRequest, @Nullable final String parameterName, @Nullable final String defaultParameterValue, final boolean canBeNull )
-        throws InvalidParameterException
+    public static String getRequestParameter( @NotNull final HttpServletRequest httpServletRequest, @Nullable final String parameterName, @Nullable final String defaultParameterValue, final boolean canBeNull )
+            throws InvalidParameterException
     {
-        String parameterValue;
-        if(null == parameterName)
-                parameterValue = defaultParameterValue;
-        
+        String parameterValue;
+        if( null == parameterName )
+            parameterValue = defaultParameterValue;
+
         parameterValue = httpServletRequest.getParameter( parameterName );
 
@@ -54 +56 @@
     }
 
-    public static void displayAjaxError(@NotNull final HttpServletResponse response, @Nullable final String methodName) 
-        throws WebException
-    {           
-        try {
-                response.setStatus(HttpServletResponse.SC_NOT_IMPLEMENTED);
-                response.setCharacterEncoding(UTF8Charset.getEncoding());
-                response.setContentType("text/plain;charset="+ UTF8Charset.getEncoding());
-                final ServletOutputStream outputStream = response.getOutputStream();
-                outputStream.print("error.method_not_implemented : " + methodName+ " is not implemented.");
-                outputStream.flush();
-                outputStream.close();
-        } catch (IOException e) {
-                throw new WebException(WebCode.IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM, e);
-        }
+    public static void displayAjaxError( @NotNull final HttpServletResponse response, @Nullable final String methodName )
+            throws EtherException
+    {
+        try
+        {
+            response.setStatus( HttpServletResponse.SC_NOT_IMPLEMENTED );
+            response.setCharacterEncoding( UTF8Charset.getEncoding() );
+            response.setContentType( "text/plain;charset=" + UTF8Charset.getEncoding() );
+            final ServletOutputStream outputStream = response.getOutputStream();
+            outputStream.print( "error.method_not_implemented : " + methodName + " is not implemented." );
+            outputStream.flush();
+            outputStream.close();
+        }
+        catch( IOException e )
+        {
+            throw new EtherException( EtherCode.IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM, e );
+        }
+    }
+
+    @NotNull
+    public static ResourceBundle getBundle( @Nullable final Locale locale )
+    {
+        if( null != locale )
+            return ResourceBundle.getBundle( "ApplicationResources", locale );
+        else
+            return ResourceBundle.getBundle( "ApplicationResources" );
     }
 
     private static final Log LOGGER = LogFactory.getLog( WebHelper.class );
-    
+
     private static final String CONTENT_TYPE_TEXT_JSON = "text/javascript;charset=" + UTF8Charset.getEncoding();
-    private static final char JSON_TAG_BEGIN = ' ' ;  // '(';
+    private static final char JSON_TAG_BEGIN = ' ';  // '(';
     private static final char JSON_TAG_END = ' ';     // ')';
 }

ether_megapoli/trunk/persistence/implementation/hibernate-domain.cfg.xml

@@ -6 +6 @@
 <hibernate-configuration>
         <session-factory>
+
         <!--<mapping resource="com/medias/objects/Adresse.hbm.xml"/>-->
         <!--<mapping resource="com/medias/objects/Bilan.hbm.xml"/>-->
@@ -32 +33 @@
         <!--<mapping resource="com/medias/objects/Valeur.hbm.xml"/>-->
         <!--<mapping resource="com/medias/objects/Zone.hbm.xml"/>-->
+
         </session-factory>
 </hibernate-configuration>

ether_megapoli/trunk/service/implementation/com/ether/EtherPlotServiceImpl.java

@@ -8 +8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.medias.megapoli.utils.MegapoliInitialisation;
 
 import javax.swing.*;
@@ -29 +30 @@
      * @param locale
      * @return
-     * @throws WebException
-     */
-    @NotNull
-    public BufferedImage createJPane( @NotNull final MegapoliPlot megapoliPlot, @Nullable final Locale locale )
-    {
-        JPane jPane = new JPane( "Main jPane", new Dimension( MAIN_WIDTH, MAIN_HEIGHT ) );
+     */
+    @NotNull
+    public BufferedImage createMainPane( @NotNull final MegapoliPlot megapoliPlot, @Nullable final Locale locale )
+    {
+//        JPane jPane = new JPane( "Main jPane", new Dimension( MAIN_WIDTH, MAIN_HEIGHT ) );
+        JPane jPane = new JPane( "Main jPane", new Dimension( MAIN_WIDTH, 700 ) );
         if( null != megapoliPlot.getWidth() && null != megapoliPlot.getHeight() )
             jPane = new JPane( "Main jPane", new Dimension( megapoliPlot.getWidth(), megapoliPlot.getHeight() ) );
@@ -43 +44 @@
         jPane.setOpaque( true );
 
-        final JPane jPaneTop = createTopPane( megapoliPlot );
-        jPane.add( jPaneTop, BorderLayout.NORTH );
-//        final JPane jPaneCenter = createCenterPane( megapoliPlot.getData() );
-        final JPane jPaneCenter = createTopPane( megapoliPlot );
+        // Top Pane
+//        final JPane jPaneTop = createTopPane( megapoliPlot );
+//        jPane.add( jPaneTop, BorderLayout.NORTH );
+
+        // Center Pane
+        final Integer valuesNumber = megapoliPlot.getData().getYArray().length;
+        final JPane jPaneCenter;
+        if( valuesNumber > 0 )
+            jPaneCenter = createCenterPane( megapoliPlot.getData() );
+        else
+            jPaneCenter = createEmptyCenterPane( locale );
         jPane.add( jPaneCenter, BorderLayout.CENTER );
-        final JPane jPaneBottom = createBottomPane( megapoliPlot.getData().getYArray().length, locale );
-        jPane.add( jPaneBottom, BorderLayout.SOUTH );
+
+        // Bottom Pane
+//        final JPane jPaneBottom = createBottomPane( valuesNumber, locale );
+//        jPane.add( jPaneBottom, BorderLayout.SOUTH );
 
         final JPanelToImageManager jPanelToImageManager = new JPanelToImageManager( jPane );
-
         return jPanelToImageManager.saveAsImage();
     }
@@ -59 +68 @@
      * Create the top JPane with the logos and title
      *
-     * @param megapoliPlot@return
+     * @param megapoliPlot
+     * @return
      */
     @NotNull
@@ -83 +93 @@
 
         // Title
-        final JLabel jLabelTitle = new JLabel( megapoliPlot.getTitle(), JLabel.CENTER );
-        final Font police = new Font( "Arial", Font.BOLD, FONT_SIZE );
+        final String formatedTitle = formatTitle( megapoliPlot.getTitle() );
+        final JLabel jLabelTitle = new JLabel( formatedTitle, JLabel.CENTER );
+        final Font police = new Font( "Arial", Font.BOLD, TITLE_FONT_SIZE );
         jLabelTitle.setFont( police );
         jPaneTop.add( jLabelTitle, BorderLayout.CENTER );
@@ -100 +111 @@
     public JPane createCenterPane( @NotNull final SGTData data )
     {
-        final JPane jPaneCenter = new JPane( "Center jPane", new Dimension( 0, 1000 ) );
-        jPaneCenter.setLayout( new BorderLayout() );
+//        final JPane jPaneCenter = new JPane( "Center jPane", new Dimension( 0, 1000 ) );
 
         // Graph
         final JPlotLayout jPlotLayout = new JPlotLayout( false, true, false, "Trajectory data", null, false );
-        jPlotLayout.setTitles( "title1", "title2", "title3" );
+        jPlotLayout.setTitles( "", "", "" );
         jPlotLayout.addData( data, data.getTitle() );
-//        jPlotLayout.setSize( 800, 800 );
+//        jPlotLayout.setSize( 800, 1 );
         jPlotLayout.setVisible( true );
 
@@ -114 +124 @@
 
         // TODO : remove this change to bufferedImage to insert directly the jPlotLayout !!!!
+//        final BufferedImage bufferedImage = new BufferedImage( jPlotLayout.getWidth(), jPlotLayout.getHeight(), BufferedImage.TYPE_INT_RGB );
         final BufferedImage bufferedImage = new BufferedImage( jPlotLayout.getWidth(), jPlotLayout.getHeight(), BufferedImage.TYPE_INT_RGB );
         final Graphics2D graphics2D = bufferedImage.createGraphics();
@@ -119 +130 @@
 
         final ImageIcon imageIcon = new ImageIcon( bufferedImage );
-        final JLabel jLabel = new JLabel( imageIcon );
+        final JLabel jLabel = new JLabel( imageIcon, JLabel.CENTER );
         jLabel.setBorder( BorderFactory.createLineBorder( Color.blue, 2 ) );
+
+//        final JPane jPaneCenter = new JPane( "Center jPane", new Dimension( jPlotLayout.getWidth(), jPlotLayout.getHeight() ) );
+        final JPane jPaneCenter = new JPane();
+        jPaneCenter.setLayout( new BorderLayout() );
         jPaneCenter.add( jLabel, BorderLayout.CENTER );
 
-//        final JLabel jj = new JLabel("pif");
-//        jj.setBorder( BorderFactory.createLineBorder( Color.red, 2 ) );
-//        jPaneCenter.add( jj, BorderLayout.CENTER );
-
         return jPaneCenter;
     }
 
     /**
+     * Create the center JPane with no graph (if no value)
+     *
+     * @param locale
+     * @return
+     */
+    public JPane createEmptyCenterPane( @Nullable final Locale locale )
+    {
+        final ResourceBundle bundle = WebHelper.getBundle( locale );
+        final String messageData = bundle.getString( "plot.noData" );
+
+        final JPane jPaneCenter = new JPane();
+        jPaneCenter.setLayout( new BorderLayout() );
+
+        final JLabel jLabelData = new JLabel( messageData, JLabel.CENTER );
+        final Font police = new Font( "Arial", Font.BOLD, FONT_SIZE );
+        jLabelData.setFont( police );
+
+        jPaneCenter.add( jLabelData, BorderLayout.CENTER );
+        return jPaneCenter;
+    }
+
+    /**
      * Create the bottom JPane with the text "published .. (date)"
      *
@@ -140 +173 @@
     public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale )
     {
-        final ResourceBundle bundle = getBundle( locale );
+        final ResourceBundle bundle = WebHelper.getBundle( locale );
 
         final JPane jPaneBottom = new JPane();
@@ -148 +181 @@
         final Calendar calendar = Calendar.getInstance();
         final String messagePublished = bundle.getString( "plot.published" );
-        final JLabel jLabel = new JLabel( messagePublished + " " + DateHelper.formatDate( calendar.getTime(), DateHelper.ENGLISH_DATE_PATTERN ) + " " );
+        final JLabel jLabel = new JLabel( messagePublished + ' ' + DateHelper.formatDate( calendar.getTime(), DateHelper.ENGLISH_DATE_PATTERN ) + " " );
+        final Font police = new Font( "Arial", Font.BOLD, FONT_SIZE );
+        jLabel.setFont( police );
         jPaneBottom.add( jLabel, BorderLayout.EAST );
 
@@ -154 +189 @@
         {
             final String messageDataNumber = bundle.getString( "plot.dataNumber" );
-            final JLabel jLabelDataNumber = new JLabel( messageDataNumber + " " + dataNumber );
+            final JLabel jLabelDataNumber = new JLabel( messageDataNumber + ' ' + dataNumber );
+            jLabelDataNumber.setFont( police );
             jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST );
         }
@@ -161 +197 @@
     }
 
-    // TODO : move this function in a more generally class
-    private ResourceBundle getBundle( @Nullable final Locale locale )
-    {
-        if( null != locale )
-            return ResourceBundle.getBundle( "ApplicationResources", locale );
+    /**
+     * Create an error JPane when plot can be created
+     *
+     * @param mainError
+     * @param errorText
+     * @param locale
+     * @return
+     */
+    @NotNull
+    public BufferedImage createErrorPane( @NotNull final String mainError, @NotNull final String errorText, @Nullable final Locale locale )
+    {
+        // Image
+        final ImageIcon errorImage = new ImageIcon( MegapoliInitialisation.pathImages + "/erreur.gif" );
+        final JLabel jLabelErrorImage = new JLabel( errorImage );
+
+        // Text
+        final ResourceBundle bundle = WebHelper.getBundle( locale );
+        final String mainMessage = bundle.getString( "plot.errorMessage" );
+        final JLabel jLabelError = new JLabel( "<html>" + mainMessage + "<br><br>" + mainError + "<br>" + errorText + "</html>", JLabel.CENTER );
+        final Font police = new Font( "Arial", Font.BOLD, ERROR_FONT_SIZE );
+        jLabelError.setFont( police );
+
+        // jPane
+        final JPane jPane = new JPane( "jPane", new Dimension( MAIN_WIDTH, errorImage.getIconHeight() ) );
+        jPane.setLayout( new BorderLayout() );
+        jPane.setBackground( Color.white );
+        jPane.setOpaque( true );
+        jPane.add( jLabelErrorImage, BorderLayout.WEST );
+        jPane.add( jLabelError, BorderLayout.CENTER );
+
+        final JPanelToImageManager jPanelToImageManager = new JPanelToImageManager( jPane );
+        return jPanelToImageManager.saveAsImage();
+    }
+
+    @NotNull
+    private String formatTitle( @Nullable final String title )
+    {
+        if( null == title )
+            return "";
         else
-            return ResourceBundle.getBundle( "ApplicationResources" );
+        {
+            final String formatTitle = title.replaceAll( "\\n", "<br>" );
+            return "<html>" + formatTitle + "</html>";
+        }
     }
 
@@ -180 +253 @@
     private static final int MAIN_HEIGHT = 800;
 
-    private static final int FONT_SIZE = 20;
+    private static final int TITLE_FONT_SIZE = 20;
+    private static final int FONT_SIZE = 12;
+    private static final int ERROR_FONT_SIZE = 10;
 }

ether_megapoli/trunk/service/implementation/com/ether/JPanelToImageManager.java

@@ -10 +10 @@
 
 /**
+ * @Author : E.Mo..
  * This class convert a JPanel into a BufferedImage
  */
@@ -33 +34 @@
     private BufferedImage paintComponent( @NotNull final Component component )
     {
+        if( 0 >= component.getWidth() || 0 >= component.getHeight() )
+            return null;
+
         // Set it to it's preferred size. (optional)
         component.setSize( component.getPreferredSize() );

ether_megapoli/trunk/service/implementation/com/ether/MegapoliPlot.java

@@ -41 +41 @@
     }
 
-    @Nullable
+    @NotNull
     public String getLogoMegapoli()
     {
@@ -47 +47 @@
     }
 
-    public void setLogoMegapoli( @Nullable final String logoMegapoli )
+    public void setLogoMegapoli( @NotNull final String logoMegapoli )
     {
         _logoMegapoli = logoMegapoli;
     }
 
-    @Nullable
+    @NotNull
     public String getLogoEther()
     {
@@ -58 +58 @@
     }
 
-    public void setLogoEther( @Nullable final String logoEther )
+    public void setLogoEther( @NotNull final String logoEther )
     {
         _logoEther = logoEther;

ether_megapoli/trunk/service/interface/com/ether/EtherPlotService.java

@@ -17 +17 @@
 {
     @NotNull
-    public BufferedImage createJPane( @NotNull final MegapoliPlot megapoliPlot, @Nullable final Locale locale );
+    public BufferedImage createMainPane( @NotNull final MegapoliPlot megapoliPlot, @Nullable final Locale locale );
 
     @NotNull
@@ -28 +28 @@
     public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale );
 
+    @NotNull
+    public BufferedImage createErrorPane( @NotNull final String mainError, @NotNull final String errorText, @Nullable final Locale locale );
 }

ether_megapoli/trunk/service/test/com/ether/SGTTest.java

@@ -23 +23 @@
 import javax.imageio.ImageIO;
 import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.FileInputStream;
@@ -482 +480 @@
     }
 
-
-
     @ControllerMethod(jsonResult = true)
     public JSONObject searchDatasByPlateformByParameterByPeriod(
@@ -490 +486 @@
             @ParamName(ParameterConstants.PARAMETER_DATE_BEGIN) final String dateBegin,
             @ParamName(ParameterConstants.PARAMETER_DATE_END) final String dateEnd )
-            throws ServiceException, WebException, ParseException
+            throws ServiceException, EtherException, ParseException
     {
 //        final String pofBegin = "2009-07-13 13:00";
@@ -612 +608 @@
 //              @ParamName(ParameterConstants.PARAMETER_DATE_BEGIN) final String dateBegin,
 //              @ParamName(ParameterConstants.PARAMETER_DATE_END) final String dateEnd)
-//      throws ServiceException, WebException, ParseException
+//      throws ServiceException, EtherException, ParseException
 //    {
 //      final long time1 = Calendar.getInstance().getTimeInMillis();

ether_megapoli/trunk/web/resources/css/button.css

@@ -5 +5 @@
 /* BUTTONS */
 
-.buttons a, .buttons button {
+button {
     display:block;
     float:left;
@@ -21 +21 @@
     color:#565656;
     cursor:pointer;
-    padding:5px 10px 6px 7px; /* Links */
-}
-.buttons button{
+
     width:auto;
     overflow:visible;
     padding:4px 6px 3px 6px; /* IE6 */
 }
-.buttons button[type]{
+
+button[type]{
     padding:5px 10px 5px 7px; /* Firefox */
     line-height:17px; /* Safari */
 }
+
 *:first-child+html button[type]{
     padding:4px 10px 3px 7px; /* IE7 */
 }
-.buttons button img, .buttons a img{
+
+.small{
+    font-size:80%;
+}
+
+button img{
     margin:0 3px -3px 0 !important;
     padding:0;
@@ -45 +50 @@
 
 /* STANDARD */
-
-button:hover, .buttons a:hover{
+button:hover{
     background-color:#dff4ff;
     border:1px solid #c2e1ef;
     color:#336699;
 }
-.buttons a:active{
-    background-color:#6299c5;
-    border:1px solid #6299c5;
-    color:#fff;
-}
 
 /* POSITIVE */
-
-button.positive, .buttons a.positive{
+button.positive{
     color:#529214;
 }
-.buttons a.positive:hover, button.positive:hover{
+button.positive:hover{
     background-color:#E6EFC2;
     border:1px solid #C6D880;
     color:#529214;
 }
-.buttons a.positive:active{
-    background-color:#529214;
-    border:1px solid #529214;
-    color:#fff;
-}
 
 /* NEGATIVE */
-
-.buttons a.negative, button.negative{
+button.negative{
     color:#d12f19;
 }
-.buttons a.negative:hover, button.negative:hover{
+button.negative:hover{
     background:#fbe3e4;
     border:1px solid #fbc2c4;
     color:#d12f19;
 }
-.buttons a.negative:active{
-    background-color:#d12f19;
-    border:1px solid #d12f19;
-    color:#fff;
-}
 
 /* DISABLE */
-
-.buttons a.disable, .buttons a.disable:hover, .buttons button.disable, .buttons button.disable:hover
-{
+button.disable, button.disable:hover{
     background-color:#CCCCCC;
     border:1px solid #dedede;
     color:#565656;
 }
-

ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css

@@ -1 +1 @@
 /* ****************** CONTAINERS ************************* */
-#containerPlateforms, #containerParameters, #containerCalendar
-{
-        margin-top: 10px;
+#containerPlateforms, #containerParameters, #containerCalendar {
+    margin-top: 10px;
 }
 
-.containerPlateform, .containerParameter
-{
-        color: #6178BC;
+.containerPlateform, .containerParameter {
+    color: #6178BC;
 }
 
-.containerPlateform:hover, .containerParameter:hover
-{
-        text-decoration: underline;
-        background: #70739C;
-        color: #FFFFFF;
+.containerPlateform:hover, .containerParameter:hover {
+    text-decoration: none;
+    background: #70739C;
+    color: #FFFFFF;
+}
+
+#containerOptionTitle {
+    margin-top: 25px;
+    margin-bottom: 25px;
+}
+
+#containerButtons {
+    margin-top: 25px;
 }
 
 /* ****************** LOADINGS ************************* */
-#loadingForPlateforms, #loadingForParameters
-{
+#loadingForPlateforms, #loadingForParameters {
     position: relative;
     top: 102px;
@@ -25 +30 @@
 }
 
+.loadingPlot {
+    margin: auto;
+    height: 15px;
+    width: 128px;
+    margin-top: 50px;
+}
+
 /* ****************** OTHERS ************************* */
-#NoPlateform, #NoParameter
-{
+#NoPlateform, #NoParameter {
     position: relative;
     top: 100px;
     left: 65px;
-        color: #04155D;
+    color: #04155D;
 }
 
 .plateform_selected, .plateform_selected:hover,
-.parameter_selected, .parameter_selected:hover
-{
-        background: #70739C;
-        color: #E1DEF1;
-        text-decoration: none;
+.parameter_selected, .parameter_selected:hover {
+    background: #70739C;
+    color: #E1DEF1;
+    text-decoration: none;
 }
 
-.errorAndButtons{
-#       margin: 0px 22px;
-        margin-left: auto;
+.errorAndButtons {
+    /*margin: 0px 22px;*/
+    margin-left: auto;
     margin-right: auto;
     max-width: 240px;
@@ -50 +60 @@
 
 #copyright {
-        margin-left:-80em;
+    margin-left: -80em;
 }
+
+.messagesHeight {
+    margin-bottom: 5px;
+}
+
 /** ************************************ **/
 /** ************ CALENDAR ************** **/
 /** ************************************ **/
-.embeddedCalendar
-{
-        margin-top: 10px;
-        margin-bottom: 10px;
-        max-width: 240px;
+/*.embeddedCalendar*/
+/*{*/
+/*margin-top: 10px;*/
+/*margin-bottom: 10px;*/
+/*max-width: 240px;*/
+/*}*/
+
+#beginDate, #endDate {
+    background-image: url("../../resources/icons/calendrier-icone-16x16.png");
+    background-position: right center;
+    background-repeat: no-repeat;
 }
 
-div.leftField{
-        float: left;
-        margin-left: 53px;
+div.leftField {
+    float: left;
 }
 
-div.rightField{
-        float: right;
-        margin-right: 53px;
+div.rightField {
+    float: right;
+    margin-right: 53px;
 }
 

ether_megapoli/trunk/web/resources/js/etherClasses.js

@@ -2 +2 @@
 /* ****************** LIST ************************* */
 /* ************************************************* */
-var ListItem = Class.create({
+var ListItem = Class.create( {
 
     initialize: function( plateforms, objectParameter )
     {
         this.array = $A();
-        $A(plateforms).each(function( jsonObject )
+        $A( plateforms ).each( function( jsonObject )
         {
-            this.addItem(jsonObject, objectParameter);
-        }.bind(this));
+            this.addItem( jsonObject, objectParameter );
+        }.bind( this ) );
     },
 
@@ -19 +19 @@
         var objectItemNew = new Object();
         objectItemNew.jsonElement = jsonElement;
-        objectItemNew.divItem = this.createItemDiv(objectItemNew.jsonElement, objectParameter);
+        objectItemNew.divItem = this.createItemDiv( objectItemNew.jsonElement, objectParameter );
 
-        this.array.push(objectItemNew);
+        this.array.push( objectItemNew );
     },
 
     createItemDiv: function( itemHash, objectParameter )
     {
-        return new Plateform(itemHash, objectParameter);
+        return new Plateform( itemHash, objectParameter );
     },
 
     addOpenListener : function( func )
     {
-        this.array.each(function( objectItem )
+        this.array.each( function( objectItem )
         {
-            objectItem.divItem.addOpenListener(func);
-        });
+            objectItem.divItem.addOpenListener( func );
+        } );
     },
 
@@ -41 +41 @@
         if( 0 >= this.array.size() )
         {
-            var divNoItem = $(document.createElement("div"));
+            var divNoItem = $( document.createElement( "div" ) );
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild(divNoItem);
+            parentNode.appendChild( divNoItem );
         }
         else
-            this.array.each(function( item )
+            this.array.each( function( item )
             {
-                item.divItem.display(parentNode);
-            });
+                item.divItem.display( parentNode );
+            } );
     },
 
     displayWithPairImpair : function( parentNode, idIfNoItem, textIfNoItem )
     {
-        Dom.clearContainer(parentNode);
+        Dom.clearContainer( parentNode );
         if( 0 >= this.array.size() )
         {
-            var divNoItem = $(document.createElement("div"));
+            var divNoItem = $( document.createElement( "div" ) );
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild(divNoItem);
+            parentNode.appendChild( divNoItem );
         }
         else
         {
-                var rowNumber = 0;
-            this.array.each(function( item )
+            var rowNumber = 0;
+            this.array.each( function( item )
             {
-                if(rowNumber % 2 == 0)
-                    item.divItem.display(parentNode,"pair");
-                else
-                    item.divItem.display(parentNode,"impair");
-                rowNumber++;
-            });
+                if( rowNumber % 2 == 0 )
+                    item.divItem.display( parentNode, "pair" );
+                else
+                    item.divItem.display( parentNode, "impair" );
+                rowNumber++;
+            } );
         }
     },
@@ -80 +80 @@
     {
         var returnObj = false;
-        this.array.each(function( objItem )
+        this.array.each( function( objItem )
         {
             if( objItem.jsonElement.id == itemId )
                 returnObj = objItem;
-        }.bind(this));
+        }.bind( this ) );
 
         return returnObj;
     }
 
-});
+} );
 
 /* ************************************************* */
 /* ****************** ITEM ************************* */
 /* ************************************************* */
-var Item = Class.create({
+var Item = Class.create( {
 
     initialize: function( jsonElement, objectParameter )
     {
-        this.jsonElement = Object.clone(jsonElement); // Warning: This is only a shallow copy
+        this.jsonElement = Object.clone( jsonElement ); // Warning: This is only a shallow copy
         this.listeners = $A();
 
@@ -124 +124 @@
     createContainer: function ( containerName, classNameValue )
     {
-        this.divContainer = $(document.createElement("div"));
+        this.divContainer = $( document.createElement( "div" ) );
         this.divContainer.item = this;
-        if(classNameValue)
-        this.divContainer.className = classNameValue;
+        if( classNameValue )
+            this.divContainer.className = classNameValue;
         this.divContainer.id = containerName + "_" + this.jsonElement.id;
     },
@@ -134 +134 @@
     {
         this.parentNode = parentNode;
-        parentNode.appendChild(this.divContainer);
+        parentNode.appendChild( this.divContainer );
     },
 
@@ -146 +146 @@
     {
         if( classNameValue )
-            this.divContainer.addClassName(classNameValue);
+            this.divContainer.addClassName( classNameValue );
     },
 
@@ -152 +152 @@
     {
         if( classNameValue )
-            this.divContainer.removeClassName(classNameValue);
+            this.divContainer.removeClassName( classNameValue );
     },
 
     executeListenersFunction: function()
     {
-        this.listeners.each(function ( func )
+        this.listeners.each( function ( func )
         {
-            func(this);
-        }.bind(this));
+            func( this );
+        }.bind( this ) );
     },
 
@@ -166 +166 @@
     {
         if( this.divContainer )
-            Event.observe(this.divContainer, 'click', this.onClickContainer.bindAsEventListener(this));
+            Event.observe( this.divContainer, 'click', this.onClickContainer.bindAsEventListener( this ) );
     },
 
     addOpenListener: function( func )
     {
-        this.listeners.push(func);
+        this.listeners.push( func );
     },
 
@@ -179 +179 @@
             return;
 
-        this.divName = $(document.createElement("div"));
+        this.divName = $( document.createElement( "div" ) );
         this.divName.className = classNameValue;
         this.divName.innerHTML = this.jsonElement.name;
 
-        this.divContainer.appendChild(this.divName);
+        this.divContainer.appendChild( this.divName );
+    },
+
+    getName: function ()
+    {
+        return this.jsonElement.name;
     }
-});
+
+} );

ether_megapoli/trunk/web/resources/jsp/etherHead.jsp

@@ -1 +1 @@
 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %>
 
-<ether:htmlJs jsFile="library/prototype/prototype"/>
+<ether:htmlJs jsFile="library/prototype"/>
 <ether:htmlJs jsFile="Request"/>
 <ether:htmlJs jsFile="DomHelper"/>

ether_megapoli/trunk/web/resources/templates/template.jsp

@@ -18 +18 @@
         <link rel="shortcut icon" href="<html:rewrite page='/resources/images/megapoli/favicon.ico'/>">
         <script src="<html:rewrite page='/resources/js/maj.js'/>"></script>
-        <script src="<html:rewrite page='/resources/js/ajax.js'/>"></script>
+        <script src="<html:rewrite page='/resources/js/medias/ajax.js'/>"></script>
         <script type="text/javascript">
         <!--

ether_megapoli/trunk/web/src/ApplicationResources.properties

@@ -408 +408 @@
 data.visualization.noParameter=Pas de param\u00E8tre
 data.visualization.selectParameter=Param\u00E8tres
-data.visualization.selectTime=P\u00E9riode
+data.visualization.selectPeriod=P\u00E9riode
 data.visualization.selectDate=Choisissez une date
+data.visualization.selectYear=Ann\u00E9e
+data.visualization.selectMonth=Mois
+data.visualization.selectDay=Jour
+data.visualization.selectTime=Choisissez un temps
+data.visualization.selectHour=Heure
+data.visualization.selectMinute=Minute
 data.visualization.BeginDate=Date de d\u00E9but :
 data.visualization.EndDate=Date de fin :
 data.visualization.Unvalid_Period=P\u00E9riode non valide !
+data.visualization.titleChoice=Title
+data.visualization.axe=Axes
+data.visualization.button.clear=Effacer
 data.visualization.button.visualize=Visualisation
 data.visualization.button.download=T\u00E9l\u00E9chargement
@@ -419 +428 @@
 data.visualization.quicklook=Quicklook
 
+data.visualization.axeType.Time=S\u00E9rie temporelle
+data.visualization.axeType.Latitude=Latitude / Longitude
+
 simulation.visualization=Visualisation des simulations
 
@@ -424 +436 @@
 plot.published=Publi\u00E9 le
 plot.dataNumber=Nombre de donn\u00E9es extraites :
+plot.errorMessage=Erreur de cr\u00E9ation du quicklook. <BR>Veuillez essayer de corriger les erreurs suivantes ou contacter l'administrateur en indiquant les erreurs rencontr\u00E9es.
+plot.noData=Aucune donn\u00E9e extraite

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -395 +395 @@
 data.visualization.noParameter=No parameter
 data.visualization.selectParameter=Parameters
-data.visualization.selectTime=Period
+data.visualization.selectPeriod=Period
 data.visualization.selectDate=Select a date
-data.visualization.BeginDate=Start date : 
+data.visualization.selectYear=Year
+data.visualization.selectMonth=Month
+data.visualization.selectDay=Day
+data.visualization.selectTime=Select a time
+data.visualization.selectHour=Hour
+data.visualization.selectMinute=Minute
+data.visualization.BeginDate=Start date :
 data.visualization.EndDate=End date :
-data.visualization.Unvalid_Period=Unvalid periode ! 
+data.visualization.Unvalid_Period=Unvalid periode !
+data.visualization.titleChoice=Titre
+data.visualization.axe=Axes
+data.visualization.button.clear=Clear
 data.visualization.button.visualize=Visualization
 data.visualization.button.download=Download
@@ -406 +415 @@
 data.visualization.quicklook=Quicklook
 
+data.visualization.axeType.Time=Time serie
+data.visualization.axeType.Latitude=Latitude / Longitude
+
 simulation.visualization=Simulations visualization
 
@@ -411 +423 @@
 plot.published=Published
 plot.dataNumber=Number of extracted datas :
+plot.errorMessage=Error creating the quicklook. <BR>Please try to correct the following errors or contact the administrator with the detected errors.
+plot.noData=No extracted data

ether_megapoli/trunk/web/src/com/ether/Controller.java

@@ -15 +15 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -28 +29 @@
     /** *********************************************************** **/
     /** *********************** VIEWS ***************************** **/
-    /** *********************************************************** **/
+    /**
+     * ********************************************************** *
+     */
     // Default view if methodName is unknown
     public ModelAndView home( final HttpServletRequest request, final HttpServletResponse response )
-            throws WebException
+            throws EtherException
     {
         return new ModelAndView( "index" );
@@ -48 +51 @@
     {
         final List<Plateforme> plateforms = _etherService.getAllPlateforms();
+//        final List<Plateforme> plateforms = new ArrayList<Plateforme>();
+//        final Plateforme pf = new Plateforme();
+//        pf.setPlateformeId( 1 );
+//        pf.setPlateformeNom( "LHVP" );
+//        plateforms.add( pf );
+//        final Plateforme pf2 = new Plateforme();
+//        pf2.setPlateformeId( 2 );
+//        pf2.setPlateformeNom( "SIRTA" );
+//        plateforms.add( pf2 );
 
         final Map<String, Object> model = new HashMap<String, Object>();
         model.put( "plateforms", getJsonHelper().toJSON( plateforms ) );
+        model.put( "axeTypes", getJSONAxeTypes() );
         return model;
     }
@@ -56 +69 @@
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
-    /** ********************************************************** **/
+    /**
+     * ********************************************************* *
+     */
     @ControllerMethod(jsonResult = true)
     public JSONObject searchParametersByPlateform( @Mandatory @ParamName(ParameterConstants.PARAMETER_ID) final Integer plateformId )
-            throws ServiceException, WebException
+            throws ServiceException, EtherException
     {
         final List<Parametre> parametersByPlateform = _etherService.getParametersByPlateformId( plateformId );
+//        final List<Parametre> parametersByPlateform = new ArrayList<Parametre>( 2 );
+//        final Parametre p1 = new Parametre();
+//        p1.setParametreId( 1 );
+//        p1.setParametreNom( "JNO2" );
+//        parametersByPlateform.add( p1 );
+//        final Parametre p2 = new Parametre();
+//        p2.setParametreId( 2 );
+//        p2.setParametreNom( "CO2" );
+//        parametersByPlateform.add( p2 );
 
         final JSONObject result = new JSONObject();
         result.put( ParameterConstants.PARAMETER_PARAMETERS, getJsonHelper().toJSON( parametersByPlateform ) );
         return result;
+    }
+
+    @ControllerMethod(jsonResult = true)
+    private List<JSONObject> getJSONAxeTypes()
+    {
+        final AxeType[] axeTypes = AxeType.values();
+
+        final List<JSONObject> jsonAxeTypes = new ArrayList<JSONObject>( axeTypes.length );
+
+        for( final AxeType axeType : axeTypes )
+        {
+            final JSONObject jsonAxeType = new JSONObject();
+            jsonAxeType.put( "text", axeType.name() );
+            jsonAxeType.put( "value", axeType.name() );
+            jsonAxeTypes.add( jsonAxeType );
+        }
+        return jsonAxeTypes;
     }
 

ether_megapoli/trunk/web/src/com/ether/ControllerEther.java

@@ -1 +1 @@
 package com.ether;
 
+import com.ether.annotation.ControllerMethod;
+import com.ether.annotation.Mandatory;
+import com.ether.annotation.ParamName;
+import com.ether.annotation.UseJSON;
+import net.sf.json.JSON;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONNull;
+import net.sf.json.JSONObject;
+import net.sf.json.util.JSONUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.springframework.beans.factory.annotation.Required;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.AbstractController;
+import org.springframework.web.servlet.mvc.multiaction.MethodNameResolver;
+import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
@@ -12 +33 @@
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.json.JSON;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONNull;
-import net.sf.json.JSONObject;
-import net.sf.json.util.JSONUtils;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.springframework.beans.factory.annotation.Required;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.AbstractController;
-import org.springframework.web.servlet.mvc.multiaction.MethodNameResolver;
-import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException;
-
-import com.ether.annotation.ControllerMethod;
-import com.ether.annotation.Mandatory;
-import com.ether.annotation.ParamName;
-import com.ether.annotation.UseJSON;
-
-public class ControllerEther extends AbstractController
+public class ControllerEther
+        extends AbstractController
 {
-        @Override
-        @Nullable
-        protected ModelAndView handleRequestInternal(@NotNull final HttpServletRequest request, @NotNull final HttpServletResponse response)
-                throws WebException
-        {
-                try {
-                        if (!_initialized)
-                                initialize();
-
-                        request.setCharacterEncoding(UTF8Charset.getEncoding());
-                        
-                        // Get method to call
-                        final String methodName = _methodNameResolver.getHandlerMethodName(request);
-
-                        final MethodDescription methodDescription = _methods.get(methodName);
-                        if (null == methodDescription) {
-                                WebHelper.displayAjaxError(response, methodName);
-                                if (LOGGER.isWarnEnabled())
-                                        LOGGER.warn(String.format("Controller=%1$s Method=%2$s METHOD NOT FOUND", getClass().getSimpleName(), methodName));
-                                return null;
-                        }
-
-                        return invokeMethod(methodDescription, request, response);
-
-                } catch (UnsupportedEncodingException e) {
-                        throw new WebException(WebException.WebCode.ERROR_UNSUPPORTED_UTF8_ENCODING, e);
-                } catch (NoSuchRequestHandlingMethodException e) {
-                        throw new WebException(WebException.WebCode.ERROR_NO_REQUEST_HANDLING_METHOD, e);
-                }
-        }
-
-        @Nullable
-        private ModelAndView invokeMethod( @NotNull final MethodDescription methodDescription, @NotNull final HttpServletRequest request, @NotNull final HttpServletResponse response)
-                throws WebException 
-        {
-                try {
-                        // Parse parameters
-                        final Object[] params = buildParams(methodDescription, request);
-
-                        // Invoke method (go to controller)
-                        final Object result = methodDescription.getMethod().invoke(this, params);
-                        
-                        // Return result
-                        if (!methodDescription.getView().isEmpty()) {
-                                response.setStatus(HttpServletResponse.SC_OK);
-                                if (result instanceof Map)
-                                        return new ModelAndView(methodDescription.getView(), (Map) result);
-                                else
-                                        return new ModelAndView(methodDescription.getView(), "result", result);
-                                
-                        } else if (methodDescription.isJsonResult()) {
-                                response.setStatus(HttpServletResponse.SC_OK);
-                                final String jsonResult = convertToJson(result);
-                                WebHelper.writeJsonToResponse(response, jsonResult);                            
-                                return null;
-                        } else {
-                                response.setStatus(HttpServletResponse.SC_NO_CONTENT);
-                                return null;
-                        }
-                        
-                } catch (Throwable e) {
-                        throw new WebException(e);
-                }
-        }       
-        
-        @NotNull
-        private String convertToJson( @Nullable final Object object )
-    {
-        if( null == object)
+    @Override
+    @Nullable
+    protected ModelAndView handleRequestInternal( @NotNull final HttpServletRequest request, @NotNull final HttpServletResponse response )
+            throws WebException, EtherException
+    {
+        try
+        {
+            if( !_initialized )
+                initialize();
+
+            request.setCharacterEncoding( UTF8Charset.getEncoding() );
+
+            // Get method to call
+            final String methodName = _methodNameResolver.getHandlerMethodName( request );
+
+            final MethodDescription methodDescription = _methods.get( methodName );
+            if( null == methodDescription )
+            {
+                WebHelper.displayAjaxError( response, methodName );
+                if( LOGGER.isWarnEnabled() )
+                    LOGGER.warn( String.format( "Controller=%1$s Method=%2$s METHOD NOT FOUND", getClass().getSimpleName(), methodName ) );
+                return null;
+            }
+
+            return invokeMethod( methodDescription, request, response );
+
+        }
+        catch( UnsupportedEncodingException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_UNSUPPORTED_UTF8_ENCODING, e );
+        }
+        catch( NoSuchRequestHandlingMethodException e )
+        {
+            throw new WebException( WebException.WebCode.ERROR_NO_REQUEST_HANDLING_METHOD, e );
+        }
+    }
+
+    @Nullable
+    private ModelAndView invokeMethod( @NotNull final MethodDescription methodDescription, @NotNull final HttpServletRequest request, @NotNull final HttpServletResponse response )
+            throws WebException
+    {
+        try
+        {
+            // Parse parameters
+            final Object[] params = buildParams( methodDescription, request );
+
+            // Invoke method (go to controller)
+            final Object result = methodDescription.getMethod().invoke( this, params );
+
+            // Return result
+            if( !methodDescription.getView().isEmpty() )
+            {
+                response.setStatus( HttpServletResponse.SC_OK );
+                if( result instanceof Map )
+                    return new ModelAndView( methodDescription.getView(), (Map) result );
+                else
+                    return new ModelAndView( methodDescription.getView(), "result", result );
+
+            }
+            else if( methodDescription.isJsonResult() )
+            {
+                response.setStatus( HttpServletResponse.SC_OK );
+                final String jsonResult = convertToJson( result );
+                WebHelper.writeJsonToResponse( response, jsonResult );
+                return null;
+            }
+            else
+            {
+                response.setStatus( HttpServletResponse.SC_NO_CONTENT );
+                return null;
+            }
+
+        }
+        catch( Throwable e )
+        {
+            throw new WebException( e );
+        }
+    }
+
+    @NotNull
+    private String convertToJson( @Nullable final Object object )
+    {
+        if( null == object )
             return JSONNull.getInstance().toString();
         if( object instanceof JSON )
@@ -119 +131 @@
     }
 
-        @NotNull
-        private Object[] buildParams(@NotNull final MethodDescription methodDescription, @NotNull final HttpServletRequest request) 
-                throws InvalidParameterException 
-        {
-                final List<Object> params = new ArrayList<Object>();
-                for (final ParamDescription paramDescription : methodDescription.getParams()) {
-                        if (null == paramDescription) {
-                                params.add(null);
-                                continue;
-                        }
-                        final boolean canBeNull = !paramDescription.isPrimitive() && !paramDescription.isMandatory();
-                        final String paramValue = WebHelper.getRequestParameter(request, paramDescription.getName(), null, canBeNull);
-                        final boolean useJSON = paramDescription.isUsingJSON();
-                        params.add(convertParameter(paramDescription.getType(), paramValue, useJSON));
-                }
-                return params.toArray(new Object[params.size()]);
-        }
-        
-        @Nullable
-        private Object convertParameter( @NotNull final Class paramType, @Nullable final String paramValue, final boolean useJSON )
+    @NotNull
+    private Object[] buildParams( @NotNull final MethodDescription methodDescription, @NotNull final HttpServletRequest request )
+            throws InvalidParameterException
+    {
+        final List<Object> params = new ArrayList<Object>();
+        for( final ParamDescription paramDescription : methodDescription.getParams() )
+        {
+            if( null == paramDescription )
+            {
+                params.add( null );
+                continue;
+            }
+            final boolean canBeNull = !paramDescription.isPrimitive() && !paramDescription.isMandatory();
+            final String paramValue = WebHelper.getRequestParameter( request, paramDescription.getName(), null, canBeNull );
+            final boolean useJSON = paramDescription.isUsingJSON();
+            params.add( convertParameter( paramDescription.getType(), paramValue, useJSON ) );
+        }
+        return params.toArray( new Object[params.size()] );
+    }
+
+    @Nullable
+    private Object convertParameter( @NotNull final Class paramType, @Nullable final String paramValue, final boolean useJSON )
     {
         if( null == paramValue )
@@ -148 +162 @@
         if( JSONArray.class.equals( paramType ) )
             return _jsonHelper.toJSON( paramValue );
-        if( String.class .equals( paramType ) )
+        if( String.class.equals( paramType ) )
             return paramValue;
         if( Boolean.TYPE.equals( paramType ) || Boolean.class.equals( paramType ) )
@@ -170 +184 @@
     }
 
-    private void initialize() 
-        throws WebException
+    private void initialize()
+            throws WebException
     {
         for( final Method method : getClass().getMethods() )
@@ -178 +192 @@
             if( null != annotation )
             {
-                final MethodDescription methodDescription = new MethodDescription( method, annotation );
-                fillMethodDescription( method, methodDescription );
-                _methods.put( method.getName(), methodDescription );
+                final MethodDescription methodDescription = new MethodDescription( method, annotation );
+                fillMethodDescription( method, methodDescription );
+                _methods.put( method.getName(), methodDescription );
             }
         }
@@ -187 +201 @@
     }
 
-    private void fillMethodDescription( @NotNull final Method method, @NotNull final MethodDescription methodDescription ) 
-        throws WebException
+    private void fillMethodDescription( @NotNull final Method method, @NotNull final MethodDescription methodDescription )
+            throws WebException
     {
         final Class<?>[] paramTypes = method.getParameterTypes();
         final Annotation[][] paramAnnotations = method.getParameterAnnotations();
 
-        if(paramTypes.length != paramAnnotations.length)
-                throw new WebException(WebException.WebCode.ERROR_NUMBER_OF_PARAM_TYPES_NOT_EQUAL_TO_PARAM_ANNOTATIONS, paramTypes.length+" "+paramAnnotations.length);
-         
+        if( paramTypes.length != paramAnnotations.length )
+            throw new WebException( WebException.WebCode.ERROR_NUMBER_OF_PARAM_TYPES_NOT_EQUAL_TO_PARAM_ANNOTATIONS, paramTypes.length + " " + paramAnnotations.length );
+
         for( int i = 0; i < paramTypes.length; ++i )
         {
@@ -219 +233 @@
             }
         }
-    }    
-
-    
+    }
+
+
     @Required
     public void setMethodNameResolver( final MethodNameResolver methodNameResolver )
@@ -236 +250 @@
     public void setJsonHelper( final JSONHelper jsonHelper )
     {
-        _jsonHelper = jsonHelper;
+        _jsonHelper = jsonHelper;
     }
 
@@ -245 +259 @@
 
     private static final Log LOGGER = LogFactory.getLog( ControllerEther.class );
-   
+
     private JSONHelper _jsonHelper;
     private MethodNameResolver _methodNameResolver;

ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java

@@ -8 +8 @@
 import org.apache.commons.logging.LogFactory;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -19 +20 @@
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -57 +59 @@
             throws ServletException
     {
+        boolean flagException = false;
+
         try
         {
+            //Parameters
             final Integer plateformId = Integer.valueOf( request.getParameter( "plateformId" ) );
             final Integer parameterId = Integer.valueOf( request.getParameter( "parameterId" ) );
+            final String title = request.getParameter( "title" );
+            final String axeType = request.getParameter( "axeType" );
+
             final String dateBegin = request.getParameter( "dateBegin" );
             final String dateEnd = request.getParameter( "dateEnd" );
-            final String pofBegin = "2009-07-13 13:00";
-            final String pofEnd = "2009-07-14 14:00";
-            final Date formatedDateBegin = DateHelper.parseDate( pofBegin, DateHelper.ENGLISH_DATE_PATTERN );
-            final Date formatedDateEnd = DateHelper.parseDate( pofEnd, DateHelper.ENGLISH_DATE_PATTERN );
+            final Calendar calendar = Calendar.getInstance();
+            final Date formatedDateBegin;
+            final Date formatedDateEnd;
+            try
+            {
+                calendar.setTimeInMillis( Long.valueOf( dateBegin ) );
+                formatedDateBegin = calendar.getTime();
+                calendar.setTimeInMillis( Long.valueOf( dateEnd ) );
+                formatedDateEnd = calendar.getTime();
+            }
+            catch( Exception e )
+            {
+                createErrorPane( response, request, WebException.WebCode.INVALID_DATE.toString(), e );
+                flagException = true;
+                throw new ServletException( WebException.WebCode.INVALID_DATE.toString(), e );
+            }
 
+            // Create plot
             //** ******************************************************************** **//
             // TODO : replace List<Data> by List<value> and List<double>
             //** ******************************************************************** **//
-            final List<Pair<Double, Date>> values = _etherService.getValuesByPlateformByParameterByPeriod( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+//            final List<Pair<Double, Date>> values = _etherService.getValuesByPlateformByParameterByPeriod( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+            final List<Pair<Double, Date>> values = new ArrayList<Pair<Double, Date>>();
+            final Pair<Double, Date> p1 = new Pair<Double, Date>( Double.valueOf( 23 ), new Date() );
+            final Pair<Double, Date> p2 = new Pair<Double, Date>( Double.valueOf( 24 ), new Date() );
+            final Pair<Double, Date> p3 = new Pair<Double, Date>( Double.valueOf( 25 ), new Date() );
+            final Pair<Double, Date> p4 = new Pair<Double, Date>( Double.valueOf( 26 ), new Date() );
+            values.add( p1 );
+            values.add( p2 );
+            values.add( p3 );
+            values.add( p4 );
             final double[] dataArray = extractDoubles( values );
             final Date[] dateValues = extractDates( values );
@@ -88 +118 @@
 
             final MegapoliPlot megapoliPlot = new MegapoliPlot();
-            megapoliPlot.setTitle( "Mobilis LIDAR" );
+            megapoliPlot.setTitle( title );
             megapoliPlot.setData( data );
 
-            final BufferedImage bufferedImage = _etherPlotService.createJPane( megapoliPlot, Context.getLocale( request ) );
-
+            final BufferedImage bufferedImage = _etherPlotService.createMainPane( megapoliPlot, Context.getLocale( request ) );
             ImageIO.write( bufferedImage, "png", response.getOutputStream() );
         }
-        catch( IOException e )
+        catch( Exception e1 )
         {
-            throw new ServletException( "Error : no possibity to write image in response", e );
+            try
+            {
+                if( !flagException )
+                    createErrorPane( response, request, "", e1 );
+            }
+            catch( Exception e2 )
+            {
+                throw new ServletException( "Error : no possibity to write image in response", e2 );
+            }
         }
-        catch( ServiceException e )
-        {
-            throw new ServletException( "Error : no possibility to extract data from base", e );
-        }
-        catch( ParseException e )
-        {
-            throw new ServletException( "Error : invalid dates, no parsing available", e );
-        }
+    }
+
+    private void createErrorPane( final HttpServletResponse response, final HttpServletRequest request, @NotNull final String mainError, @NotNull final Exception e )
+            throws IOException
+    {
+        final BufferedImage errorImage = _etherPlotService.createErrorPane( mainError, e.toString(), Context.getLocale( request ) );
+        ImageIO.write( errorImage, "png", response.getOutputStream() );
     }
 
@@ -137 +173 @@
     private static final Log LOGGER = LogFactory.getLog( ControllerPlot.class );
 
-    // Dimensions of the jPanes
-    private static final int MAIN_WIDTH = 1000;
-    private static final int MAIN_HEIGHT = 1000;
-
     private EtherService _etherService;
     private EtherPlotService _etherPlotService;

ether_megapoli/trunk/web/src/com/ether/WebException.java

@@ -30 +30 @@
         public static enum WebCode implements Code 
     {
-                UNKNOWN, 
-                PERSISTENCE, 
-                SERVICE_PROBLEM,
-                PLATEFORME_ID_NOT_FOUND,
-                IO_EXCEPTION_ERROR_TO_GET_OUTPUTSTREAM,
                 ERROR_UNSUPPORTED_UTF8_ENCODING,
                 ERROR_NO_REQUEST_HANDLING_METHOD,
                 ERROR_NUMBER_OF_PARAM_TYPES_NOT_EQUAL_TO_PARAM_ANNOTATIONS,
+        INVALID_DATE,
     }
 }

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp

@@ -2 +2 @@
 var InterfaceVisualization = Class.create( {
 
-    initialize: function( jsonPlateforms )
+    initialize: function( jsonPlateforms, axeTypes )
     {
         // Values
@@ -9 +9 @@
         this.generalContainerPlateforms = $( "generalContainerPlateforms" );
         this.generalContainerParameters = $( "generalContainerParameters" );
-        this.generalContainerCalendar = $( "generalContainerCalendar" );
+        this.generalContainerOptions = $( "generalContainerOptions" );
         this.jsonPlateforms = jsonPlateforms || null;
+        this.jsonAxeTypes = axeTypes || null;
         this.selectedPlateform = false;
         this.selectedParameter = false;
         this.beginDate = false;
         this.endDate = false;
-        this.notice = Dom.getContainer( "notice" );
 
         /** *********** CONTAINERS *********** **/
-        // Create container for plateforms
-        this.containerPlateforms = Dom.getContainer( "containerPlateforms" );
-        this.containerParameters = Dom.getContainer( "containerParameters" );
-        this.containerButtons = Dom.getContainer( "containerButtons" );
+        this.containerPlateforms = $( "containerPlateforms" );
+        this.containerParameters = $( "containerParameters" );
+        this.containerButtons = $( "containerButtons" );
+        this.containerOptionCalendar = $( "containerOptionCalendar" );
+        this.containerOptionAxe = $( "containerOptionAxe" );
 
         /** *********** LOADING *********** **/
@@ -38 +39 @@
         this.loadingParameters.display();
 
-        /** *********** BUTTONS *********** **/
-        this.visualizeButton = new Button( {value:interfaceTexts["data.visualization.button.visualize"], parent:this.containerButtons, id:"button_visualize", onClick:this.onClickVisualize.bind( this )} );
-        this.visualizeButton.enable();
-        this.downloadButton = new Button( {value:interfaceTexts["data.visualization.button.download"], parent:this.containerButtons, id:"button_download", onClick:this.onClickDownload.bind( this )} );
-        this.downloadButton.disable();
-
-
         /** *********** WINDOW FOR THE PLOT *********** **/
         this.plotWindow = new Window( {className: "dialog", zIndex: 100,
@@ -51 +45 @@
         this.plotWindow.setTitle( interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"] );
 
-
-        this.createCalendar();
+        this.createOptions();
         this.displayPlateforms();
+    },
+
+    // CREATES ********************************************************
+    createOptions: function()
+    {
+        // Calendar
+        this.calendarFormat = "%Y-%m-%d %H:%i";
+        this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } );
+
+        AnyTime.picker( "beginDate", { format: this.calendarFormat, firstDOW: 1,
+            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
+            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
+            methodToCall: this.onClickBeginDate.bindAsEventListener( this )
+        } );
+
+        AnyTime.picker( "endDate", { format: this.calendarFormat, firstDOW: 1,
+            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
+            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
+            idToUpdateEarliest: "beginDate"
+        } );
+
+        this.clearButton = new Button( {value:interfaceTexts["data.visualization.button.clear"], parent:this.containerOptionCalendar, id:"button_clear", className:"small", onClick:this.onClickClear.bind( this )} );
+
+        // Buttons and axe's types
+        this.createButtons();
+        this.createListAxes();
+    },
+
+    createButtons: function()
+    {
+        this.visualizeButton = new Button( {value:interfaceTexts["data.visualization.button.visualize"], parent:this.containerButtons, id:"button_visualize", onClick:this.onClickVisualize.bind( this )} );
+//        this.visualizeButton.disable();
+        this.downloadButton = new Button( {value:interfaceTexts["data.visualization.button.download"], parent:this.containerButtons, id:"button_download", onClick:this.onClickDownload.bind( this )} );
+        this.downloadButton.disable();
+    },
+
+    createListAxes: function()
+    {
+        var paramSelect = new Object();
+        paramSelect.id = "select_axes";
+        paramSelect.parent = $( "containerOptionAxe" );
+        this.selectAxes = new Select( paramSelect );
+
+        this.jsonAxeTypes.each( function ( axeType )
+        {
+            this.selectAxes.add( axeType.value, interfaceTexts[axeType.text] );
+        }.bind( this ) );
+
+        this.selectAxes.selectFirst( false );
     },
 
@@ -73 +115 @@
     },
 
-    handleValuesByPlateformByParameterByPeriod: function( result )
-    {
-//              this.notice.style.visibility = "hidden";        
-
-        this.jsonEncodedImage = result.responseText.evalJSON().encodedImage;
-
-
-    },
-
     // DISPLAYS ********************************************************
-    createCalendar: function()
-    {
-        // Embedded Calendar
-        this.calendar = Calendar.setup(
-        {
-            dateField: 'embeddedDateField',
-            endDateField: 'embeddedEndDateField',
-            parentElement: 'embeddedCalendar',
-            clickToDateField: true,
-            selectHandler: this.onClickCalendar.bind( this )
-        } )
-    },
-
     displayPlateforms: function()
     {
@@ -141 +161 @@
             this.selectedParameter = false;
 
+        $( "textareaTitle" ).value = this.selectedPlateform.getName();
         this.requestParametersByPlateform();
         this.testAllFields();
@@ -156 +177 @@
         this.selectedParameter = objParameter;
         this.selectedParameter.select();
+
+        $( "textareaTitle" ).value = this.selectedPlateform.getName() + " - " + this.selectedParameter.getName();
         this.testAllFields();
     },
 
-    onClickCalendar: function( calendar )
-    {
-        if( !calendar.dateField ) return false
-
-        if( calendar.clickToDateField )
-        {
-            Element.update( calendar.dateField, calendar.date.print( calendar.dateFormat ) )
-            this.beginDate = calendar.date.print( calendar.dateFormat );
-        }
-        else
-        {
-            Element.update( calendar.endDateField, calendar.date.print( calendar.dateFormat ) )
-            this.endDate = calendar.date.print( calendar.dateFormat );
-        }
-        calendar.setClickToDateField( !calendar.clickToDateField );
-        this.testCalendarPeriod( calendar.dateField.innerHTML, calendar.endDateField.innerHTML );
-
-        // Call the close handler, if necessary
-        if( calendar.shouldClose ) calendar.callCloseHandler()
+    onClickBeginDate: function()
+    {
+        var oneHour = 60 * 60 * 1000;
+        var beginDateTime = this.calendarConverter.parse( $( "beginDate" ).value ).getTime();
+        var endDateTime = null;
+        if( "" != $( "endDate" ).value )
+            endDateTime = this.calendarConverter.parse( $( "endDate" ).value ).getTime();
+        this.beginDateWithAnHourLater = new Date( beginDateTime + oneHour );
+
+        if( null == endDateTime || endDateTime < beginDateTime )
+            $( "endDate" ).value = this.calendarConverter.format( this.beginDateWithAnHourLater );
+
+        this.beginDate = this.calendarConverter.parse( $( "beginDate" ).value ).getTime();
+        this.endDate = this.calendarConverter.parse( $( "endDate" ).value ).getTime();
+
+        this.testAllFields();
+    },
+
+    onClickClear: function()
+    {
+        $( "beginDate" ).value = "";
+        this.beginDate = false;
+        $( "endDate" ).value = "";
+        this.endDate = false;
     },
 
     onClickVisualize: function()
     {
+//        this.plotWindow.getContent().innerHTML = '<div class="loadingPlot"><img src="/Megapoli/resources/icons/loading_datas.gif"/></div>';
+
 //        var url = "visualization/plotEther?plateformId=" + this.selectedPlateform.getId()
 //                + "&parameterId=" + this.selectedParameter.getId()
 //                + "&dateBegin=" + this.beginDate
-//                + "&dateEnd=" + this.endDate;
+//                + "&dateEnd=" + this.endDate
+//                + "&title=" + encodeURIComponent( $( "textareaTitle" ).value )
+//                + "&axeType=" + this.selectAxes.getValue();
+
         var url = "visualization/plotEther?plateformId=33"
                 + "&parameterId=10"
                 + "&dateBegin=" + this.beginDate
-                + "&dateEnd=" + this.endDate;
-
-        this.plotWindow.getContent().innerHTML = '<img src=' + url + '/>';
-        this.plotWindow.height = this.plotWindow.getContent().firstChild.height;
-        this.plotWindow.width = this.plotWindow.getContent().firstChild.width;
+                + "&dateEnd=" + this.endDate
+                + "&title=" + encodeURIComponent( $( "textareaTitle" ).value )
+                + "&axeType=" + this.selectAxes.getValue();
+
+        this.plotWindow.getContent().innerHTML = '<img src=' + url + ' />';
+//        this.plotWindow.setSize( this.plotWindow.getContent().firstChild.width, this.plotWindow.getContent().firstChild.height, true );
+        this.plotWindow.setSize( 800, 700 );
         this.plotWindow.show();
+//        this.plotWindow.height = this.plotWindow.getContent().firstChild.height;
+//        this.plotWindow.width = this.plotWindow.getContent().firstChild.width;
     },
 
@@ -206 +243 @@
 
     // OTHERS ********************************************************
+    // TODO : resize !!!
     resizeContainers: function()
     {
@@ -215 +253 @@
         var containerPlateforms = this.containerPlateforms.offsetHeight;
         var containerParameters = this.containerParameters.offsetHeight;
-        var containerCalendarHeight = this.generalContainerCalendar.offsetHeight;
-
-        var maxHeight = Math.max( containerPlateforms, containerParameters, containerCalendarHeight );
-
+        var containerOptionsHeight = this.generalContainerOptions.offsetHeight;
+
+        var maxHeight = Math.max( containerPlateforms, containerParameters, containerOptionsHeight );
 
         if( maxHeight > parentHeight )
@@ -225 +262 @@
             this.generalContainerPlateforms.style.height = maxHeight + 10 + "px";
             this.generalContainerParameters.style.height = maxHeight + 10 + "px";
-        } else if( maxHeight == containerCalendarHeight )
-        {
-            this.superParent.style.height = containerCalendarHeight + titleSize + 25 + "px";
-            this.generalContainerPlateforms.style.height = containerCalendarHeight + "px";
-            this.generalContainerParameters.style.height = containerCalendarHeight + "px";
+        } else if( maxHeight == containerOptionsHeight )
+        {
+//            this.superParent.style.height = containerOptionsHeight + titleSize + 25 + "px";
+            this.generalContainerPlateforms.style.height = containerOptionsHeight + "px";
+            this.generalContainerParameters.style.height = containerOptionsHeight + "px";
         }
     },
 
-    testCalendarPeriod: function( beginDate, endDate )
-    {
-        if( !beginDate || !endDate )
-            return false;
-
-        var matchFormat = /^(\d{4})-(\d{2})-(\d{2})$/i;
-        var testBeginDate = beginDate.match( matchFormat );
-        var testEndDate = endDate.match( matchFormat );
-        if( !testEndDate || !testEndDate )
+    testAllFields: function()
+    {
+        if( !this.selectedPlateform || !this.selectedParameter || !this.beginDate || !this.endDate )
+        {
+//            this.visualizeButton.disable();
+            this.downloadButton.disable();
             return;
-
-        this.resizeContainers();
-
-        var datesOk = beginDate <= endDate;
-        if( !datesOk )
-            this.displayNotice();
-        else
-            this.hideNotice();
-
-        if( !datesOk || !this.selectedPlateform || !this.selectedParameter )
-        {
-            this.visualizeButton.disable();
-            this.downloadButton.disable();
-            return false;
         }
-        else
-        {
-            this.visualizeButton.enable();
-            this.downloadButton.enable();
-            return true;
-        }
-    },
-
-    testAllFields: function()
-    {
-        return true;
-
-        if( !this.selectedPlateform || !this.selectedParameter || !this.beginDate || !this.endDate )
-        {
-            this.visualizeButton.disable();
-            this.downloadButton.disable();
-        }
-
-        return this.testCalendarPeriod( this.beginDate, this.endDate );
-    },
-
-    displayNotice: function()
-    {
-        this.notice.innerHTML = "&nbsp";
-        this.notice.removeClassName( "loading" );
-        this.notice.addClassName( "error" );
-        this.notice.innerHTML = interfaceTexts["data.visualization.Unvalid_Period"];
-        this.notice.style.visibility = "visible";
-    },
-
-    hideNotice: function()
-    {
-        this.notice.innerHTML = "&nbsp";
-        this.notice.style.visibility = "hidden";
-    },
-
-    displayLoading: function()
-    {
-        this.notice.innerHTML = "&nbsp";
-        this.notice.removeClassName( "error" );
-        this.notice.style.visibility = "visible";
-        this.notice.addClassName( "loading" );
-        var image = new Element( 'img', {src: 'resources/icons/loading_datas.gif'} );
-        this.notice.appendChild( image );
-    },
-
-    hideLoading: function()
-    {
-        this.notice.innerHTML = "&nbsp";
+
+        this.visualizeButton.enable();
+        this.downloadButton.enable();
     }
+
 } );
 

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf.jsp

@@ -1 +1 @@
 <!-- /*** ****************** VISU ******************** **/ -->
 <%@ page import="com.medias.Context" %>
+<%@ page import="com.ether.AxeType" %>
 
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
@@ -16 +17 @@
 
     <tiles:put name="insertCss" type="string">
-        <ether:htmlCss cssFile="calendarview-1.2/calendarview"/>
         <ether:htmlCss cssFile="visu_parameter_by_pf"/>
+        <ether:htmlCss cssFile="select"/>
+
+        <%-- Calendar --%>
+        <ether:htmlCss cssFile="calendar/anytime"/>
         <ether:htmlCss cssFile="windows_js_1.3/themes/default"/>
         <ether:htmlCss cssFile="windows_js_1.3/themes/mac_os_x"/>
+
+        <%-- Select --%>
+        <%--ether:htmlCss cssFile="customedSelect/css/customSelect" /--%>
     </tiles:put>
 
@@ -27 +34 @@
         <ether:htmlJsp jspFile="visu_parameter_by_pf-classes"/>
         <ether:htmlJs jsFile="Button"/>
-        <ether:htmlJs jsFile="calendarview-1.2/javascripts/calendarview"/>
+        <ether:htmlJs jsFile="Select"/>
 
-        <ether:htmlJs jsFile="library/windows_js_1.3/javascripts/debug"/>
-        <ether:htmlJs jsFile="library/windows_js_1.3/javascripts/effects"/>
-        <ether:htmlJs jsFile="library/windows_js_1.3/javascripts/window"/>
-        <ether:htmlJs jsFile="library/windows_js_1.3/javascripts/window_ext"/>
+        <ether:htmlJs jsFile="library/jquery-1.4.2.min"/>
+        <ether:htmlJs jsFile="library/prototype"/>
+
+        <%-- Calendar --%>
+        <ether:htmlJs jsFile="calendar/anytime"/>
+        <ether:htmlJs jsFile="windows_js_1.3/javascripts/debug"/>
+        <ether:htmlJs jsFile="windows_js_1.3/javascripts/effects"/>
+        <ether:htmlJs jsFile="windows_js_1.3/javascripts/window"/>
+        <ether:htmlJs jsFile="windows_js_1.3/javascripts/window_ext"/>
+
+        <%-- Select --%>
+        <%--ether:htmlJs jsFile="customedSelect/js/customSelect"/--%>
     </tiles:put>
 
@@ -59 +74 @@
             </div>
 
-            <div id="generalContainerCalendar" class="span-9 last">
-                <div id="messages"><bean:message key="data.visualization.selectTime"/></div>
-                <div id="embeddedCalendar" class="embeddedCalendar"></div>
+            <div id="generalContainerOptions" class="span-9 last">
+                <div id="containerOptionCalendar" class="span-9">
+                    <div id="messages" class="messagesHeight"><bean:message key="data.visualization.selectPeriod"/></div>
+                    <input type="text" id="beginDate" size="15"/>
+                    <input type="text" id="endDate" size="15"/>
+                </div>
 
-                <div class="dateField leftField"><bean:message key="data.visualization.BeginDate"/></div>
-                <div id="embeddedDateField" class="dateField rightField"><bean:message
-                        key="data.visualization.selectDate"/></div>
-                <div class="dateField leftField"><bean:message key="data.visualization.EndDate"/></div>
-                <div id="embeddedEndDateField" class="dateField rightField"><bean:message
-                        key="data.visualization.selectDate"/></div>
+                <div id="containerOptionTitle" class="span-8">
+                    <div id="messages" class="messagesHeight"><bean:message key="data.visualization.titleChoice"/></div>
+                    <textarea id="textareaTitle" cols="37" rows="2"></textarea>
+                </div>
+
+                <div id="containerOptionAxe" class="span-8">
+                    <div id="messages" class="messagesHeight"><bean:message key="data.visualization.axe"/></div>
+                </div>
 
                 <div class="errorAndButtons">
-                    <div id="notice" style="visibility:hidden" class="error span-6">&nbsp;</div>
-                    <div id="containerButtons" class="buttons span-7"></div>
+                    <div id="containerButtons" class="span-7"></div>
                 </div>
             </div>
@@ -87 +106 @@
             interfaceTexts["data.visualization.Unvalid_Period"] = "<bean:message key="data.visualization.Unvalid_Period"/>";
             interfaceTexts["data.visualization.quicklook"] = "<bean:message key="data.visualization.quicklook"/>";
+            interfaceTexts["data.visualization.titleChoice"] = "<bean:message key="data.visualization.titleChoice"/>";
+            interfaceTexts["data.visualization.axe"] = "<bean:message key="data.visualization.axe"/>";
+            interfaceTexts["data.visualization.button.today"] = "<bean:message key="data.visualization.button.today"/>";
+            interfaceTexts["data.visualization.button.clear"] = "<bean:message key="data.visualization.button.clear"/>";
 
-            var interfaceVisualization = new InterfaceVisualization( ${plateforms} );
+            interfaceTexts["data.visualization.selectDate"] = "<bean:message key="data.visualization.selectDate"/>";
+            interfaceTexts["data.visualization.selectYear"] = "<bean:message key="data.visualization.selectYear"/>";
+            interfaceTexts["data.visualization.selectMonth"] = "<bean:message key="data.visualization.selectMonth"/>";
+            interfaceTexts["data.visualization.selectDay"] = "<bean:message key="data.visualization.selectDay"/>";
+            interfaceTexts["data.visualization.selectTime"] = "<bean:message key="data.visualization.selectTime"/>";
+            interfaceTexts["data.visualization.selectHour"] = "<bean:message key="data.visualization.selectHour"/>";
+            interfaceTexts["data.visualization.selectMinute"] = "<bean:message key="data.visualization.selectMinute"/>";
+
+            interfaceTexts["<%=AxeType.TIME%>"] = "<bean:message key="data.visualization.axeType.Time"/>";
+            interfaceTexts["<%=AxeType.LATITUDE%>"] = "<bean:message key="data.visualization.axeType.Latitude"/>";
+
+            var interfaceVisualization = new InterfaceVisualization( ${plateforms}, ${axeTypes} );
         </script>