Author: chatellier Date: 2010-11-18 11:13:25 +0000 (Thu, 18 Nov 2010) New Revision: 233 Log: Remove intermediate "data" dir for selections Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserConstants.java 2010-11-18 11:13:25 UTC (rev 233) @@ -55,9 +55,6 @@ /** Nom du dossier de sauvegarde des selections. */ public static final String STORAGE_SELECTION_DIRECTORY = "selections"; - - /** Nom du dossier de sauvegarde des données d'une selections. */ - public static final String STORAGE_DATA_SELECTION_DIRECTORY = "data"; /** Suffix des nom de fichiers data apres control. */ public static final String STORAGE_CONTROL_SUFFIX = "_co"; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-18 11:13:25 UTC (rev 233) @@ -487,13 +487,12 @@ // try to load validated data first File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); File selectionDirectory = new File(selectionsDirectory, selection.getName()); - File selectionDataDirectory = new File(selectionDirectory, CoserConstants.STORAGE_DATA_SELECTION_DIRECTORY); int fileLoaded = 0; for (Category category : Category.values()) { // seulement les category de données ici if (category.isDataCategory()) { - File inputFile = new File(selectionDataDirectory, category.getStorageFileName() + + File inputFile = new File(selectionDirectory, category.getStorageFileName() + CoserConstants.STORAGE_SELECTION_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); if (inputFile.isFile()) { @@ -698,13 +697,9 @@ // creation du dossier de la selection courante File selectionDirectory = new File(selectionsDirectory, selection.getName()); - // copie des données (csv) - File selectionDataDirectory = new File(selectionDirectory, CoserConstants.STORAGE_DATA_SELECTION_DIRECTORY); - selectionDataDirectory.mkdirs(); - for (Category category : Category.values()) { if (category.isDataCategory()) { - File dataFile = new File(selectionDataDirectory, + File dataFile = new File(selectionDirectory, category.getStorageFileName() + CoserConstants.STORAGE_SELECTION_SUFFIX + CoserConstants.STORAGE_CSV_EXTENSION); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-18 11:12:08 UTC (rev 232) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-18 11:13:25 UTC (rev 233) @@ -133,7 +133,7 @@ Assert.assertTrue(new File(config.getProjectsDirectory(), project.getName() + File.separator + "selections" + File.separator + - "titi" + File.separator + "data" + File.separator + "catch_se.csv").exists()); + "titi" + File.separator + "catch_se.csv").exists()); } /**