- Coser-commits - mailman.cloud.codelutin.com

r623 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:43:04 +0000 (Mon, 31 Jan 2011) New Revision: 623 Log: Add wait cursor in add rsufi result view Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:43:00 UTC (rev 622) +++ trunk/changelog.txt 2011-01-31 13:43:04 UTC (rev 623) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Add wait cursor in add rsufi result view * Add creation date in rsufi data extraction * Name rsufi data extraction directory : RSUFI_DATA_projectname * Remember configuration window size

1 0

r622 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:43:00 +0000 (Mon, 31 Jan 2011) New Revision: 622 Log: Add wait cursor in add rsufi result view Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:39:27 UTC (rev 621) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:43:00 UTC (rev 622) @@ -1100,11 +1100,14 @@ */ public void performAddResult(SelectionAddResultDialog view) { + setWaitCursor(view); + Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService projectService = view.getContextValue(ProjectService.class); List<File> otherFiles = view.getOtherDataFileListModel().getOtherFiles(); + RSufiResult newResult = view.getRsufiResult(); try { projectService.saveRsufiResults(project, selection, newResult, otherFiles); @@ -1113,6 +1116,9 @@ JOptionPane.showMessageDialog(view, ex.getMessage(), _("coser.ui.result.saveError"), JOptionPane.ERROR_MESSAGE); throw new CoserException("Can't save result", ex); } + finally { + setDefaultCursor(view); + } view.dispose(); }

1 0

r621 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:39:27 +0000 (Mon, 31 Jan 2011) New Revision: 621 Log: Add creation date in rsufi data extraction Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:39:25 UTC (rev 620) +++ trunk/changelog.txt 2011-01-31 13:39:27 UTC (rev 621) @@ -4,7 +4,8 @@ 1.0.0-beta3 ----------- - * Name rsufi extraction directory : RSUFI_DATA_projectname + * Add creation date in rsufi data extraction + * Name rsufi data extraction directory : RSUFI_DATA_projectname * Remember configuration window size * Fix LengthStruture graph bounds with null values * FileChooser opened to projectsDirectory

1 0

r620 - trunk/coser-business/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:39:25 +0000 (Mon, 31 Jan 2011) New Revision: 620 Log: Add creation date in rsufi data extraction Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-31 13:31:13 UTC (rev 619) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-01-31 13:39:25 UTC (rev 620) @@ -66,6 +66,7 @@ coser.business.control.step.diffCatchLength=Check diff catch/length (%d%%) coser.business.control.step.observation=Checking observation number \: %s (%d%%) coser.business.control.step.xworks=Line checks \: %s (%d%%) +coser.business.extract.creationdate=Creation date \: coser.business.extract.projectAuthor=Project author \: coser.business.extract.projectComment=Project comment \: coser.business.extract.projectName=Project name \: Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-31 13:31:13 UTC (rev 619) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-01-31 13:39:25 UTC (rev 620) @@ -66,6 +66,7 @@ coser.business.control.step.diffCatchLength=V\u00E9rification des diff\u00E9rences captures/taille (%d%%) coser.business.control.step.observation=V\u00E9rification du nombre d'observation \: %s (%d%%) coser.business.control.step.xworks=Validation par lignes \: %s (%d%%) +coser.business.extract.creationdate=Date de cr\u00E9ation \: coser.business.extract.projectAuthor=Auteur du projet \: coser.business.extract.projectComment=Commentaire du projet \: coser.business.extract.projectName=Nom du project \:

1 0

r619 - trunk
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:31:13 +0000 (Mon, 31 Jan 2011) New Revision: 619 Log: Nommer le dossier RSUFI_DATA_nomduprojet.... Modified: trunk/changelog.txt Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-31 13:31:11 UTC (rev 618) +++ trunk/changelog.txt 2011-01-31 13:31:13 UTC (rev 619) @@ -4,6 +4,10 @@ 1.0.0-beta3 ----------- + * Name rsufi extraction directory : RSUFI_DATA_projectname + * Remember configuration window size + * Fix LengthStruture graph bounds with null values + * FileChooser opened to projectsDirectory * Update jaxx to 2.3 * Update nuiton-widgets to 1.1.1 * Update nuiton-i18n to 2.2

1 0

r618 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:31:11 +0000 (Mon, 31 Jan 2011) New Revision: 618 Log: Nommer le dossier RSUFI_DATA_nomduprojet.... Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 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 2011-01-31 13:24:51 UTC (rev 617) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2011-01-31 13:31:11 UTC (rev 618) @@ -2631,7 +2631,8 @@ */ public File extractRSUfiData(Project project, Selection selection, File directory, boolean onlyDataTable) throws CoserBusinessException { - File projectDirectory = new File(directory, project.getName()); + // Nommer le dossier RSUFI_DATA_nomduprojet.... + File projectDirectory = new File(directory, "RSUFI_DATA_" + project.getName()); projectDirectory.mkdirs(); // extract 4 data files

1 0

r617 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: common project result selection
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:24:51 +0000 (Mon, 31 Jan 2011) New Revision: 617 Log: Select file chooser with defaut current directory Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/CommonHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -52,11 +52,13 @@ * Retourne une unique instance du file chooser pour conserver * le répertoire de sélection d'un appel sur l'autre. * + * @param currentDirectory current directory * @return file chooser */ - protected JFileChooser getFileChooserInstance() { + protected JFileChooser getFileChooserInstance(File currentDirectory) { if (fileChooserInstance == null) { fileChooserInstance = new JFileChooser(); + fileChooserInstance.setCurrentDirectory(currentDirectory); } return fileChooserInstance; } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -97,7 +97,8 @@ * @param textComponent text component to fill */ public void selectInputFile(ProjectCreationView projectView, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = projectView.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(projectView); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -254,7 +254,8 @@ * @param textComponent text component to set selected file */ public void selectExportDirectory(ExportUploadDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:14:19 UTC (rev 616) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-01-31 13:24:51 UTC (rev 617) @@ -65,6 +65,7 @@ import com.bbn.openmap.gui.Tool; import fr.ifremer.coser.CoserBusinessException; +import fr.ifremer.coser.CoserConfig; import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.RSufiResult; @@ -1143,7 +1144,8 @@ * @param textComponent text component to set selected directory */ public void selectOutputDirectory(SelectionRsufiView view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1183,7 +1185,8 @@ * @param textComponent text component to set selected file */ public void selectResultFile(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1200,7 +1203,8 @@ * @param textComponent text component to set selected directory */ public void selectMapsDirectory(SelectionAddResultDialog view, JTextField textComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); int result = selectFileChooser.showOpenDialog(view); @@ -1217,7 +1221,8 @@ * @param listComponent list component to set selected file */ public void selectResultFileOrDirectory(SelectionAddResultDialog view, JList listComponent) { - JFileChooser selectFileChooser = getFileChooserInstance(); + CoserConfig config = view.getContextValue(CoserConfig.class); + JFileChooser selectFileChooser = getFileChooserInstance(config.getProjectsDirectory()); selectFileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); int result = selectFileChooser.showOpenDialog(view);

1 0

r616 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:14:19 +0000 (Mon, 31 Jan 2011) New Revision: 616 Log: Fix les valeurs bornes apres les valeurs nulles. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-01-31 13:01:26 UTC (rev 615) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-01-31 13:14:19 UTC (rev 616) @@ -81,6 +81,7 @@ matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(parent); + matrixViewerFrame.toFront(); session.add(matrixViewerFrame); // session restore matrixViewerFrame.setVisible(true); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-01-31 13:01:26 UTC (rev 615) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-01-31 13:14:19 UTC (rev 616) @@ -73,9 +73,10 @@ if ("coser.business.common.length".equals(semantic0Name)) { List<?> semantic0 = matrix.getSemantic(0); - double first = (Double)matrix.getSemantic(0).get(0); - double last = (Double)matrix.getSemantic(0).get(matrix.getSemantic(0).size() - 1); - + double first = Double.MAX_VALUE; + double last = Double.MIN_VALUE; + boolean atLeastOneAdujments = false; + // on cherche les bornes qui ont des valeurs sup à 0.0 // sinon, ya du vide autour des choses demandées // mais le vide entre est requis (trou de données) @@ -90,10 +91,19 @@ if (last < category) { last = category; } + atLeastOneAdujments = true; } } } + // cas ou toutes les valeurs sont a zero et les + // bornes ne sont pas ajustées + // chose incohérente... + if (!atLeastOneAdujments) { + first = (Double)matrix.getSemantic(0).get(0); + last = (Double)matrix.getSemantic(0).get(matrix.getSemantic(0).size() - 1); + } + // on verifie toutes les valeurs pour savoir si c'est un // pas entier ou un demi pas boolean haltStep = false;

1 0

r615 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 31 Jan '11

31 Jan '11

Author: chatellier Date: 2011-01-31 13:01:26 +0000 (Mon, 31 Jan 2011) New Revision: 615 Log: Remember configuration window size Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-28 11:49:24 UTC (rev 614) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-31 13:01:26 UTC (rev 615) @@ -201,6 +201,11 @@ dialogUI.add(configUI); dialogUI.pack(); dialogUI.setLocationRelativeTo(view); + + // restore session size + SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); + session.add(dialogUI); + dialogUI.setVisible(true); }

1 0

r614 - trunk
by chatellier＠users.labs.libre-entreprise.org 28 Jan '11

28 Jan '11

Author: chatellier Date: 2011-01-28 11:49:24 +0000 (Fri, 28 Jan 2011) New Revision: 614 Log: Update libs Modified: trunk/changelog.txt trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-01-28 11:49:15 UTC (rev 613) +++ trunk/changelog.txt 2011-01-28 11:49:24 UTC (rev 614) @@ -1,12 +1,18 @@ Coser release notes =================== +1.0.0-beta3 +----------- + + * Update jaxx to 2.3 + * Update nuiton-widgets to 1.1.1 + * Update nuiton-i18n to 2.2 + 1.0.0-beta2 ----------- * Fix input stream progress read() buffer bug * Add selection name in rsufi extracted information file - * Add trace to time import file * Add missing images : C_Crustaflam.png et C_Noursom.png 1.0.0-beta1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-28 11:49:15 UTC (rev 613) +++ trunk/pom.xml 2011-01-28 11:49:24 UTC (rev 614) @@ -147,12 +147,6 @@ <artifactId>jaxx-validator</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -193,7 +187,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-widgets</artifactId> - <version>1.1</version> + <version>1.1.1-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -319,8 +313,8 @@ <license.organizationName>Ifremer, Codelutin</license.organizationName>  - <jaxx.version>2.2.5</jaxx.version> - <i18n.version>2.1</i18n.version> + <jaxx.version>2.3</jaxx.version> + <i18n.version>2.2</i18n.version> <struts.version>2.2.1.1</struts.version> </properties>

1 0