Author: glandais Date: 2008-01-23 10:48:28 +0000 (Wed, 23 Jan 2008) New Revision: 425 Modified: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThreadsTestCase.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/AdminPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/SuperAdminPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/UserPage.java Log: Javadoc (@Override) Modified: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java =================================================================== --- trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityEqualsTestCase.java 2008-01-23 10:48:28 UTC (rev 425) @@ -13,6 +13,7 @@ AuthenticationService authenticationService = null; + @Override protected void setUp() throws Exception { super.setUp(); Properties properties = (Properties) System.getProperties().clone(); Modified: trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java =================================================================== --- trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/test/SecurityTestCase.java 2008-01-23 10:48:28 UTC (rev 425) @@ -14,6 +14,7 @@ AuthenticationService authenticationService = null; + @Override protected void setUp() throws Exception { super.setUp(); Properties properties = (Properties) System.getProperties().clone(); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceMassInsert.java 2008-01-23 10:48:28 UTC (rev 425) @@ -16,6 +16,7 @@ private StorageServiceCommon storageService; private ElementGenerator elementGenerator; + @Override protected void setUp() throws Exception { super.setUp(); elementGenerator = new ElementGenerator(); @@ -24,6 +25,7 @@ storageService.open(); } + @Override protected void tearDown() throws Exception { super.tearDown(); storageService.close(); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceServerTest.java 2008-01-23 10:48:28 UTC (rev 425) @@ -12,6 +12,7 @@ private StorageService storageService; + @Override protected void setUp() throws Exception { super.setUp(); Modified: trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java =================================================================== --- trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/test/StorageServiceTest.java 2008-01-23 10:48:28 UTC (rev 425) @@ -23,12 +23,14 @@ private StorageService storageService; private Random r = new Random(); + @Override protected void setUp() throws Exception { super.setUp(); storageService = new StorageServiceClient(); } + @Override protected void tearDown() throws Exception { super.tearDown(); } Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseLoadTestCase.java 2008-01-23 10:48:28 UTC (rev 425) @@ -60,6 +60,7 @@ initializeStrings(); } + @Override protected void setUp() throws Exception { super.setUp(); @@ -67,6 +68,7 @@ // database.open(); } + @Override protected void tearDown() throws Exception { super.tearDown(); database.close(); Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseTestCase.java 2008-01-23 10:48:28 UTC (rev 425) @@ -22,6 +22,7 @@ private MetaDataGenerator mdg = new MetaDataGenerator(); private Random r = new Random(); + @Override protected void setUp() throws Exception { super.setUp(); @@ -30,6 +31,7 @@ // elementGenerator = new ElementGenerator(); } + @Override protected void tearDown() throws Exception { super.tearDown(); database.close(); Modified: trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThreadsTestCase.java =================================================================== --- trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThreadsTestCase.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/test/LuceneDatabaseThreadsTestCase.java 2008-01-23 10:48:28 UTC (rev 425) @@ -8,12 +8,14 @@ private Database database; + @Override protected void setUp() throws Exception { super.setUp(); database = new LuceneDatabase(); database.open(true); } + @Override protected void tearDown() throws Exception { super.tearDown(); database.close(); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/AdminPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/AdminPage.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/AdminPage.java 2008-01-23 10:48:28 UTC (rev 425) @@ -2,6 +2,7 @@ public abstract class AdminPage extends ProtectedPage { + @Override public boolean hasAccessToPage() { return isUserAdmin(); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/SuperAdminPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/SuperAdminPage.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/SuperAdminPage.java 2008-01-23 10:48:28 UTC (rev 425) @@ -2,6 +2,7 @@ public abstract class SuperAdminPage extends ProtectedPage { + @Override public boolean hasAccessToPage() { return isUserSuperAdmin(); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/UserPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/UserPage.java 2008-01-23 10:47:25 UTC (rev 424) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/UserPage.java 2008-01-23 10:48:28 UTC (rev 425) @@ -2,6 +2,7 @@ public abstract class UserPage extends ProtectedPage { + @Override public boolean hasAccessToPage() { return isUserLogged(); }