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

r184 - in trunk/coser-business/src/main/java/fr/ifremer/coser: command services
by chatellier＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: chatellier Date: 2010-11-08 13:43:33 +0000 (Mon, 08 Nov 2010) New Revision: 184 Log: Fix duplicated line detection. Fix tests Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2010-11-08 13:38:54 UTC (rev 183) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2010-11-08 13:43:33 UTC (rev 184) @@ -39,7 +39,6 @@ import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserConstants; import fr.ifremer.coser.CoserUtils; -import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.AbstractDataContainer; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.data.Catch; 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-08 13:38:54 UTC (rev 183) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-08 13:43:33 UTC (rev 184) @@ -587,6 +587,8 @@ // 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, Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-08 13:38:54 UTC (rev 183) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-08 13:43:33 UTC (rev 184) @@ -190,12 +190,14 @@ * @return les erreurs de validation */ public List<ValidationError> validateCategory(Control control, Category category, ProgressMonitor progress) { + // validation de la category seule (generique) List<ValidationError> errors = validateCategoryXWork(control, category, progress); + // validation specifique de la category List<ValidationError> specificErrors = validateCategorySpecific(control, category, progress); if (specificErrors != null) { errors.addAll(specificErrors); } - + // cas particulier, s'il n'y a aucune erreur, on ajout une erreur de // type info pour dire qu'il n'y a pas d'erreur if (errors.isEmpty()) { @@ -288,7 +290,7 @@ } // check for duplicated lines - String uniqueDataKey = getSignificantData(line); + String uniqueDataKey = getSignificantData(category, line); if (uniqueDataKeys.contains(uniqueDataKey)) { ValidationError error = new ValidationError(); error.setLevel(ValidationLevel.ERROR); @@ -306,18 +308,57 @@ /** * Retourne sous forme de clé la partie significative des données. - * Donc sans le numéro de ligne. + * Donc sans le numéro de ligne suivant la catégorie. + * * Utilisé pour la detection des doublons. * + * CAPTURES + * Vérifier l'unicité sur : "Campagne", "Annee", "Trait", "Espece" + * + * STRATES + * Vérifier l'unicité sur : "Campagne", "Strate" + * + * TAILLES + * Vérifier l'unicité sur : Campagne", "Annee", "Trait", "Espece", "Sexe", "Maturite", "Longueur" + * + * TRAITS + * Vérifier l'unicité sur : "Campagne", "Annee", "Trait", "Mois" + * + * @param category category * @param data data * @return string key */ - protected String getSignificantData(String[] data) { + protected String getSignificantData(Category category, String[] data) { StringBuilder sb = new StringBuilder(); for (int index = 0 ; index < data.length ; ++index) { + // never count index line if (index != AbstractDataEntity.INDEX_LINE) { - sb.append(data[index]).append(';'); + switch (category) { + case CATCH: + if (index == Catch.INDEX_SURVEY || index == Catch.INDEX_YEAR || index == Catch.INDEX_HAUL || index == Catch.INDEX_SPECIES) { + sb.append(data[index]).append(';'); + } + break; + case HAUL: + if (index == Haul.INDEX_SURVEY || index == Haul.INDEX_YEAR || index == Haul.INDEX_HAUL || index == Haul.INDEX_MONTH) { + sb.append(data[index]).append(';'); + } + break; + case LENGTH: + if (index == Length.INDEX_SURVEY || index == Length.INDEX_YEAR || index == Length.INDEX_HAUL || + index == Length.INDEX_SPECIES || index == Length.INDEX_SEX || index == Length.INDEX_MATURITY || index == Length.INDEX_LENGTH) { + sb.append(data[index]).append(';'); + } + break; + case STRATA: + if (index == Strata.INDEX_SURVEY || index == Strata.INDEX_STRATUM) { + sb.append(data[index]).append(';'); + } + break; + } + } + } return sb.toString(); } @@ -415,27 +456,6 @@ // sauvegarde la premiere ligne qui correspond a un regroupement de clé firstLineForKey.put(key, lineNumber); } - - // autre validation (rien a voir avec le reste attention) - // Vérifier que le nombre d'individus dans CAPT$Nombre n'est pas 0 si le poids dans CAPT$Poids>0. - /*String poidsValue = tuple[Catch.INDEX_WEIGHT]; - try { - Double poids = Double.valueOf(poidsValue); - if (poids > 0 && nombre <= 0) { - ValidationError error = new ValidationError(); - error.setLevel(ValidationLevel.ERROR); - error.setLineNumber(lineNumber); - error.setMessage(_("coser.business.control.error.noCatchNumberWithWeight")); - validationErrors.add(error); - } - } - catch (NumberFormatException ex) { - // par trop grave, normalement les données deviennent - // valide au fil de la validation - if (log.isWarnEnabled()) { - log.warn("Can't parse '" + poidsValue + "' as double"); - } - }*/ } catch (NumberFormatException ex) { // par trop grave, normalement les données deviennent

1 0

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

08 Nov '10

Author: chatellier Date: 2010-11-08 13:38:54 +0000 (Mon, 08 Nov 2010) New Revision: 183 Log: Fix import 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-08 13:37:01 UTC (rev 182) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-08 13:38:54 UTC (rev 183) @@ -36,7 +36,6 @@ import java.util.Locale; import java.util.Map; -import javax.mail.Session; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JOptionPane;

1 0

r182 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: . control
by chatellier＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: chatellier Date: 2010-11-08 13:37:01 +0000 (Mon, 08 Nov 2010) New Revision: 182 Log: Add split pane into control ui and restore ui state Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 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-08 10:22:45 UTC (rev 181) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-08 13:37:01 UTC (rev 182) @@ -36,6 +36,7 @@ import java.util.Locale; import java.util.Map; +import javax.mail.Session; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JOptionPane; @@ -381,6 +382,11 @@ ControlView controlView = new ControlView(view); controlView.setHandler(new ControlHandler()); + + // restore session size + SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); + session.add(controlView); + setMainComponent(controlView); } catch (CoserBusinessException ex) { throw new CoserException("Can't load control data", ex); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-08 10:22:45 UTC (rev 181) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-08 13:37:01 UTC (rev 182) @@ -22,7 +22,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<Table> +<Table name="controlView"> <script><![CDATA[ void $afterCompleteSetup() { // bean validation @@ -59,91 +59,90 @@ </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> - <JScrollPane> - <fr.ifremer.coser.ui.control.ControlDataTableModel id="controlDataTableModel" constructorParams="this" /> - <JTable id='controlDataTable' model="{controlDataTableModel}" - onMouseClicked="getHandler().showDataTableContextMenu(this, event)"/> - <ListSelectionModel id="controlDataTableSelectionModel" javaBean="controlDataTable.getSelectionModel()" - onValueChanged="getHandler().controlDataTableSelectionChanged(this, event)" /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane id="editionScrollPane"> - <Table> - <row> - <cell weightx="1" weighty="1" fill="both" columns="3"> - <JPanel id="editionPanel" layout="{new GridBagLayout()}"/> - </cell> - </row> - <row> - <cell weightx="1" anchor="east"> - <JButton id="controlDataValidButton" text="coser.ui.common.valid" - onActionPerformed="getHandler().validDataModification(this)" - enabled="false" /> - </cell> - <cell> - <JButton id="controlDataCancelButton" text="coser.ui.common.cancel" - onActionPerformed="getHandler().cancelDataModification(this)" - enabled="false" /> - </cell> - <cell> - <JButton id="controlDataDeleteButton" text="coser.ui.control.deleteLine" - onActionPerformed="getHandler().deleteData(this)" - enabled="false" /> - </cell> - </row> - </Table> + <JSplitPane name="splitpaneDataDetails" orientation="{JSplitPane.VERTICAL_SPLIT}"> + <JScrollPane> + <fr.ifremer.coser.ui.control.ControlDataTableModel id="controlDataTableModel" constructorParams="this" /> + <JTable id='controlDataTable' model="{controlDataTableModel}" + onMouseClicked="getHandler().showDataTableContextMenu(this, event)"/> + <ListSelectionModel id="controlDataTableSelectionModel" javaBean="controlDataTable.getSelectionModel()" + onValueChanged="getHandler().controlDataTableSelectionChanged(this, event)" /> + </JScrollPane> - </JScrollPane> + <JSplitPane name="splitpaneDetail" orientation="{JSplitPane.VERTICAL_SPLIT}"> + <JSplitPane name="splitpaneDataDetailError"> + <JScrollPane id="editionScrollPane"> + <Table> + <row> + <cell weightx="1" fill="horizontal"> + <JButton id="controlDataValidButton" text="coser.ui.common.valid" + onActionPerformed="getHandler().validDataModification(this)" + enabled="false" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JButton id="controlDataCancelButton" text="coser.ui.common.cancel" + onActionPerformed="getHandler().cancelDataModification(this)" + enabled="false" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JButton id="controlDataDeleteButton" text="coser.ui.control.deleteLine" + onActionPerformed="getHandler().deleteData(this)" + enabled="false" /> + </cell> + </row> + <row> + <cell weightx="1" weighty="1" fill="both" columns="3"> + <JPanel id="editionPanel" layout="{new GridBagLayout()}"/> + </cell> + </row> + </Table> + </JScrollPane> + + <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' /> + <fr.ifremer.coser.data.Catch id="beanCatch" javaBean="null" /> + <fr.ifremer.coser.data.Haul id="beanHaul" javaBean="null" /> + <fr.ifremer.coser.data.Strata id="beanStrata" javaBean="null" /> + <fr.ifremer.coser.data.Length id="beanLength" javaBean="null" /> + <BeanValidator id='validatorCatch' bean='beanCatch' + uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" + errorTableModel="errorsTableModel" /> + <BeanValidator id='validatorHaul' bean='beanHaul' + uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" + errorTableModel="errorsTableModel" /> + <BeanValidator id='validatorStrata' bean='beanStrata' + uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" + errorTableModel="errorsTableModel" /> + <BeanValidator id='validatorLength' bean='beanLength' + uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" + errorTableModel="errorsTableModel" /> + <JScrollPane> + <JTable id='validationMessagesTable' autoCreateRowSorter='true' + rowSelectionAllowed='true' + model='{errorsTableModel}' /> + </JScrollPane> + </JSplitPane> + + <JSplitPane name="splitpaneGlobalErrorComment"> + <JScrollPane> + <GlobalValidationModel id="globalValidationModel" /> + <JXTreeTable id='validationGlobalErrorsTable' treeTableModel="{globalValidationModel}" + rootVisible="false" showsRootHandles="true" + treeCellRenderer="{new ControlValidationRenderer()}" + onMouseClicked="getHandler().showGlobalErrorTableContextMenu(this, event)" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> + <javax.swing.tree.TreeSelectionModel id="globalValidationTableSelectionModel" + javaBean="validationGlobalErrorsTable.getTreeSelectionModel()" + onValueChanged="getHandler().showSelectedError(this, event)" /> + </JScrollPane> + + <JScrollPane> + <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> + </JScrollPane> + </JSplitPane> + </JSplitPane> + </JSplitPane> </cell> - <cell fill="both" weightx="1" weighty="1"> - <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' /> - <fr.ifremer.coser.data.Catch id="beanCatch" javaBean="null" /> - <fr.ifremer.coser.data.Haul id="beanHaul" javaBean="null" /> - <fr.ifremer.coser.data.Strata id="beanStrata" javaBean="null" /> - <fr.ifremer.coser.data.Length id="beanLength" javaBean="null" /> - <BeanValidator id='validatorCatch' bean='beanCatch' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" - errorTableModel="errorsTableModel" /> - <BeanValidator id='validatorHaul' bean='beanHaul' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" - errorTableModel="errorsTableModel" /> - <BeanValidator id='validatorStrata' bean='beanStrata' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" - errorTableModel="errorsTableModel" /> - <BeanValidator id='validatorLength' bean='beanLength' - uiClass="jaxx.runtime.validator.swing.ui.TranslucentValidationUI" - errorTableModel="errorsTableModel" /> - <JScrollPane> - <JTable id='validationMessagesTable' autoCreateRowSorter='true' - rowSelectionAllowed='true' - model='{errorsTableModel}' /> - </JScrollPane> - </cell> </row> <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <GlobalValidationModel id="globalValidationModel" /> - <JXTreeTable id='validationGlobalErrorsTable' treeTableModel="{globalValidationModel}" - rootVisible="false" showsRootHandles="true" - treeCellRenderer="{new ControlValidationRenderer()}" - onMouseClicked="getHandler().showGlobalErrorTableContextMenu(this, event)" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}" /> - <javax.swing.tree.TreeSelectionModel id="globalValidationTableSelectionModel" - javaBean="validationGlobalErrorsTable.getTreeSelectionModel()" - onValueChanged="getHandler().showSelectedError(this, event)" /> - </JScrollPane> - </cell> - <cell fill="both" weighty="1"> - <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> - </JScrollPane> - </cell> - </row> - <row> <cell anchor="center" weightx="1" fill="horizontal" columns="2"> <ControlProgressBar id="checkProgressBar" stringPainted="true" /> </cell>

1 0

r181 - trunk/coser-business/src/main/resources/fr/ifremer/coser/data
by chatellier＠users.labs.libre-entreprise.org 08 Nov '10

08 Nov '10

Author: chatellier Date: 2010-11-08 10:22:45 +0000 (Mon, 08 Nov 2010) New Revision: 181 Log: Deplacement du nombre de d?\195?\169cimale pour les traits en fatal Added: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-fatal-validation.xml Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml Modified: trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-11-05 17:21:38 UTC (rev 180) +++ trunk/coser-business/src/main/resources/fr/ifremer/coser/data/Haul-error-validation.xml 2010-11-08 10:22:45 UTC (rev 181) @@ -1,6 +1,6 @@  +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + <field name="sweptSurface"> + <field-validator type="regex"> + <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> + <message>lat must contains at least 5 decimal</message> + </field-validator> + </field> + <field name="lat"> + <field-validator type="regex"> + <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> + <message>lat must contains at least 5 decimal</message> + </field-validator> + </field> + <field name="long"> + <field-validator type="regex"> + <param name="expression">\-?[0-9]+\.[0-9]{3,}</param> + <message>long must contains at least 5 decimal</message> + </field-validator> + </field> +</validators> \ No newline at end of file

1 0

r180 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services resources/i18n
by chatellier＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: chatellier Date: 2010-11-05 17:21:38 +0000 (Fri, 05 Nov 2010) New Revision: 180 Log: Ajout d'une erreur de type info pour signaler qu'il n'y a pas d'erreur. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 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/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-05 17:04:00 UTC (rev 179) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-05 17:21:38 UTC (rev 180) @@ -195,6 +195,15 @@ if (specificErrors != null) { errors.addAll(specificErrors); } + + // cas particulier, s'il n'y a aucune erreur, on ajout une erreur de + // type info pour dire qu'il n'y a pas d'erreur + if (errors.isEmpty()) { + ValidationError noErrorError = new ValidationError(); + noErrorError.setLevel(ValidationLevel.INFO); + noErrorError.setMessage(_("coser.business.control.noerrorfound")); + errors.add(noErrorError); + } return errors; } 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 2010-11-05 17:04:00 UTC (rev 179) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-05 17:21:38 UTC (rev 180) @@ -42,6 +42,7 @@ coser.business.control.error.minObservationCount= coser.business.control.error.minObservationCountDetail= coser.business.control.error.noCatchNumberWithWeight= +coser.business.control.noerrorfound=No error found coser.business.control.step.observation= coser.business.control.step.xworks= coser.business.line=Line 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 2010-11-05 17:04:00 UTC (rev 179) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-05 17:21:38 UTC (rev 180) @@ -40,6 +40,7 @@ coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9, mais capture non pr\u00E9sente +coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne

1 0

r179 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: chatellier Date: 2010-11-05 17:04:00 +0000 (Fri, 05 Nov 2010) New Revision: 179 Log: View vue Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 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-05 17:03:29 UTC (rev 178) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-05 17:04:00 UTC (rev 179) @@ -49,7 +49,7 @@ coser.ui.mainframe.menu.options=Options coser.ui.mainframe.menu.quit=Quitter coser.ui.mainframe.menu.validators=Validateurs -coser.ui.mainframe.menu.view=View +coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainframe.menu.data=Donn\u00E9es coser.ui.mainframe.menu.data.control=Contr\u00F4le

1 0

r178 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: chatellier Date: 2010-11-05 17:03:29 +0000 (Fri, 05 Nov 2010) New Revision: 178 Log: Renommage du menu fenetre en "data" Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.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-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-11-05 16:57:42 UTC (rev 177) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-11-05 17:03:29 UTC (rev 178) @@ -39,10 +39,10 @@ <JMenuItem text="coser.ui.mainframe.menu.quit" onActionPerformed="getHandler().quit()"/> </JMenu> - <JMenu id='menuWindow' text="coser.ui.mainframe.menu.window" enabled="false"> - <JMenuItem text="coser.ui.mainframe.menu.window.control" onActionPerformed="getHandler().showControlView()"/> + <JMenu id='menuWindow' text="coser.ui.mainframe.menu.data" enabled="false"> + <JMenuItem text="coser.ui.mainframe.menu.data.control" onActionPerformed="getHandler().showControlView()"/> <SelectionsListMenuItem id="menuWindowSelectionMenuItem" - text="coser.ui.mainframe.menu.window.selection" constructorParams="this" /> + text="coser.ui.mainframe.menu.data.selection" constructorParams="this" /> </JMenu> <JMenu id='menuOptions' text="coser.ui.mainframe.menu.options"> 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-05 16:57:42 UTC (rev 177) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/SelectionsListMenuItem.java 2010-11-05 17:03:29 UTC (rev 178) @@ -94,7 +94,7 @@ Map<String, Selection> selections = project.getSelections(); if (selections == null || selections.isEmpty()) { - JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.window.noSelection")); + JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.noSelection")); menuItem.setFont(menuItem.getFont().deriveFont(Font.ITALIC)); menuItem.setEnabled(false); add(menuItem); @@ -114,7 +114,7 @@ } // new selection - JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.window.newSelection")); + JMenuItem menuItem = new JMenuItem(_("coser.ui.mainframe.menu.data.newSelection")); menuItem.setActionCommand(""); // peut pas etre null, c'est nul ! menuItem.addActionListener(this); add(menuItem); 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-05 16:57:42 UTC (rev 177) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-05 17:03:29 UTC (rev 178) @@ -51,11 +51,11 @@ coser.ui.mainframe.menu.validators=Validators coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Theme -coser.ui.mainframe.menu.window=Window -coser.ui.mainframe.menu.window.control=Control -coser.ui.mainframe.menu.window.newSelection=New selection -coser.ui.mainframe.menu.window.noSelection=No selection -coser.ui.mainframe.menu.window.selection=S\u00E9lection +coser.ui.mainframe.menu.data=Data +coser.ui.mainframe.menu.data.control=Control +coser.ui.mainframe.menu.data.newSelection=New selection +coser.ui.mainframe.menu.data.noSelection=No selection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Capture file \: coser.ui.project.createProject=Create project 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-05 16:57:42 UTC (rev 177) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-05 17:03:29 UTC (rev 178) @@ -51,11 +51,11 @@ coser.ui.mainframe.menu.validators=Validateurs coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me -coser.ui.mainframe.menu.window=Fen\u00EAtre -coser.ui.mainframe.menu.window.control=Contr\u00F4le -coser.ui.mainframe.menu.window.newSelection=Nouvelle s\u00E9lection -coser.ui.mainframe.menu.window.noSelection=Aucune s\u00E9lection -coser.ui.mainframe.menu.window.selection=S\u00E9lection +coser.ui.mainframe.menu.data=Donn\u00E9es +coser.ui.mainframe.menu.data.control=Contr\u00F4le +coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection +coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet

1 0

r177 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: chatellier Date: 2010-11-05 16:57:42 +0000 (Fri, 05 Nov 2010) New Revision: 177 Log: Le logiciel doit permettre de param?\195?\169trer l'endroit o?\195?\185 on place les dossiers et fichiers Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-05 16:52:45 UTC (rev 176) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-05 16:57:42 UTC (rev 177) @@ -76,11 +76,6 @@ String result = getOption(CoserBusinessOption.REFERENCE_SPECIES.key); return result; } - - public String getReferenceZonePath() { - String result = getOption(CoserBusinessOption.REFERENCE_ZONES.key); - return result; - } public String getReferenceTypeEspecesPath() { String result = getOption(CoserBusinessOption.REFERENCE_TYPE_ESPECES.key); @@ -99,7 +94,6 @@ VALIDATOR_DIRECTORY("coser.validator.directory", _("coser.config.validator.directory.description"), "${" + DATABASE_DIRECTORY.key + "}" + File.separator + "validators", String.class, false, false), REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), - REFERENCE_ZONES("coser.reference.zones", _("coser.config.reference.zones.description"), "", String.class, false, false), REFERENCE_TYPE_ESPECES("coser.reference.typeEspeces", _("coser.config.reference.typeEspeces.description"), "", String.class, false, false), OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false); 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-05 16:52:45 UTC (rev 176) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-05 16:57:42 UTC (rev 177) @@ -151,12 +151,13 @@ // category main modelBuilder.addCategory(_("coser.config.category.main"), _("coser.config.category.main.description")); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.DATABASE_DIRECTORY); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.PROJECTS_DIRECTORY); + + // category control + modelBuilder.addCategory(_("coser.config.category.control"), _("coser.config.category.control.description")); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); - modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_ZONES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES); - - // category control - modelBuilder.addCategory(_("coser.config.category.control"), _("coser.config.category.control.description")); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.OBSERVATION_NOBSMIN); ConfigUI configUI = modelBuilder.buildUI(view, _("coser.config.category.main"));

1 0

r176 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 05 Nov '10

05 Nov '10

Author: chatellier Date: 2010-11-05 16:52:45 +0000 (Fri, 05 Nov 2010) New Revision: 176 Log: pr?\195?\169ciser : fichier de r?\195?\169f?\195?\169rence = Reftax Modified: 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-ui/src/main/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-05 16:50:50 UTC (rev 175) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-05 16:52:45 UTC (rev 176) @@ -71,7 +71,7 @@ coser.ui.project.stratesFile=Strates file \: coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file -coser.ui.project.usedReferenceSpeciesFile=Current reference file \: +coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: coser.ui.result.addNewResult=Save result coser.ui.result.addOtherDataFile=Add file coser.ui.result.availableDataTitle=Available results \: 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-05 16:50:50 UTC (rev 175) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-05 16:52:45 UTC (rev 176) @@ -71,7 +71,7 @@ coser.ui.project.stratesFile=Fichiers des strates \: coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence -coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 \: +coser.ui.project.usedReferenceSpeciesFile=Fichier de r\u00E9f\u00E9rence utilis\u00E9 (Reftax) \: coser.ui.result.addNewResult=Enregistrer le r\u00E9sultat coser.ui.result.addOtherDataFile=Ajouter un fichier coser.ui.result.availableDataTitle=R\u00E9sultats disponibles \:

1 0

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

05 Nov '10

Author: chatellier Date: 2010-11-05 16:50:50 +0000 (Fri, 05 Nov 2010) New Revision: 175 Log: Move check button to toolbar Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-05 16:39:07 UTC (rev 174) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-05 16:50:50 UTC (rev 175) @@ -42,12 +42,14 @@ <JButton id="saveButton" icon="disk.png" text="coser.ui.control.save" enabled="false" onActionPerformed="getHandler().saveControl(this)" /> - <JSeparator /> + <JToolBar.Separator /> <fr.ifremer.coser.ui.control.ControlCategoryListModel id="categoryComboBoxModel" /> <JComboBox id="categoryComboBox" model="{categoryComboBoxModel}" renderer="{new fr.ifremer.coser.ui.control.ControlCategoryListRenderer()}" onActionPerformed="getHandler().categoryChanged(this, event)"/> - <JSeparator /> + <JToolBar.Separator /> + <JButton text="coser.ui.validation.checkData" onActionPerformed="getHandler().checkData(this)" /> + <JToolBar.Separator /> <JButton icon="chart_curve.png" text="coser.ui.graph.compareNumberCatchSize" onActionPerformed="getHandler().displayCompareNumberCatchGraph(this)"/> <JButton icon="chart_bar.png" text="coser.ui.graph.lengthStructure" @@ -142,11 +144,8 @@ </cell> </row> <row> - <cell anchor="center" weightx="1" fill="horizontal"> + <cell anchor="center" weightx="1" fill="horizontal" columns="2"> <ControlProgressBar id="checkProgressBar" stringPainted="true" /> </cell> - <cell anchor="center" weightx="1"> - <JButton text="coser.ui.validation.checkData" onActionPerformed="getHandler().checkData(this)" /> - </cell> </row> </Table>

1 0