Author: fdesbois Date: 2012-08-22 10:37:49 +0200 (Wed, 22 Aug 2012) New Revision: 455 Url: http://forge.codelutin.com/repositories/revision/sammoa/455 Log: Move audioFile construction in FlightStorage Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-21 16:12:32 UTC (rev 454) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerDefault.java 2012-08-22 08:37:49 UTC (rev 455) @@ -782,14 +782,9 @@ protected void saveAudio(long delay) { - String fileName = String.format( - "%1$tF-%1$tH-%1$tM-%1$tS.%2$s.%3$s", - currentRoute.getBeginTime(), - currentRoute.getTopiaId(), - getAudioRecorder().getOutputType().getExtension() - ); + String extension = getAudioRecorder().getOutputType().getExtension(); - File audioFile = flightStorage.getAudioFile(fileName); + File audioFile = flightStorage.getAudioFile(currentRoute, extension); getAudioRecorder().record(audioFile, delay); } Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java 2012-08-21 16:12:32 UTC (rev 454) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/FlightStorage.java 2012-08-22 08:37:49 UTC (rev 455) @@ -29,6 +29,7 @@ import fr.ulr.sammoa.persistence.Flight; import fr.ulr.sammoa.persistence.Region; import org.apache.commons.lang3.builder.ToStringBuilder; +import fr.ulr.sammoa.persistence.Route; import org.nuiton.util.decorator.Decorator; import java.io.File; @@ -52,8 +53,16 @@ return new File(getDirectory(), "audio"); } - public File getAudioFile(String filename) { - return new File(getAudioDirectory(), filename); + public File getAudioFile(Route route, String ext) { + + String fileName = String.format( + "%1$tF-%1$tH-%1$tM-%1$tS.%2$s.%3$s", + route.getBeginTime(), + route.getTopiaId(), + ext + ); + + return new File(getAudioDirectory(), fileName); } @Override