Author: kmorin Date: 2013-03-28 13:54:20 +0100 (Thu, 28 Mar 2013) New Revision: 699 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/699 Log: refs #1840 [REFERENTIEL] - Gestion des fonctionnalit?\195?\169s administrateur Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config 2013-03-28 10:05:30 UTC (rev 698) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti.config 2013-03-28 12:54:20 UTC (rev 699) @@ -24,6 +24,4 @@ tutti.version=${project.version} tutti.site.url=${project.url} tutti.inceptionYear=${project.inceptionYear} -tutti.organizationName=${license.organizationName} -# the password is ifremer -tutti.admin.password=ef399a6e6ec62c6e142440241a5b98f8 \ No newline at end of file +tutti.organizationName=${license.organizationName} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-28 10:05:30 UTC (rev 698) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-28 12:54:20 UTC (rev 699) @@ -349,4 +349,8 @@ public String getUpdateUrl() { return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL.getKey()); } + + public String getAdminPassword() { + return applicationConfig.getOption(TuttiApplicationConfigOption.ADMIN_PASSWORD.getKey()); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-28 10:05:30 UTC (rev 698) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-03-28 12:54:20 UTC (rev 699) @@ -207,6 +207,14 @@ n_("tutti.config.option.ui.dateFormat.description"), "dd/MM/yyyy", String.class + ), + + ADMIN_PASSWORD( + "tutti.admin.password", + n_("tutti.config.option.ui.dateFormat.description"), + // "ifremer" by default + "ef399a6e6ec62c6e142440241a5b98f8", + String.class ); /** Configuration key. */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-28 10:05:30 UTC (rev 698) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ImportTemporaryReferentialAction.java 2013-03-28 12:54:20 UTC (rev 699) @@ -56,7 +56,7 @@ JOptionPane.WARNING_MESSAGE); if (answer != null) { String cryptedAnswer = StringUtil.encodeMD5(answer); - String correctAnswer = getConfig().getApplicationConfig().getOption("tutti.admin.password"); + String correctAnswer = getConfig().getAdminPassword(); result = StringUtils.equals(cryptedAnswer, correctAnswer); if (!result) {