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

r304 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 16:21:08 +0000 (Fri, 26 Nov 2010) New Revision: 304 Log: Remove maturity list graph Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-26 16:17:25 UTC (rev 303) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-26 16:21:08 UTC (rev 304) @@ -93,9 +93,8 @@ <cell columns="2"> <JButton icon="chart_bar.png" /> </cell> - <cell columns="2"> - <JButton icon="chart_bar.png" /> - </cell> + <cell /> + <cell /> </row> <row> <cell weighty="1" weightx="1" fill="both" columns="2">

1 0

r303 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 16:17:25 +0000 (Fri, 26 Nov 2010) New Revision: 303 Log: Revert previous commit 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 2010-11-26 16:13:45 UTC (rev 302) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 16:17:25 UTC (rev 303) @@ -55,6 +55,7 @@ import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.control.ControlHandler; import fr.ifremer.coser.ui.control.ControlView; @@ -173,7 +174,7 @@ public void showValidatorsConfiguration() { ValidatorDialog validatorDialog = new ValidatorDialog(view); - URL sample = CoserFrameHandler.class.getResource("Catch-error-validation.xml"); + URL sample = Catch.class.getResource("Catch-error-validation.xml"); File sampleFile = new File(sample.getFile()); validatorDialog.getValidationEditor().open(sampleFile); validatorDialog.setLocationRelativeTo(null);

1 0

r302 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 16:13:45 +0000 (Fri, 26 Nov 2010) New Revision: 302 Log: Losqu'une espece est s?\195?\169lectionn?\195?\169e, elle n'apparait plus dans la liste des especes filtr?\195?\169es Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 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/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-26 15:54:17 UTC (rev 301) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-26 16:13:45 UTC (rev 302) @@ -31,6 +31,7 @@ void $afterCompleteSetup() { // modification (species -> selection model) filteredSpecyListModel.addListDataListener((CoserListSelectionModel)filteredSpecyList.getSelectionModel()); + selectedSpecyListModel.addListDataListener((CoserListSelectionModel)selectedSpecyList.getSelectionModel()); } ]]></script> 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 2010-11-26 15:54:17 UTC (rev 301) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-26 16:13:45 UTC (rev 302) @@ -59,8 +59,8 @@ import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.RSufiResult; import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.services.PublicationService; -import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.result.SelectionAddResultDialog; import fr.ifremer.coser.ui.selection.model.OccurrenceDensitySpecyListModel; import fr.ifremer.coser.ui.util.CoserListSelectionModel; @@ -293,9 +293,14 @@ for (Object selectedSpecyType : selectedSpecyTypes) { specyTypes.add((String)selectedSpecyType); } + + List<String> filteredSpecies = projectService.getProjectSpecies(project, selection, strata, specyTypes); - List<String> species = projectService.getProjectSpecies(project, selection, strata, specyTypes); - view.getFilteredSpecyListModel().setSpecies(species); + // ne fait pas apparaitre les especes deja selectionnées + if (selection.getSelectedSpecies() != null) { + filteredSpecies.removeAll(selection.getSelectedSpecies()); + } + view.getFilteredSpecyListModel().setSpecies(filteredSpecies); } /** @@ -548,11 +553,18 @@ for (Object selectedFilteredSpecy : selectedFilteredSpecies) { selectedSpecies.add((String)selectedFilteredSpecy); } + + // met a jour le liste des especes selectionnées + List<String> selectedSpeciesList = new ArrayList<String>(selectedSpecies); + Collections.sort(selectedSpeciesList); + selection.setSelectedSpecies(selectedSpeciesList); + view.getSelectedSpecyListModel().setSpecies(selectedSpeciesList); - List<String> speciesList = new ArrayList<String>(selectedSpecies); - Collections.sort(speciesList); - selection.setSelectedSpecies(speciesList); - view.getSelectedSpecyListModel().setSpecies(speciesList); + // met a jour la liste filtrée (retrait des especes selectionnées) + // ne fait pas apparaitre les especes deja selectionnées + List<String> filteredSpecies = view.getFilteredSpecyListModel().getSpecies(); + filteredSpecies.removeAll(selectedSpeciesList); + view.getFilteredSpecyListModel().setSpecies(filteredSpecies); } /** @@ -564,14 +576,22 @@ Selection selection = view.getContextValue(Selection.class); + List<String> filteredSpecies = new ArrayList<String>(view.getFilteredSpecyListModel().getSpecies()); List<String> selectedSpecies = new ArrayList<String>(view.getSelectedSpecyListModel().getSpecies()); Object[] selectedSelectedSpecies = view.getSelectedSpecyList().getSelectedValues(); for (Object selectedSelectedSpecy : selectedSelectedSpecies) { - selectedSpecies.remove(selectedSelectedSpecy); + selectedSpecies.remove((String)selectedSelectedSpecy); + filteredSpecies.add((String)selectedSelectedSpecy); } Collections.sort(selectedSpecies); + Collections.sort(filteredSpecies); + + // met à jour la liste des especes selectionnées selection.setSelectedSpecies(selectedSpecies); view.getSelectedSpecyListModel().setSpecies(selectedSpecies); + + // met a jour la liste filtrée (retrait des especes selectionnées) + view.getFilteredSpecyListModel().setSpecies(filteredSpecies); } /**

1 0

r301 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:54:17 +0000 (Fri, 26 Nov 2010) New Revision: 301 Log: Pas logique 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 2010-11-26 15:49:54 UTC (rev 300) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 15:54:17 UTC (rev 301) @@ -55,7 +55,6 @@ import fr.ifremer.coser.CoserException; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; -import fr.ifremer.coser.data.Catch; import fr.ifremer.coser.services.ProjectService; import fr.ifremer.coser.ui.control.ControlHandler; import fr.ifremer.coser.ui.control.ControlView; @@ -174,7 +173,7 @@ public void showValidatorsConfiguration() { ValidatorDialog validatorDialog = new ValidatorDialog(view); - URL sample = Catch.class.getResource("Catch-error-validation.xml"); + URL sample = CoserFrameHandler.class.getResource("Catch-error-validation.xml"); File sampleFile = new File(sample.getFile()); validatorDialog.getValidationEditor().open(sampleFile); validatorDialog.setLocationRelativeTo(null);

1 0

r300 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:49:54 +0000 (Fri, 26 Nov 2010) New Revision: 300 Log: Uniformisation des noms de class g?\195?\169n?\195?\169r?\195?\169es Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx Removed: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx 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 2010-11-26 15:42:15 UTC (rev 299) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 15:49:54 UTC (rev 300) @@ -173,12 +173,12 @@ } public void showValidatorsConfiguration() { - ValidatorConfiguration validatorConfiguration = new ValidatorConfiguration(view); + ValidatorDialog validatorDialog = new ValidatorDialog(view); URL sample = Catch.class.getResource("Catch-error-validation.xml"); File sampleFile = new File(sample.getFile()); - validatorConfiguration.getValidationEditor().open(sampleFile); - validatorConfiguration.setLocationRelativeTo(null); - validatorConfiguration.setVisible(true); + validatorDialog.getValidationEditor().open(sampleFile); + validatorDialog.setLocationRelativeTo(null); + validatorDialog.setVisible(true); } /** Deleted: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx 2010-11-26 15:42:15 UTC (rev 299) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx 2010-11-26 15:49:54 UTC (rev 300) @@ -1,70 +0,0 @@ - -<JDialog title="coser.ui.validators.title"> - <Table> - <row> - <cell columns="4" fill="horizontal"> - <JLabel font-style="italic" text="coser.ui.validators.description" /> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel text="coser.ui.validators.validators" /> - </cell> - <cell> - <JLabel text="coser.ui.validators.entity" /> - </cell> - <cell weightx="1" fill="horizontal" columns="2"> - <JComboBox /> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <JList /> - </JScrollPane> - </cell> - <cell weightx="2" weighty="1" fill="both" columns="3"> - <org.nuiton.widget.editor.Editor id="validationEditor" /> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton text="coser.ui.validators.newValidator" /> - </cell> - <cell fill="horizontal"> - <JButton text="coser.ui.validators.deleteValidator" /> - </cell> - </row> - <row> - <cell columns="4" anchor="east" insets="0"> - <JPanel> - <JButton text="coser.ui.validators.cancel" onActionPerformed="dispose()"/> - <JButton text="coser.ui.validators.valid" onActionPerformed="dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Copied: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx (from rev 207, trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorConfiguration.jaxx) =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/ValidatorDialog.jaxx 2010-11-26 15:49:54 UTC (rev 300) @@ -0,0 +1,70 @@ + +<JDialog title="coser.ui.validators.title"> + <Table> + <row> + <cell columns="4" fill="horizontal"> + <JLabel font-style="italic" text="coser.ui.validators.description" /> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JLabel text="coser.ui.validators.validators" /> + </cell> + <cell> + <JLabel text="coser.ui.validators.entity" /> + </cell> + <cell weightx="1" fill="horizontal" columns="2"> + <JComboBox /> + </cell> + </row> + <row> + <cell fill="both" weightx="1" weighty="1"> + <JScrollPane> + <JList /> + </JScrollPane> + </cell> + <cell weightx="2" weighty="1" fill="both" columns="3"> + <org.nuiton.widget.editor.Editor id="validationEditor" /> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JButton text="coser.ui.validators.newValidator" /> + </cell> + <cell fill="horizontal"> + <JButton text="coser.ui.validators.deleteValidator" /> + </cell> + </row> + <row> + <cell columns="4" anchor="east" insets="0"> + <JPanel> + <JButton text="coser.ui.validators.cancel" onActionPerformed="dispose()"/> + <JButton text="coser.ui.validators.valid" onActionPerformed="dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog>

1 0

r299 - in trunk: coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:42:15 +0000 (Fri, 26 Nov 2010) New Revision: 299 Log: Debut de la fonction de reapplication de selection (non termin?\195?\169e) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 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-26 15:27:53 UTC (rev 298) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-26 15:42:15 UTC (rev 299) @@ -398,6 +398,10 @@ return project; } + protected void readSelectionFile() { + + } + /** * Load rsufi result in specified directory. * @@ -709,10 +713,54 @@ selection.setDensityFilter(config.getSelectionDensityFilter()); selection.setOccurrenceFilter(config.getSelectionOccurrenceFilter()); + List<String> allYears = getProjectYears(selection); + selection.setAllYears(allYears); + selection.setSelectedYears(new ArrayList<String>(allYears)); + return selection; } /** + * Initialise une nouvelle selection à partir des données de controle + * et de la definition de la selection du fichier fournit. + * + * @param project project (containing data in control) + * @param selectionFile selection file + * @return initialized selection + * @throws CoserBusinessException + */ + public Selection initProjectSelectionFromFile(Project project, File selectionFile) throws CoserBusinessException { + + Selection selection = initProjectSelection(project); + selection.setName(null); //clear name (can't be used) + + // read input file + InputStream selectionStream = null; + try { + Properties props = new Properties(); + selectionStream = new FileInputStream(selectionFile); + props.load(selectionStream); + selection.fromProperties(props); + } catch (IOException ex) { + throw new CoserBusinessException("Can't read selection properties file", ex); + } + finally { + IOUtils.closeQuietly(selectionStream); + } + + // filter years + filterDataYearsAndGetStrata(project, selection, selection.getSelectedYears()); + // applying merges commands + List<Command> commands = new ArrayList<Command>(selection.getHistoryCommand()); + selection.getHistoryCommand().clear(); + for (Command command : commands) { + commandService.doAction(command, project, selection); + } + + return selection; + } + + /** * Copy loaded control data to new created selection. * * @return selection initialized with Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-11-26 15:42:15 UTC (rev 299) @@ -33,7 +33,6 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -268,6 +267,7 @@ * @param project project * @param container data container * @param validationErrors errors list + * @return export html file * @throws CoserBusinessException */ public File exportErrorsAsHTML(Project project, AbstractDataContainer container, List<ControlError> validationErrors) throws CoserBusinessException { 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 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-26 15:42:15 UTC (rev 299) @@ -39,6 +39,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import javax.swing.SwingWorker; +import javax.swing.filechooser.FileFilter; import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; @@ -464,6 +465,77 @@ } /** + * Selection file filtrer for selection file chooser. + */ + public static class SelectionFileFilter extends FileFilter { + + @Override + public boolean accept(File f) { + return f.getName().endsWith(".selection"); + } + + @Override + public String getDescription() { + return _("coser.ui.selection.selectionFilterDescription"); + } + + } + + /** + * Replay selection. + * + * Open browse selection box to select selection file. + * Inform user to selection information before applying it. + * Apply it, and display report to user. + */ + public void replaySelection() { + + ProjectService projectService = view.getContextValue(ProjectService.class); + Project project = view.getContextValue(Project.class); + CoserConfig config = view.getContextValue(CoserConfig.class); + + JFileChooser selectionChooser = new JFileChooser(config.getProjectsDirectory()); + selectionChooser.setFileFilter(new SelectionFileFilter()); + selectionChooser.setMultiSelectionEnabled(false); + + int result = selectionChooser.showOpenDialog(view); + if (result == JFileChooser.APPROVE_OPTION) { + File selectionFile = selectionChooser.getSelectedFile(); + + try { + Selection selection = projectService.initProjectSelectionFromFile(project, selectionFile); + + view.setContextValue(selection); + + SelectionView selectionView = new SelectionView(view); + selectionView.setSelection(selection); + // fix, binding not working ? + selectionView.getSelectionDetailsTab().getValidatorSelection().setBean(selection); + + SelectionHandler handler = new SelectionHandler(); + selectionView.setHandler(handler); + + // FIXME chatellier 20101126 il faut faire un mix de init && reload + handler.initSelection(selectionView); + + try { + File file = new File("/home/chatellier/tmp/coser/zones.png"); + selectionView.getSelectionDetailsTab().getZonesMap().setImage(file); + + } catch(Exception e) { + e.printStackTrace(); + }; + setMainComponent(selectionView); + } + catch (Exception ex) { + JOptionPane.showMessageDialog(view, ex.getMessage(), + _("coser.ui.selection.replayerror"), JOptionPane.ERROR_MESSAGE); + throw new CoserException("Can't replay selection", ex); + } + } + } + + /** * Called by {@link LookAndFeelViewMenuItem} when look and feel selection * change. * Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2010-11-26 15:42:15 UTC (rev 299) @@ -123,10 +123,21 @@ add(new JSeparator()); // new selection - JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.newSelection")); - menuItem.setActionCommand(""); // peut pas etre null, c'est nul ! - menuItem.addActionListener(this); - add(menuItem); + JMenuItem newMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.newSelection")); + // les chaines ne doivent pas poser pb, on ne peut pas + // avoir de selection avec espace + newMenuItem.setActionCommand("new selection"); + newMenuItem.addActionListener(this); + add(newMenuItem); + + // new selection + JMenuItem replayMenuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.replaySelection")); + // les chaines ne doivent pas poser pb, on ne peut pas + // avoir de selection avec espace + replayMenuItem.setActionCommand("replay selection"); + replayMenuItem.addActionListener(this); + replayMenuItem.setEnabled(false); // FIXME chatellier 20101126 pas terminé + add(replayMenuItem); } } } @@ -139,9 +150,12 @@ String actionCommand = event.getActionCommand(); // new selection case - if (StringUtils.isEmpty(actionCommand)) { + if ("new selection".equals(actionCommand)) { view.getHandler().showSelectionView(); } + else if ("replay selection".equals(actionCommand)) { + view.getHandler().replaySelection(); + } else { view.getHandler().showSelectionView(actionCommand); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-26 15:42:15 UTC (rev 299) @@ -591,10 +591,10 @@ * @param controlView */ protected void generateHTMLReport(ControlView controlView) { - + PublicationService publicationService = controlView.getContextValue(PublicationService.class); Project project = controlView.getContextValue(Project.class); - + // get error list from table model List<ControlError> controlErrors = controlView.getGlobalControlErrorModel().getControlErrors(); File htmlFile = null; @@ -605,13 +605,8 @@ } catch (CoserBusinessException ex) { throw new CoserException("Can't generate html report", ex); } catch (IOException ex) { - if (htmlFile != null) { - JOptionPane.showMessageDialog(controlView, _("coser.ui.control.htmlReportCantBeOpened", htmlFile.getAbsolutePath()), - _("coser.ui.control.htmlReportError"), JOptionPane.WARNING_MESSAGE); - } - else { - throw new CoserException("Can't open html report", ex); - } + JOptionPane.showMessageDialog(controlView, _("coser.ui.control.htmlReportCantBeOpened", htmlFile.getAbsolutePath()), + _("coser.ui.control.htmlReportError"), JOptionPane.WARNING_MESSAGE); } } 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 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-26 15:42:15 UTC (rev 299) @@ -148,11 +148,9 @@ // initialize la liste de toutes les années // c'est normalement la seule initialisation a faire SelectionDetailsView detailView = view.getSelectionDetailsTab(); - List<String> allYears = projectService.getProjectYears(selection); - selection.setAllYears(allYears); - detailView.getDatesListModel().setYears(allYears); + detailView.getDatesListModel().setYears(selection.getAllYears()); // tout est selectionné par defaut - ((CoserListSelectionModel)detailView.getDatesList().getSelectionModel()).setSelectedObjects(allYears); + ((CoserListSelectionModel)detailView.getDatesList().getSelectionModel()).setSelectedObjects(selection.getSelectedYears()); view.setCreationState(true); Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-26 15:42:15 UTC (rev 299) @@ -63,6 +63,7 @@ coser.ui.mainframe.menu.data.newSelection=New selection coser.ui.mainframe.menu.data.noSelection=No selection coser.ui.mainframe.menu.data.noValidation=Control not validated +coser.ui.mainframe.menu.data.replaySelection=Replay selection coser.ui.mainframe.menu.data.selections=S\u00E9lections coser.ui.mainframe.menu.data.summary=Summary coser.ui.mainframe.menu.file=File @@ -150,9 +151,11 @@ coser.ui.selection.maturitySpecies=L4 \: Species with maturity coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> +coser.ui.selection.replayerror=Replay error coser.ui.selection.saveError=Save error coser.ui.selection.selection.requiredDescription=Selection description is required coser.ui.selection.selection.requiredName=Selection name is required +coser.ui.selection.selectionFilterDescription= coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-26 15:27:53 UTC (rev 298) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-26 15:42:15 UTC (rev 299) @@ -63,6 +63,7 @@ coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection coser.ui.mainframe.menu.data.noValidation=Contr\u00F4le non valid\u00E9 +coser.ui.mainframe.menu.data.replaySelection=Rejouer une s\u00E9lection coser.ui.mainframe.menu.data.selections=S\u00E9lections coser.ui.mainframe.menu.data.summary=R\u00E9sum\u00E9 coser.ui.mainframe.menu.file=Fichier @@ -150,9 +151,11 @@ coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> +coser.ui.selection.replayerror=Erreur de reapplication coser.ui.selection.saveError=Erreur de sauvegarde coser.ui.selection.selection.requiredDescription=La description de la s\u00E9lection est requise coser.ui.selection.selection.requiredName=Le nom de la s\u00E9lection est requis +coser.ui.selection.selectionFilterDescription= coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces

1 0

r298 - trunk/coser-business/src/main/java/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:27:53 +0000 (Fri, 26 Nov 2010) New Revision: 298 Log: Fix TODO Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2010-11-26 15:24:53 UTC (rev 297) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2010-11-26 15:27:53 UTC (rev 298) @@ -31,7 +31,7 @@ import fr.ifremer.coser.storage.DataStorage; /** - * TODO add comment here. + * Common container code for {@link Control} and {@link Selection}. * * @author chatellier * @version $Revision$

1 0

r297 - trunk/coser-business/src/main/java/fr/ifremer/coser/validators
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:24:53 +0000 (Fri, 26 Nov 2010) New Revision: 297 Log: Tab character Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-26 15:23:24 UTC (rev 296) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-26 15:24:53 UTC (rev 297) @@ -41,7 +41,7 @@ * *  * <ul> - * <li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li> + * <li>fieldName - The field name this validator is validating. Required if using Plain-Validator Syntax otherwise not required</li> * <li>expression - The RegExp expression REQUIRED</li> * <li>caseSensitive - Boolean (Optional). Sets whether the expression should be matched against in a case-sensitive way. Default is <code>true</code>.</li> * <li>trim - Boolean (Optional). Sets whether the expression should be trimed before matching. Default is <code>true</code>.</li>

1 0

r296 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:23:24 +0000 (Fri, 26 Nov 2010) New Revision: 296 Log: Duplicated ; Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2010-11-26 15:21:12 UTC (rev 295) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2010-11-26 15:23:24 UTC (rev 296) @@ -128,7 +128,7 @@ * @return */ protected List<ControlError> validate(AbstractDataEntity bean, Category category) { - List<ControlError> result = new ArrayList<ControlError>();; + List<ControlError> result = new ArrayList<ControlError>(); try { // obligatoire pour les appel dans les thread et swing EDT ActionContext.setContext(context);

1 0

r295 - trunk/coser-business/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org 26 Nov '10

26 Nov '10

Author: chatellier Date: 2010-11-26 15:21:12 +0000 (Fri, 26 Nov 2010) New Revision: 295 Log: final attribute Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2010-11-26 14:49:50 UTC (rev 294) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2010-11-26 15:21:12 UTC (rev 295) @@ -48,7 +48,7 @@ public static final String BRACKET_STRING_SEPARATOR = ";"; /** Pattern pour ajouter les suffix (probleme de replace sur le 'dernier' .) */ - public static Pattern FILENAME_SUFFIX_PATTERN = Pattern.compile("^(.+)(\\.[^\\.]+)$"); + public static final Pattern FILENAME_SUFFIX_PATTERN = Pattern.compile("^(.+)(\\.[^\\.]+)$"); /** * Converti une collection de string en une string

1 0