Author: tchemit Date: 2013-01-28 14:58:33 +0100 (Mon, 28 Jan 2013) New Revision: 251 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/251 Log: use last nuiton-utils api Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-28 12:04:12 UTC (rev 250) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfig.java 2013-01-28 13:58:33 UTC (rev 251) @@ -27,11 +27,6 @@ import fr.ifremer.tutti.service.TuttiServiceTechnicalException; import fr.ifremer.tutti.service.config.TuttiServiceConfig; import fr.ifremer.tutti.ui.swing.util.editor.CoordinateEditorType; -import java.awt.Color; -import java.io.File; -import java.io.IOException; -import java.net.URL; -import javax.swing.KeyStroke; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; @@ -79,14 +74,18 @@ applicationConfig = new ApplicationConfig(); - // load all config default options + // get all config providers Set<ApplicationConfigProvider> providers = - ApplicationConfigHelper.loadAllDefaultOption(applicationConfig, - null, - null, - null, - true); + ApplicationConfigHelper.getProviders(null, + null, + null, + true); + // load all default options + ApplicationConfigHelper.loadAllDefaultOption(applicationConfig, + providers); + + // get all transient and final option keys Set<String> optionToSkip = ApplicationConfigHelper.getTransientOrFinalOptionKey(providers); @@ -205,7 +204,7 @@ public String getDateFormat() { return applicationConfig.getOption(TuttiConfigOption.DATE_FORMAT.getKey()); } - + public Version getVersion() { return serviceConfig.getVersion(); }