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

r363 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/control java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 6, 2010

Dec. 6, 2010

Author: chatellier Date: 2010-12-06 10:11:28 +0000 (Mon, 06 Dec 2010) New Revision: 363 Log: Ajout du nombre de selection sur les labels des listes. Ajout de messages de confirmation Modified: 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/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 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/control/ControlHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-06 09:19:18 UTC (rev 362) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-12-06 10:11:28 UTC (rev 363) @@ -819,7 +819,7 @@ } /** - * Save project after control. + * Save project after control and display message. * * Can't save if : * - validation contains error @@ -828,6 +828,17 @@ * @param view view */ public void saveControl(ControlView view) { + saveProjectControl(view); + JOptionPane.showMessageDialog(view, _("coser.ui.control.controlSaved"), + _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_MESSAGE); + } + + /** + * Save project after control. + * + * @param view view + */ + protected void saveProjectControl(ControlView view) { Project project = view.getContextValue(Project.class); ProjectService service = view.getContextValue(ProjectService.class); @@ -1012,7 +1023,7 @@ public void validControl(ControlView view) { Project project = view.getContextValue(Project.class); project.getControl().setValidated(true); - saveControl(view); + saveProjectControl(view); JOptionPane.showMessageDialog(view, _("coser.ui.control.controlValidated"), _("coser.ui.control.controlTitle"), JOptionPane.INFORMATION_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-12-06 09:19:18 UTC (rev 362) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-12-06 10:11:28 UTC (rev 363) @@ -390,9 +390,15 @@ if (view.isCreationState()) { service.createProjectSelection(project, selection); selectionView.setCreationState(false); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionCreated"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } else { service.saveProjectSelection(project, selection); + + JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } } catch (CoserBusinessException ex) { @@ -405,11 +411,23 @@ } /** + * Sauvegarde la sélection (partie listes de selection) + * et affiche un message utilisateur. + * + * @param view parent view + */ + public void saveSelection(SelectionListsView view) { + saveProjectSelection(view); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionSaved"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); + } + + /** * Sauvegarde la sélection (partie listes de selection). * * @param view parent view */ - public void saveSelection(SelectionListsView view) { + protected void saveProjectSelection(SelectionListsView view) { Project project = view.getContextValue(Project.class); Selection selection = view.getContextValue(Selection.class); ProjectService service = view.getContextValue(ProjectService.class); @@ -476,7 +494,7 @@ boolean canBeValidated = checkSelectionListComments(view, selection); if (canBeValidated) { selection.setValidated(true); - saveSelection(view); + saveProjectSelection(view); JOptionPane.showMessageDialog(view, _("coser.ui.selection.selectionValidated"), _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); @@ -502,8 +520,7 @@ double occurrence = selection.getOccurrenceFilter(); double density = selection.getDensityFilter(); Set<String> originalOccDensSelection = getOccurenceDensityFilteredSpecies(view, occurrence, density); - System.out.println("1 = " + currentOccDensSelection); - System.out.println("2 = " + originalOccDensSelection); + if (!currentOccDensSelection.equals(originalOccDensSelection) && StringUtils.isBlank(selection.getSelectedSpeciesOccDensComment())) { JOptionPane.showMessageDialog(view, _("coser.ui.selection.nonJustifiedOccurenceDensity"), @@ -643,8 +660,11 @@ catch (CoserBusinessException ex) { throw new CoserException("Can't merge species", ex); } + updateSelectionSpecies(parent); view.dispose(); + JOptionPane.showMessageDialog(view, _("coser.ui.selection.speciesMerged"), + _("coser.ui.selection.selectionTitle"), JOptionPane.INFORMATION_MESSAGE); } } 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-12-06 09:19:18 UTC (rev 362) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-12-06 10:11:28 UTC (rev 363) @@ -59,16 +59,16 @@ </row> <row> <cell fill="horizontal" columns="2"> - <JXTitledSeparator title="coser.ui.selection.allSpecies" /> + <JXTitledSeparator id="allSpeciesLabel" title='{_("coser.ui.selection.allSpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator title="coser.ui.selection.occurenceDensitySpecies" /> + <JXTitledSeparator id="occurrenceDensitySpeciesLabel" title='{_("coser.ui.selection.occurrenceDensitySpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator title="coser.ui.selection.sizeAllYearSpecies" /> + <JXTitledSeparator id="sizeAllYearSpeciesLabel" title='{_("coser.ui.selection.sizeAllYearSpecies", 0, 0)}' /> </cell> <cell fill="horizontal" columns="2"> - <JXTitledSeparator title="coser.ui.selection.maturitySpecies" /> + <JXTitledSeparator id="maturitySpeciesLabel" title='{_("coser.ui.selection.maturitySpecies", 0, 0)}' /> </cell> </row> <row> @@ -99,33 +99,40 @@ <row> <cell weighty="1" weightx="1" fill="both" columns="2"> <JScrollPane> - <SpecyListModel id="selectionAllSpeciesListModel" /> + <SpecyListModel id="selectionAllSpeciesListModel" + onContentsChanged='allSpeciesLabel.setTitle(_("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> <JList id="selectionAllSpeciesList" model="{selectionAllSpeciesListModel}" selectionModel="{new CoserListSelectionModel(selectionAllSpeciesList.getSelectionModel(), selectionAllSpeciesListModel)}" - enabled="false" /> + enabled="false" + onValueChanged='allSpeciesLabel.setTitle(_("coser.ui.selection.allSpecies", selectionAllSpeciesList.getSelectedIndices().length, selectionAllSpeciesList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> - <OccurrenceDensitySpecyListModel id="selectionOccurrenceDensityListModel" /> + <OccurrenceDensitySpecyListModel id="selectionOccurrenceDensityListModel" + onContentsChanged='occurrenceDensitySpeciesLabel.setTitle(_("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> <JList id="selectionOccurrenceDensityList" model="{selectionOccurrenceDensityListModel}" cellRenderer="{new SpecyListOccDensRenderer(selectionOccurrenceDensityListModel)}" selectionModel="{new CoserListSelectionModel(selectionOccurrenceDensityList.getSelectionModel(), selectionOccurrenceDensityListModel)}" - onValueChanged="applyOccDensFilter.setEnabled(true)" /> + onValueChanged='applyOccDensFilter.setEnabled(true); occurrenceDensitySpeciesLabel.setTitle(_("coser.ui.selection.occurrenceDensitySpecies", selectionOccurrenceDensityList.getSelectedIndices().length, selectionOccurrenceDensityList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> - <SizeAllYearSpecyListModel id="selectionSizeAllYearListModel" /> + <SizeAllYearSpecyListModel id="selectionSizeAllYearListModel" + onContentsChanged='sizeAllYearSpeciesLabel.setTitle(_("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> <JList id="selectionSizeAllYearList" model="{selectionSizeAllYearListModel}" - selectionModel="{new CoserListSelectionModel(selectionSizeAllYearList.getSelectionModel(), selectionSizeAllYearListModel)}"/> + selectionModel="{new CoserListSelectionModel(selectionSizeAllYearList.getSelectionModel(), selectionSizeAllYearListModel)}" + onValueChanged='sizeAllYearSpeciesLabel.setTitle(_("coser.ui.selection.sizeAllYearSpecies", selectionSizeAllYearList.getSelectedIndices().length, selectionSizeAllYearList.getModel().getSize()))' /> </JScrollPane> </cell> <cell weightx="1" fill="both" columns="2"> <JScrollPane> - <MaturitySpecyListModel id="selectionMaturityListModel" /> + <MaturitySpecyListModel id="selectionMaturityListModel" + onContentsChanged='maturitySpeciesLabel.setTitle(_("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> <JList id="selectionMaturityList" model="{selectionMaturityListModel}" - selectionModel="{new CoserListSelectionModel(selectionMaturityList.getSelectionModel(), selectionMaturityListModel)}"/> + selectionModel="{new CoserListSelectionModel(selectionMaturityList.getSelectionModel(), selectionMaturityListModel)}" + onValueChanged='maturitySpeciesLabel.setTitle(_("coser.ui.selection.maturitySpecies", selectionMaturityList.getSelectedIndices().length, selectionMaturityList.getModel().getSize()))' /> </JScrollPane> </cell> </row> 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-12-06 09:19:18 UTC (rev 362) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-06 10:11:28 UTC (rev 363) @@ -25,6 +25,7 @@ coser.ui.control.confirmDeletionMessage=Are you sure you want to delete this data ? coser.ui.control.confirmDeletionTitle=Confirm delete coser.ui.control.confirmDeletionsMessage=Are you sure you want to delete %d selected lines ? +coser.ui.control.controlSaved=Control saved. coser.ui.control.controlTitle=Control coser.ui.control.controlValidated=Control validated. coser.ui.control.dataMenuDeleteSelected=Deleted selected lines @@ -141,7 +142,7 @@ coser.ui.result.table.resultName=Result name coser.ui.result.table.rsufiVersion=RSufi Version coser.ui.result.validNewResult=Add this result -coser.ui.selection.allSpecies=L1 \: All species +coser.ui.selection.allSpecies=L1 \: All species (%d/%d) coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error coser.ui.selection.detail.mainAccordion=Details @@ -175,28 +176,31 @@ coser.ui.selection.fusion.title=Merge coser.ui.selection.fusionError=Merge error coser.ui.selection.invalidFusionName=Selection fusion name not found in referential \! -coser.ui.selection.maturitySpecies=L4 \: Species with maturity +coser.ui.selection.maturitySpecies=L4 \: Species with maturity (%d/%d) coser.ui.selection.nonJustifiedMaturity=Maturity species list is not all selected.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedOccurenceDensity=Filtered list selection doesn't match filter selection.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedSizeAllYear=Size all year species list is not all selected.\nYou must justify this selection with a comment. coser.ui.selection.nonJustifiedTitle=Unjustified selection -coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species +coser.ui.selection.occurrenceDensitySpecies=L2 \: Filtered species (%d/%d) 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.selectionCreated=Selection created. coser.ui.selection.selectionFilterDescription=Coser selection (*.selection) +coser.ui.selection.selectionSaved=Selection saved. coser.ui.selection.selectionTitle=Selection coser.ui.selection.selectionValidated=Selection validated. -coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year +coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year (%d/%d) coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu +coser.ui.selection.speciesMerged=Species merged. coser.ui.selection.tab.details=Selection details coser.ui.selection.tab.lists=Species lists coser.ui.selection.tab.rsufi=RSufi coser.ui.validators.cancel=Cancel -coser.ui.validators.deleteValidator=Supprimer +coser.ui.validators.deleteValidator=Delete coser.ui.validators.description=Application must be restarted after validators modification. coser.ui.validators.entity=Entity coser.ui.validators.newValidator=New Validator 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-12-06 09:19:18 UTC (rev 362) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-06 10:11:28 UTC (rev 363) @@ -1,7 +1,7 @@ coser.config.application.version.description=Version de l'application coser.config.category.configuration=Configuration coser.config.category.configuration.description=Configuration (donn\u00E9es num\u00E9riques) -coser.config.category.misc=Disers +coser.config.category.misc=Divers coser.config.category.misc.description=Divers coser.config.category.path=Chemins coser.config.category.path.description=Configuration des fichiers et r\u00E9pertoires @@ -25,6 +25,7 @@ coser.ui.control.confirmDeletionMessage=\u00CAtes vous s\u00FBr de vouloir supprimer cette donn\u00E9e ? coser.ui.control.confirmDeletionTitle=Confirmation de suppression coser.ui.control.confirmDeletionsMessage=\u00CAtes vous s\u00FBr de vouloir supprimer les %d lignes s\u00E9lectionn\u00E9es ? +coser.ui.control.controlSaved=Contr\u00F4le sauv\u00E9. coser.ui.control.controlTitle=Contr\u00F4le coser.ui.control.controlValidated=Contr\u00F4le valid\u00E9. coser.ui.control.dataMenuDeleteSelected=Supprimer les lignes s\u00E9lectionn\u00E9es @@ -141,7 +142,7 @@ coser.ui.result.table.resultName=Nom du r\u00E9sultat coser.ui.result.table.rsufiVersion=Version de RSufi coser.ui.result.validNewResult=Ajouter le r\u00E9sultat -coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces +coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces (%d/%d) coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.detail.mainAccordion=D\u00E9tails @@ -175,23 +176,26 @@ coser.ui.selection.fusion.title=Fusion coser.ui.selection.fusionError=Erreur de fusion coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! -coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 +coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 (%d/%d) coser.ui.selection.nonJustifiedMaturity=La liste esp\u00E8ces avec maturit\u00E9 n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedOccurenceDensity=La s\u00E9lection de la liste filtr\u00E9e ne correspond pas \u00E0 la s\u00E9lection op\u00E9r\u00E9e par le filtre.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedSizeAllYear=La liste esp\u00E8ces avec des tailles pour toutes les ann\u00E9es n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedTitle=S\u00E9lection non justifi\u00E9e -coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es +coser.ui.selection.occurrenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es (%d/%d) 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.selectionCreated=S\u00E9lection cr\u00E9\u00E9e coser.ui.selection.selectionFilterDescription=Coser s\u00E9lection (*.selection) +coser.ui.selection.selectionSaved=S\u00E9lection sauv\u00E9e. coser.ui.selection.selectionTitle=S\u00E9lection coser.ui.selection.selectionValidated=S\u00E9lection valid\u00E9e. -coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es +coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es (%d/%d) coser.ui.selection.speciesMenuFusion=Fusion coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces +coser.ui.selection.speciesMerged=Esp\u00E8ces fusionn\u00E9es. coser.ui.selection.tab.details=D\u00E9tails de la s\u00E9lection coser.ui.selection.tab.lists=Listes des esp\u00E8ces coser.ui.selection.tab.rsufi=RSufi

1 0

r362 - trunk/coser-ui/src/main/java/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org Dec. 6, 2010

Dec. 6, 2010

Author: chatellier Date: 2010-12-06 09:19:18 +0000 (Mon, 06 Dec 2010) New Revision: 362 Log: Remove super call Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-06 09:18:39 UTC (rev 361) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserConfig.java 2010-12-06 09:19:18 UTC (rev 362) @@ -44,7 +44,6 @@ public class CoserConfig extends CoserBusinessConfig { public CoserConfig() { - super(); ConvertUtils.register(new LocaleConverter(), Locale.class); // init configuration with default options

1 0

r361 - in trunk/coser-business/src/main: java/fr/ifremer/coser/services resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 6, 2010

Dec. 6, 2010

Author: chatellier Date: 2010-12-06 09:18:39 +0000 (Mon, 06 Dec 2010) New Revision: 361 Log: Ajout de l'espece dans le message sur le pas de mensuration Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.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/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2010-12-06 09:10:43 UTC (rev 360) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2010-12-06 09:18:39 UTC (rev 361) @@ -1004,7 +1004,7 @@ error.addLineNumber(lengthData[Length.INDEX_LINE]); error.setLevel(ValidationLevel.WARNING); error.setMessage(_("coser.business.control.error.invalidLengthLengthStep")); - error.setDetailMessage(_("coser.business.control.error.invalidLengthLengthStepDetail", lengthData[Length.INDEX_LENGTH])); + error.setDetailMessage(_("coser.business.control.error.invalidLengthLengthStepDetail", lengthData[Length.INDEX_LENGTH], species)); error.setTipMessage(_("coser.business.control.error.invalidLengthLengthStepTip")); crossFilesErrors.add(error); } 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-12-06 09:10:43 UTC (rev 360) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-06 09:18:39 UTC (rev 361) @@ -22,7 +22,7 @@ coser.business.category.haul=Haul coser.business.category.length=Length coser.business.category.reftax.species=Reftax (species) -coser.business.category.strata=Stata +coser.business.category.strata=Strata coser.business.category.typeEspece=Species type code coser.business.chart.compareCatchLengthNumberTitle=Comparison of numbers and length and catch (%s) coser.business.command.deleteline.log=In file %s, line %s has been deleted @@ -38,7 +38,7 @@ coser.business.control.error.duplicatedLine=Duplicated line coser.business.control.error.duplicatedLineDetails=Duplicated line for key \: %s coser.business.control.error.invalidLengthLengthStep=Invalid length step (authorized centimeters and half-centimeters) -coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s +coser.business.control.error.invalidLengthLengthStepDetail=Invalid length step %s for species %s coser.business.control.error.invalidLengthLengthStepTip=Length field must be in centimeters. coser.business.control.error.minObservationCount=Minimum number of observation not reached coser.business.control.error.minObservationCountDetail=Minimum number of observation not reached (%s) \: %.2f 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-12-06 09:10:43 UTC (rev 360) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-06 09:18:39 UTC (rev 361) @@ -38,7 +38,7 @@ coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.duplicatedLineDetails=Ligne en doublon pour la cl\u00E9 \: %s coser.business.control.error.invalidLengthLengthStep=Le pas de longueur est invalide (autoris\u00E9 centim\u00E8tre et demi-centim\u00E8tre) -coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide +coser.business.control.error.invalidLengthLengthStepDetail=Le pas longueur %s est invalide pour l'esp\u00E8ce %s coser.business.control.error.invalidLengthLengthStepTip=Le champs de longueur doit \u00EAtre en centim\u00E8tre (ou demi centim\u00E8tre) coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f

1 0

r360 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 6, 2010

Dec. 6, 2010

Author: chatellier Date: 2010-12-06 09:10:43 +0000 (Mon, 06 Dec 2010) New Revision: 360 Log: Traduction qui a saut?\195?\169 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-12-03 16:04:31 UTC (rev 359) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-06 09:10:43 UTC (rev 360) @@ -176,8 +176,8 @@ coser.ui.selection.fusionError=Erreur de fusion coser.ui.selection.invalidFusionName=Le nom de fusion choisit n'est pas pr\u00E9sent de le r\u00E9f\u00E9rentiel \! coser.ui.selection.maturitySpecies=L4 \: Esp\u00E8ces avec maturit\u00E9 -coser.ui.selection.nonJustifiedMaturity=La liste esp\u00E8ces avec maturit\u00E9 n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\\nVous devez justifier cette s\u00E9lection par un commentaire. -coser.ui.selection.nonJustifiedOccurenceDensity= +coser.ui.selection.nonJustifiedMaturity=La liste esp\u00E8ces avec maturit\u00E9 n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\nVous devez justifier cette s\u00E9lection par un commentaire. +coser.ui.selection.nonJustifiedOccurenceDensity=La s\u00E9lection de la liste filtr\u00E9e ne correspond pas \u00E0 la s\u00E9lection op\u00E9r\u00E9e par le filtre.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedSizeAllYear=La liste esp\u00E8ces avec des tailles pour toutes les ann\u00E9es n'est pas enti\u00E8rement s\u00E9lectionn\u00E9e.\nVous devez justifier cette s\u00E9lection par un commentaire. coser.ui.selection.nonJustifiedTitle=S\u00E9lection non justifi\u00E9e coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es

1 0

r359 - trunk/coser-web
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 16:04:31 +0000 (Fri, 03 Dec 2010) New Revision: 359 Log: svn:ignore Modified: trunk/coser-web/ Property changes on: trunk/coser-web ___________________________________________________________________ Modified: svn:ignore - .settings target + .settings target .classpath .project

1 0

r358 - trunk/coser-web
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 16:01:39 +0000 (Fri, 03 Dec 2010) New Revision: 358 Log: Remove eclipse path Removed: trunk/coser-web/.classpath trunk/coser-web/.project Deleted: trunk/coser-web/.classpath =================================================================== --- trunk/coser-web/.classpath 2010-12-03 16:00:21 UTC (rev 357) +++ trunk/coser-web/.classpath 2010-12-03 16:01:39 UTC (rev 358) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: trunk/coser-web/.project =================================================================== --- trunk/coser-web/.project 2010-12-03 16:00:21 UTC (rev 357) +++ trunk/coser-web/.project 2010-12-03 16:01:39 UTC (rev 358) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>coser-web</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription>

1 0

r357 - in trunk: . coser-web
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 16:00:21 +0000 (Fri, 03 Dec 2010) New Revision: 357 Log: Remove embedded war (not working with jsp) Modified: trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2010-12-03 14:45:45 UTC (rev 356) +++ trunk/coser-web/pom.xml 2010-12-03 16:00:21 UTC (rev 357) @@ -29,13 +29,17 @@ <artifactId>junit</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> </dependencies> <name>Coser :: Web</name> @@ -53,36 +57,6 @@  <plugins> <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.JettyLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Jetty*</include> - </includes> - </overlay> - <overlay> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <type>jar</type> - </overlay> - <overlay> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-03 14:45:45 UTC (rev 356) +++ trunk/pom.xml 2010-12-03 16:00:21 UTC (rev 357) @@ -128,13 +128,6 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx-core</artifactId> <version>1.6.2-2</version> @@ -177,20 +170,37 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> + <version>2.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>2.2.1</version> + <scope>compile</scope> </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> <version>3.8.0.GA</version> <scope>runtime</scope> </dependency> + <dependency> - <groupId>org.eclipse.jetty.aggregate</groupId> - <artifactId>jetty-webapp</artifactId> - <version>7.2.1.v20101111</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> <scope>provided</scope> </dependency> </dependencies> @@ -261,7 +271,7 @@ <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>7.2.1.v20101111</version> + <version>8.0.0.M2</version> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r356 - in trunk/coser-ui/src/main: java/fr/ifremer/coser/ui/selection resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 14:45:45 +0000 (Fri, 03 Dec 2010) New Revision: 356 Log: Deplacement des ann?\195?\169es dans un accord?\195?\169on seules Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 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/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-03 14:45:45 UTC (rev 356) @@ -92,9 +92,28 @@ </cell> </row> <row> - <cell anchor="west"> + <cell anchor="northwest"> + <JLabel text="coser.ui.selection.details.comment" /> + </cell> + <cell anchor="north" fill="horizontal" weighty="1" columns="3"> + <JScrollPane> + <JTextArea id="detailsComment" rows="3" /> + <javax.swing.text.Document javaBean="detailsComment.getDocument()" + onInsertUpdate='getSelection().setComment(detailsComment.getText())' + onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> + </JScrollPane> + </cell> + </row> + </Table> + </AccordionPaneSubPanel> + <AccordionPaneSubPanel title="coser.ui.selection.detail.yearAccordion"> + <Table> + <row> + <cell anchor="west" columns="2"> <JLabel text="coser.ui.selection.details.dates" /> </cell> + </row> + <row> <cell weighty="1" weightx="1" fill="both"> <JScrollPane> <YearListModel id="datesListModel" /> @@ -104,7 +123,7 @@ <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> </JScrollPane> </cell> - <cell anchor="south" columns="2"> + <cell anchor="south"> <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" enabled="{!isYearsValidated()}"/> @@ -118,17 +137,9 @@ <cell fill="horizontal"> <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> </cell> - <cell anchor="east"> - <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> - </cell> - <cell> - <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> - </cell> </row> <row> - <cell weightx="1" weighty="2" fill="both"> + <cell weightx="1" weighty="2" fill="both" rows="2"> <JScrollPane> <StrataListModel id="strataListModel" onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> @@ -137,6 +148,16 @@ onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> </cell> + <cell anchor="northeast"> + <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> + </cell> + <cell anchor="northeast"> + <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> + </cell> + </row> + <row> <cell anchor="south" columns="2"> <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" onActionPerformed="getHandler().strataListChanged(this);setStrataValidated(true)" @@ -236,19 +257,6 @@ </Table> </cell> </row> - <row> - <cell anchor="northwest"> - <JLabel text="coser.ui.selection.details.comment" /> - </cell> - <cell fill="both" columns="3"> - <JScrollPane> - <JTextArea id="detailsComment" rows="3" /> - <javax.swing.text.Document javaBean="detailsComment.getDocument()" - onInsertUpdate='getSelection().setComment(detailsComment.getText())' - onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> - </JScrollPane> - </cell> - </row> </Table> </AccordionPaneSubPanel> </AccordionPane> 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-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-03 14:45:45 UTC (rev 356) @@ -144,9 +144,10 @@ coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error -coser.ui.selection.detail.mainAccordion=Details and years +coser.ui.selection.detail.mainAccordion=Details coser.ui.selection.detail.speciesAccordion=Species coser.ui.selection.detail.strataAccordion=Strata +coser.ui.selection.detail.yearAccordion=Years coser.ui.selection.details.addToSelectedListTip=Add selected species to selected species list. coser.ui.selection.details.comment=Comments \: coser.ui.selection.details.dates=Years \: 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-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-03 14:45:45 UTC (rev 356) @@ -144,9 +144,10 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action -coser.ui.selection.detail.mainAccordion=D\u00E9tails et ann\u00E9es +coser.ui.selection.detail.mainAccordion=D\u00E9tails coser.ui.selection.detail.speciesAccordion=Esp\u00E8ces coser.ui.selection.detail.strataAccordion=Strates +coser.ui.selection.detail.yearAccordion=Ann\u00E9es coser.ui.selection.details.addToSelectedListTip=Ajoute les esp\u00E8ces s\u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es. coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \:

1 0

r355 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 13:33:54 +0000 (Fri, 03 Dec 2010) New Revision: 355 Log: 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-12-03 13:33:21 UTC (rev 354) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-03 13:33:54 UTC (rev 355) @@ -144,6 +144,9 @@ coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error +coser.ui.selection.detail.mainAccordion=Details and years +coser.ui.selection.detail.speciesAccordion=Species +coser.ui.selection.detail.strataAccordion=Strata coser.ui.selection.details.addToSelectedListTip=Add selected species to selected species list. coser.ui.selection.details.comment=Comments \: coser.ui.selection.details.dates=Years \: 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-12-03 13:33:21 UTC (rev 354) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-03 13:33:54 UTC (rev 355) @@ -144,6 +144,9 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action +coser.ui.selection.detail.mainAccordion=D\u00E9tails et ann\u00E9es +coser.ui.selection.detail.speciesAccordion=Esp\u00E8ces +coser.ui.selection.detail.strataAccordion=Strates coser.ui.selection.details.addToSelectedListTip=Ajoute les esp\u00E8ces s\u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es. coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \:

1 0

r354 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by chatellier＠users.labs.libre-entreprise.org Dec. 3, 2010

Dec. 3, 2010

Author: chatellier Date: 2010-12-03 13:33:21 +0000 (Fri, 03 Dec 2010) New Revision: 354 Log: Use accordion pane Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 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-12-03 13:32:19 UTC (rev 353) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-03 13:33:21 UTC (rev 354) @@ -27,6 +27,7 @@ <script><![CDATA[ import fr.ifremer.coser.ui.selection.model.*; import fr.ifremer.coser.ui.util.*; + import fr.ifremer.coser.ui.widgets.*; void $afterCompleteSetup() { // modification (species -> selection model) @@ -62,183 +63,195 @@ </row> <row> <cell weightx="1" weighty="1" fill="both"> - <Table> - <row> - <cell anchor="west"> - <JLabel text="coser.ui.selection.details.name" /> - </cell> - <cell weightx="1" fill="horizontal" columns="3"> - <JTextField id="detailsSelectionNameField" text="{getSelection().getName()}" - enabled="{isCreationState()}"/> - <javax.swing.text.Document javaBean="detailsSelectionNameField.getDocument()" - onInsertUpdate='getSelection().setName(detailsSelectionNameField.getText())' - onRemoveUpdate='getSelection().setName(detailsSelectionNameField.getText())' /> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel text="coser.ui.selection.details.description" /> - </cell> - <cell weightx="1" fill="horizontal" columns="3"> - <JScrollPane> - <JTextArea id="detailsDescription" text="{getSelection().getDescription()}" rows="3" /> - </JScrollPane> - <javax.swing.text.Document javaBean="detailsDescription.getDocument()" - onInsertUpdate='getSelection().setDescription(detailsDescription.getText())' - onRemoveUpdate='getSelection().setDescription(detailsDescription.getText())' /> - </cell> - </row> - <row> - <cell anchor="west"> - <JLabel text="coser.ui.selection.details.dates" /> - </cell> - <cell weighty="1" weightx="1" fill="both"> - <JScrollPane> - <YearListModel id="datesListModel" /> - <JList id="datesList" model="{datesListModel}" - selectionModel="{new CoserListSelectionModel(datesList.getSelectionModel(), datesListModel)}" - onValueChanged="setYearsValidated(false)" /> - <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> - </JScrollPane> - </cell> - <cell anchor="south" columns="2"> - <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" - onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" - enabled="{!isYearsValidated()}"/> - </cell> - </row> - <row> - <cell fill="horizontal" columns="2"> - <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> - </cell> - <cell anchor="east"> - <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> - </cell> - <cell> - <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> - </cell> - </row> - <row> - <cell weighty="2" fill="both" columns="2"> - <JScrollPane> - <StrataListModel id="strataListModel" - onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> - <JList id="strataList" model="{strataListModel}" - selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" - onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> - </JScrollPane> - </cell> - <cell anchor="south" columns="2"> - <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" - onActionPerformed="getHandler().strataListChanged(this);setStrataValidated(true)" - enabled="{isYearsValidated() && !isStrataValidated()}"/> - </cell> - </row> - <row> - <cell fill="horizontal" columns="4"> - <JLabel id="typeSpecyLabel" text='{_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize())}' /> - </cell> - </row> - <row> - <cell fill="both" weightx="1" weighty="1" columns="2"> - <JScrollPane> - <SpecyTypesListModel id="typeSpecyModel" constructorParams="this" - onContentsChanged='typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))'/> - <JList id="typeSpecyList" model="{typeSpecyModel}" - selectionModel="{new CoserListSelectionModel(typeSpecyList.getSelectionModel(), typeSpecyModel)}" - enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='validFilterButton.setEnabled(true); typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))' /> - </JScrollPane> - </cell> - <cell anchor="south" columns="2"> - <JButton id="validFilterButton" text="coser.ui.selection.details.validFilter" - onActionPerformed="getHandler().updateSelectionSpecies(this);validFilterButton.setEnabled(false)" - enabled="false"/> - </cell> - </row> - <row> - <cell weighty="2" fill="both" columns="4"> - <Table> - <row> - <cell fill="horizontal" columns="2"> - <JLabel id="filteredSpecyLabel" text='{_("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> - </cell> - <cell fill="horizontal"> - <JLabel id="selectedSpecyLabel" text='{_("coser.ui.selection.details.selectedSpecies", 0, 0)}' /> - </cell> - </row> - <row> - <cell weightx="1" weighty="1" fill="both"> - <JScrollPane> - <SpecyListModel id="filteredSpecyListModel" - onContentsChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))'/> - <JList id="filteredSpecyList" model="{filteredSpecyListModel}" - onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" - selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" - enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))' /> - <ListSelectionModel id="filteredSpecyListSelectionModel" javaBean="filteredSpecyList.getSelectionModel()" /> - </JScrollPane> - </cell> - <cell anchor="north"> - <Table> - <row> - <cell> - <JButton icon="arrow_right.png" - toolTipText="coser.ui.selection.details.addToSelectedListTip" - onActionPerformed="getHandler().addSelectedFilteredSpecies(this)" - enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> - </cell> - </row> - <row> - <cell> - <JButton icon="arrow_left.png" - toolTipText="coser.ui.selection.details.removeFromSelectedListTip" - onActionPerformed="getHandler().removeSelectedSpecies(this)" - enabled="{getSelectedSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> - </cell> - </row> - <row> - <cell> - <JButton icon="chart_curve.png" - toolTipText="coser.ui.selection.details.displayDiffCatchLengthGraphTip" - onActionPerformed='getHandler().showSelectedSpeciesGraph(this, "SPECIESGRAPH")' - enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}" /> - </cell> - </row> - </Table> - </cell> - <cell weightx="1" weighty="1" fill="both"> - <JScrollPane> - <SpecyListModel id="selectedSpecyListModel" - onContentsChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> - <JList id="selectedSpecyList" model="{selectedSpecyListModel}" - selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}" - enabled="{isYearsValidated() && isStrataValidated()}" - onValueChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> - <ListSelectionModel id="selectedSpecyListSelectionModel" javaBean="selectedSpecyList.getSelectionModel()" /> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell anchor="northwest"> - <JLabel text="coser.ui.selection.details.comment" /> - </cell> - <cell weighty="1" fill="both" columns="3"> - <JScrollPane> - <JTextArea id="detailsComment" rows="3" /> - <javax.swing.text.Document javaBean="detailsComment.getDocument()" - onInsertUpdate='getSelection().setComment(detailsComment.getText())' - onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> - </JScrollPane> - </cell> - </row> - </Table> + <AccordionPane id="detailAccordionPane"> + <AccordionPaneSubPanel title="coser.ui.selection.detail.mainAccordion"> + <Table> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.selection.details.name" /> + </cell> + <cell weightx="1" fill="horizontal" columns="3"> + <JTextField id="detailsSelectionNameField" text="{getSelection().getName()}" + enabled="{isCreationState()}"/> + <javax.swing.text.Document javaBean="detailsSelectionNameField.getDocument()" + onInsertUpdate='getSelection().setName(detailsSelectionNameField.getText())' + onRemoveUpdate='getSelection().setName(detailsSelectionNameField.getText())' /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.selection.details.description" /> + </cell> + <cell weightx="1" fill="horizontal" columns="3"> + <JScrollPane> + <JTextArea id="detailsDescription" text="{getSelection().getDescription()}" rows="3" /> + </JScrollPane> + <javax.swing.text.Document javaBean="detailsDescription.getDocument()" + onInsertUpdate='getSelection().setDescription(detailsDescription.getText())' + onRemoveUpdate='getSelection().setDescription(detailsDescription.getText())' /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.selection.details.dates" /> + </cell> + <cell weighty="1" weightx="1" fill="both"> + <JScrollPane> + <YearListModel id="datesListModel" /> + <JList id="datesList" model="{datesListModel}" + selectionModel="{new CoserListSelectionModel(datesList.getSelectionModel(), datesListModel)}" + onValueChanged="setYearsValidated(false)" /> + <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> + </JScrollPane> + </cell> + <cell anchor="south" columns="2"> + <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" + onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" + enabled="{!isYearsValidated()}"/> + </cell> + </row> + </Table> + </AccordionPaneSubPanel> + <AccordionPaneSubPanel title="coser.ui.selection.detail.strataAccordion"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> + </cell> + <cell anchor="east"> + <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> + </cell> + <cell> + <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> + </cell> + </row> + <row> + <cell weightx="1" weighty="2" fill="both"> + <JScrollPane> + <StrataListModel id="strataListModel" + onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> + <JList id="strataList" model="{strataListModel}" + selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" + onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> + </JScrollPane> + </cell> + <cell anchor="south" columns="2"> + <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" + onActionPerformed="getHandler().strataListChanged(this);setStrataValidated(true)" + enabled="{isYearsValidated() && !isStrataValidated()}"/> + </cell> + </row> + </Table> + </AccordionPaneSubPanel> + <AccordionPaneSubPanel title="coser.ui.selection.detail.speciesAccordion"> + <Table> + <row> + <cell fill="horizontal" columns="4"> + <JLabel id="typeSpecyLabel" text='{_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize())}' /> + </cell> + </row> + <row> + <cell fill="both" weightx="1" weighty="1" columns="2"> + <JScrollPane> + <SpecyTypesListModel id="typeSpecyModel" constructorParams="this" + onContentsChanged='typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))'/> + <JList id="typeSpecyList" model="{typeSpecyModel}" + selectionModel="{new CoserListSelectionModel(typeSpecyList.getSelectionModel(), typeSpecyModel)}" + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='validFilterButton.setEnabled(true); typeSpecyLabel.setText(_("coser.ui.selection.details.type", typeSpecyList.getSelectedIndices().length, typeSpecyList.getModel().getSize()))' /> + </JScrollPane> + </cell> + <cell anchor="south" columns="2"> + <JButton id="validFilterButton" text="coser.ui.selection.details.validFilter" + onActionPerformed="getHandler().updateSelectionSpecies(this);validFilterButton.setEnabled(false)" + enabled="false"/> + </cell> + </row> + <row> + <cell weighty="3" fill="both" columns="4"> + <Table> + <row> + <cell fill="horizontal" columns="2"> + <JLabel id="filteredSpecyLabel" text='{_("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> + </cell> + <cell fill="horizontal"> + <JLabel id="selectedSpecyLabel" text='{_("coser.ui.selection.details.selectedSpecies", 0, 0)}' /> + </cell> + </row> + <row> + <cell weightx="1" weighty="1" fill="both"> + <JScrollPane> + <SpecyListModel id="filteredSpecyListModel" + onContentsChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))'/> + <JList id="filteredSpecyList" model="{filteredSpecyListModel}" + onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" + selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='filteredSpecyLabel.setText(_("coser.ui.selection.details.filteredSpecies", filteredSpecyList.getSelectedIndices().length, filteredSpecyList.getModel().getSize()))' /> + <ListSelectionModel id="filteredSpecyListSelectionModel" javaBean="filteredSpecyList.getSelectionModel()" /> + </JScrollPane> + </cell> + <cell anchor="north"> + <Table> + <row> + <cell> + <JButton icon="arrow_right.png" + toolTipText="coser.ui.selection.details.addToSelectedListTip" + onActionPerformed="getHandler().addSelectedFilteredSpecies(this)" + enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> + </cell> + </row> + <row> + <cell> + <JButton icon="arrow_left.png" + toolTipText="coser.ui.selection.details.removeFromSelectedListTip" + onActionPerformed="getHandler().removeSelectedSpecies(this)" + enabled="{getSelectedSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> + </cell> + </row> + <row> + <cell> + <JButton icon="chart_curve.png" + toolTipText="coser.ui.selection.details.displayDiffCatchLengthGraphTip" + onActionPerformed='getHandler().showSelectedSpeciesGraph(this, "SPECIESGRAPH")' + enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}" /> + </cell> + </row> + </Table> + </cell> + <cell weightx="1" weighty="1" fill="both"> + <JScrollPane> + <SpecyListModel id="selectedSpecyListModel" + onContentsChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> + <JList id="selectedSpecyList" model="{selectedSpecyListModel}" + selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}" + enabled="{isYearsValidated() && isStrataValidated()}" + onValueChanged='selectedSpecyLabel.setText(_("coser.ui.selection.details.selectedSpecies", selectedSpecyList.getSelectedIndices().length, selectedSpecyList.getModel().getSize()))'/> + <ListSelectionModel id="selectedSpecyListSelectionModel" javaBean="selectedSpecyList.getSelectionModel()" /> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell anchor="northwest"> + <JLabel text="coser.ui.selection.details.comment" /> + </cell> + <cell fill="both" columns="3"> + <JScrollPane> + <JTextArea id="detailsComment" rows="3" /> + <javax.swing.text.Document javaBean="detailsComment.getDocument()" + onInsertUpdate='getSelection().setComment(detailsComment.getText())' + onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> + </JScrollPane> + </cell> + </row> + </Table> + </AccordionPaneSubPanel> + </AccordionPane> </cell> <cell weightx="3" weighty="1" fill="both"> <CardLayout id="detailDecisionPanelLayout" />

1 0