[Suiviobsmer-commits] r475 - in trunk/wao-ui/src/main/java/fr/ifremer/wao/ui: base components pages services

3 May 2010

Author: fdesbois
Date: 2010-05-03 17:48:07 +0000 (Mon, 03 May 2010)
New Revision: 475

Log:
Remove no more used WaoPage

Removed:
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java
Modified:
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java
===================================================================

--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/AbstractFilteredPage.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -80,7 +80,7 @@
  *
  * @author fdesbois <fdesbois at codelutin.com>
  */
-public abstract class AbstractFilteredPage implements WaoPage {
+public abstract class AbstractFilteredPage {
 
     @Inject
     private Logger log;
@@ -140,8 +140,7 @@
      * Need to be call in setupRender of the page which inherits this abstract
      * class.
      */
-    @Override
-    public void initialize()  {
+    public void initCompanyFilter()  {
         // Very very important to do that at beginning
         if (!user.isAdmin()) {
             if (log.isDebugEnabled()) {

Deleted: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/base/WaoPage.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -1,51 +0,0 @@
-/*
- * #%L
- * Wao :: Web Interface
- * 
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2010 Ifremer
- * %%
- * 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/gpl-3.0.html>.
- * #L%
- */
-
-package fr.ifremer.wao.ui.base;
-
-/**
- * WaoPage
- *
- * Created: 3 déc. 2009
- *
- * @author fdesbois <fdesbois at codelutin.com>
- */
-public interface WaoPage {
-
-    /**
-     * Used to determine if the page has to be displayed (depends on user right)
-     *
-     * @return true if the page has to be displayed
-     * @deprecated since 1.2.1
-     */
-    @Deprecated
-    boolean canDisplay();
-
-    /**
-     * Used to initialize data in renderer of Layout component
-     */
-    void initialize();
-
-}

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/Layout.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -27,12 +27,9 @@
 
 import fr.ifremer.wao.WaoProperty;
 import fr.ifremer.wao.entity.WaoUser;
-import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.pages.Index;
 import fr.ifremer.wao.ui.services.ServiceAuthentication;
 import fr.ifremer.wao.ui.services.WaoManager;
-import org.apache.commons.lang.StringUtils;
 import org.apache.tapestry5.BindingConstants;
 import org.apache.tapestry5.annotations.InjectComponent;
 import org.apache.tapestry5.annotations.InjectContainer;
@@ -67,9 +64,6 @@
     @InjectComponent
     private FeedBack contentFeedback;
 
-    @InjectContainer
-    private WaoPage page;
-
     @Inject
     private Request request;
 
@@ -84,14 +78,6 @@
 
     private boolean fatal = false;
 
-    void setupRender() {
-        if (logger.isDebugEnabled()) {
-            logger.debug("Initialize page from Layout");
-            logger.debug("currentUserExists : " + isCurrentUserExists());
-        }
-        page.initialize();
-    }
-
     boolean afterRender() {
         // Check if fatal errors has been added to the layout
         // Reload the page if feedBack hasn't been reloaded yet to display

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -35,7 +35,6 @@
 import fr.ifremer.wao.service.ServiceReferential;
 import fr.ifremer.wao.service.ServiceUser;
 import fr.ifremer.wao.ui.base.GenericSelectModel;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.components.Layout;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
 import fr.ifremer.wao.ui.services.WaoManager;
@@ -64,22 +63,8 @@
  */
 @RequiresAuthentication(value = UserRole.ADMIN, readOnlyAllowed = true)
 @IncludeStylesheet("context:css/administration.css")
-public class Administration implements WaoPage {
+public class Administration {
 
-    /**
-     * The access to the page is only for admin with no readOnly right.
-     *
-     * @return true if the Administration page can be displayed in Layout
-     */
-    @Override
-    public boolean canDisplay() {
-        return currentUser.isAdmin() && !currentUser.getReadOnly();
-    }
-
-    @Override
-    public void initialize() {        
-    }
-
     @Inject
     private Logger log;
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/BoatActivityCalendar.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -33,7 +33,6 @@
 import fr.ifremer.wao.entity.Boat;
 import fr.ifremer.wao.entity.WaoUser;
 import fr.ifremer.wao.service.ServiceBoat;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
 import java.util.Collections;
 import java.util.List;
@@ -55,23 +54,8 @@
  */
 @RequiresAuthentication
 @IncludeStylesheet("context:css/boats.css")
-public class BoatActivityCalendar implements WaoPage {
+public class BoatActivityCalendar {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-    
-    @Override
-    public void initialize() {
-
-    }
-
     @Inject
     private Logger log;
     

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -94,20 +94,6 @@
 @IncludeStylesheet("context:css/boats.css")
 public class Boats extends AbstractFilteredPage {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
-    @Override
-    public void initialize() {
-    }
-
     @Inject
     private Logger log;
 
@@ -173,6 +159,8 @@
 
         // Initialize filters using AbstractFilteredPage superclass
         initSelectFilters(false, false, false);
+        // The company of connected user will be contributed to abstractFilteredPage
+        initCompanyFilter();
 
         companyBoatInfos = null;
     }

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -90,16 +90,6 @@
 @IncludeStylesheet("context:css/contacts.css")
 public class Contacts extends AbstractFilteredPage {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
     @Inject
     private Logger log;
 
@@ -129,6 +119,8 @@
         if (fullView == null) {
             fullView = user.isAdmin();
         }
+        // The company of connected user will be contributed to abstractFilteredPage
+        initCompanyFilter();
     }
 
     /**************************** CONTACT FILTERS *****************************/

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ExceptionReport.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -26,7 +26,6 @@
 package fr.ifremer.wao.ui.pages;
 
 import fr.ifremer.wao.WaoException;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.components.Layout;
 import fr.ifremer.wao.ui.services.WaoManager;
 import org.apache.tapestry5.annotations.InjectComponent;
@@ -43,21 +42,8 @@
  *
  * @author fdesbois <fdesbois at codelutin.com>
  */
-public class ExceptionReport implements ExceptionReporter, WaoPage {
-/**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
+public class ExceptionReport implements ExceptionReporter {
 
-    @Override
-    public void initialize() {
-    }
-
     @InjectComponent
     private Layout layout;
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Index.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -26,12 +26,10 @@
 package fr.ifremer.wao.ui.pages;
 
 import fr.ifremer.wao.WaoException;
-import fr.ifremer.wao.bean.UserRole;
 import fr.ifremer.wao.entity.News;
 import fr.ifremer.wao.entity.NewsImpl;
 import fr.ifremer.wao.entity.WaoUser;
 import fr.ifremer.wao.service.ServiceNews;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -57,22 +55,8 @@
  */
 @RequiresAuthentication
 @IncludeStylesheet("context:css/news.css")
-public class Index implements WaoPage {
-    
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
+public class Index {
 
-    @Override
-    public void initialize() {
-    }
-
     @Inject
     private ServiceNews serviceNews;
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -42,7 +42,6 @@
 import fr.ifremer.wao.service.ServiceSampling;
 import fr.ifremer.wao.service.ServiceUser;
 import fr.ifremer.wao.ui.base.GenericSelectModel;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
 import fr.ifremer.wao.ui.data.WaoPropertyChangeListener;
 import fr.ifremer.wao.ui.services.WaoManager;
@@ -82,22 +81,8 @@
  */
 @RequiresAuthentication(value = UserRole.ADMIN, readOnlyAllowed = false)
 @IncludeStylesheet("context:css/sampling.css")
-public class SampleRowForm implements WaoPage {
+public class SampleRowForm {
 
-    /**
-     * Only admin with no readOnly rights can display SampleRowForm.
-     *
-     * @return true if the user can display the page
-     */
-    @Override
-    public boolean canDisplay() {
-        return user.isAdmin() && !user.getReadOnly();
-    }
-
-    @Override
-    public void initialize() {
-    }
-
     @Inject
     private Logger log;
     

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowHistoric.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -32,7 +32,6 @@
 import fr.ifremer.wao.entity.SampleRowLog;
 import fr.ifremer.wao.entity.WaoUser;
 import fr.ifremer.wao.service.ServiceSampling;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.components.FeedBack;
 import fr.ifremer.wao.ui.components.Layout;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
@@ -57,22 +56,8 @@
  */
 @RequiresAuthentication
 @IncludeStylesheet("context:css/sampling.css")
-public class SampleRowHistoric implements WaoPage {
+public class SampleRowHistoric {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
-    @Override
-    public void initialize() {
-    }
-
     @Inject
     private Logger log;
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SamplingPlan.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -76,16 +76,6 @@
 @IncludeStylesheet("context:css/sampling.css")
 public class SamplingPlan extends AbstractFilteredPage {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
     @Inject
     private Logger logger;
 
@@ -122,6 +112,8 @@
         if (fullView == null) {
             fullView = user.isAdmin();
         }
+        // The company of connected user will be contributed to abstractFilteredPage
+        initCompanyFilter();
     }
 
     /**************************** IMPORT (ADMIN) *******************************/

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -76,17 +76,7 @@
 @RequiresAuthentication
 @IncludeStylesheet("context:css/synthesis.css")
 public class Synthesis extends AbstractFilteredPage {
-
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
+    
     @Inject
     private ServiceSynthesis serviceSynthesis;
 
@@ -106,6 +96,11 @@
     @InjectComponent
     private Zone delegator;
 
+    void setupRender() {
+        // The company of connected user will be contributed to abstractFilteredPage
+        initCompanyFilter();
+    }
+
     public Block getActiveBlock() throws WaoException {
         if (activeSynthesis == null) {
             // Initialize default synthesis by Data Sampling

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Unavailable.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -1,7 +1,6 @@
 
 package fr.ifremer.wao.ui.pages;
 
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.components.Layout;
 import org.apache.tapestry5.annotations.InjectComponent;
 
@@ -13,22 +12,13 @@
  * @author fdesbois
  * $Id$
  */
-public class Unavailable implements WaoPage {
+public class Unavailable {
 
     @InjectComponent
     private Layout layout;
 
     private String pageName;
 
-    @Override
-    public boolean canDisplay() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public void initialize() {
-    }
-
     void setupRender() {
         layout.addError("Vous n'êtes pas autorisé à accéder à la page " +
                 pageName + " !");

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/UserProfile.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -30,7 +30,6 @@
 import fr.ifremer.wao.WaoException;
 import fr.ifremer.wao.entity.WaoUser;
 import fr.ifremer.wao.service.ServiceUser;
-import fr.ifremer.wao.ui.base.WaoPage;
 import fr.ifremer.wao.ui.components.Layout;
 import fr.ifremer.wao.ui.data.RequiresAuthentication;
 import org.apache.commons.lang.StringUtils;
@@ -50,22 +49,8 @@
  */
 @RequiresAuthentication
 @IncludeStylesheet("context:css/userProfile.css")
-public class UserProfile implements WaoPage {
+public class UserProfile {
 
-    /**
-     * No restriction to display this page.
-     *
-     * @return true
-     */
-    @Override
-    public boolean canDisplay() {
-        return true;
-    }
-
-    @Override
-    public void initialize() {
-    }
-
     @Inject
     private ServiceUser serviceUser;
 

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java
===================================================================
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java	2010-05-03 16:48:00 UTC (rev 474)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ServiceAuthentication.java	2010-05-03 17:48:07 UTC (rev 475)
@@ -2,7 +2,6 @@
 package fr.ifremer.wao.ui.services;
 
 import fr.ifremer.wao.entity.WaoUser;
-import fr.ifremer.wao.ui.base.WaoPage;
 
 /**
  * ServiceAuthentication

    

[Suiviobsmer-commits] r475 - in trunk/wao-ui/src/main/java/fr/ifremer/wao/ui: base components pages services

fdesbois＠users.labs.libre-entreprise.org