Author: tchemit Date: 2013-02-26 09:42:14 +0100 (Tue, 26 Feb 2013) New Revision: 482 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/482 Log: use last snapshot of nuiton-utils Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/pom.xml 2013-02-26 08:42:14 UTC (rev 482) @@ -122,7 +122,7 @@ <!-- libraries version --> - <nuitonUtilsVersion>2.6.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.10-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2013-02-26 08:42:14 UTC (rev 482) @@ -38,8 +38,6 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; @@ -336,33 +334,4 @@ return result; } - public static File getTestSpecificDirectory(Class<?> testClassName, - String methodName, - String classifier, - long timestamp) { - // Trying to look for the temporary folder to store data for the test - String tempDirPath = System.getProperty("java.io.tmpdir"); - if (tempDirPath == null) { - // can this really occur ? - tempDirPath = ""; - if (log.isWarnEnabled()) { - log.warn("'\"java.io.tmpdir\" not defined"); - } - } - File tempDirFile = SystemUtils.getJavaIoTmpDir(); - - // create the directory to store database data - String dataBasePath = testClassName.getName() - + File.separator // a directory with the test class name - + methodName; // a sub-directory with the method name - - if (StringUtils.isNotBlank(classifier)) { - dataBasePath += classifier; - } - dataBasePath += '_' - + timestamp; // and a timestamp - File databaseFile = new File(tempDirFile, dataBasePath); - return databaseFile; - } - } Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-26 08:42:14 UTC (rev 482) @@ -38,6 +38,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import org.nuiton.util.FileUtil; import java.io.File; import java.util.Map; @@ -115,9 +116,9 @@ @Before public void setUp() throws Exception { - datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), - name.getMethodName(), - null, TIMESTAMP); + datadirectory = FileUtil.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); service = new TuttiProtocolImportExportService() { Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/TuttiReferentialImportExportServiceTest.java 2013-02-26 08:42:14 UTC (rev 482) @@ -29,7 +29,6 @@ import com.google.common.io.Files; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfigOption; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -45,6 +44,7 @@ import org.junit.Test; import org.junit.rules.TestName; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.FileUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -247,9 +247,9 @@ @Before public void setUp() throws Exception { - datadirectory = TuttiEntities.getTestSpecificDirectory(getClass(), - name.getMethodName(), - null, TIMESTAMP); + datadirectory = FileUtil.getTestSpecificDirectory(getClass(), + name.getMethodName(), + null, TIMESTAMP); FileUtils.forceMkdir(datadirectory); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-25 21:43:56 UTC (rev 481) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/action/TuttiActionUIHandler.java 2013-02-26 08:42:14 UTC (rev 482) @@ -69,7 +69,7 @@ // change total progressbar max ui.getTaskProgressBar().setMaximum((Integer) evt.getNewValue()); - } else if (ProgressionModel.PROPERTY_MESSAGE.equals(propertyName)) { + } else if (ProgressionModel.PROPERTY_CURRENT.equals(propertyName)) { // change value of progress bar ui.getTaskProgressBar().setValue((Integer) evt.getNewValue());