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

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

25 Nov '10

Author: chatellier Date: 2010-11-25 13:38:11 +0000 (Thu, 25 Nov 2010) New Revision: 274 Log: Ajout des nombres de lignes selectionn?\195?\169es/nmbre de lignes total dans les labels correspondant aux listes Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 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-11-25 10:40:51 UTC (rev 273) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-25 13:38:11 UTC (rev 274) @@ -108,7 +108,7 @@ </row> <row> <cell fill="horizontal" columns="2"> - <JLabel text="coser.ui.selection.details.strata" /> + <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" @@ -122,10 +122,11 @@ <row> <cell weighty="2" fill="both" columns="2"> <JScrollPane> - <StrataListModel id="strataListModel" /> + <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)"/> + onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> </cell> <cell anchor="south" columns="2"> @@ -136,17 +137,18 @@ </row> <row> <cell fill="horizontal" columns="4"> - <JLabel text="coser.ui.selection.details.type" /> + <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" /> + <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)}" - onValueChanged="validFilterButton.setEnabled(true)" - enabled="{isYearsValidated() && isStrataValidated()}" /> + 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"> @@ -160,20 +162,22 @@ <Table> <row> <cell fill="horizontal" columns="2"> - <JLabel text="coser.ui.selection.details.filteredSpecies" /> + <JLabel id="filteredSpecyLabel" text='{_("coser.ui.selection.details.filteredSpecies", 0, 0)}' /> </cell> <cell fill="horizontal"> - <JLabel text="coser.ui.selection.details.selectedSpecies" /> + <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" /> + <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()}" /> + 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> @@ -204,10 +208,12 @@ </cell> <cell weightx="1" weighty="1" fill="both"> <JScrollPane> - <SpecyListModel id="selectedSpecyListModel" /> + <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()}" /> + 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> 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-25 10:40:51 UTC (rev 273) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-25 13:38:11 UTC (rev 274) @@ -123,14 +123,14 @@ coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \: coser.ui.selection.details.description=Description \: -coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es \: +coser.ui.selection.details.filteredSpecies=Esp\u00E8ces filtr\u00E9es (%d/%d) \: coser.ui.selection.details.name=Nom de la s\u00E9lection \: coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection -coser.ui.selection.details.selectedSpecies=Esp\u00E8ces s\u00E9lectionn\u00E9es \: +coser.ui.selection.details.selectedSpecies=L1 \: Esp\u00E8ces s\u00E9lectionn\u00E9es (%d/%d) \: coser.ui.selection.details.showMapTip=Afficher la carte des zones coser.ui.selection.details.showSpreciesTip=Afficher la table des esp\u00E8ces -coser.ui.selection.details.strata=Strates \: -coser.ui.selection.details.type=Filtrer par type \: +coser.ui.selection.details.strata=Strates (%d/%d) \: +coser.ui.selection.details.type=Filtrer par type (%d/%d) \: coser.ui.selection.details.validDates=Valider les ann\u00E9es coser.ui.selection.details.validFilter=Valider les filtres coser.ui.selection.details.validSelection=Valider la s\u00E9lection

1 0

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

25 Nov '10

Author: chatellier Date: 2010-11-25 10:40:51 +0000 (Thu, 25 Nov 2010) New Revision: 273 Log: Ajout des 4 commentaires correspondants aux 4 listes de selection Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 09:27:45 UTC (rev 272) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-25 10:40:51 UTC (rev 273) @@ -59,6 +59,8 @@ protected List<String> selectedStrata; + protected String comment; + /** L1 : liste des especes. */ protected List<String> selectedSpecies; @@ -70,9 +72,19 @@ /** L4 : */ protected List<String> selectedSpeciesMaturity; + + /** L1 : comment. */ + protected String selectedSpeciesComment; - protected String comment; + /** L2 : comment. */ + protected String selectedSpeciesOccDensComment; + /** L3 : comment. */ + protected String selectedSpeciesSizeAllYearComment; + + /** L4 : comment. */ + protected String selectedSpeciesMaturityComment; + protected boolean validated; protected List<RSufiResult> rsufiResults; @@ -92,7 +104,9 @@ } public void setDescription(String description) { + String oldValue = this.description; this.description = description; + getPropertyChangeSupport().firePropertyChange("description", oldValue, description); } public List<String> getAllYears() { @@ -119,6 +133,16 @@ this.selectedStrata = selectedStrata; } + public String getComment() { + return comment; + } + + public void setComment(String comment) { + String oldValue = this.comment; + this.comment = comment; + getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); + } + public List<String> getSelectedSpecies() { return selectedSpecies; } @@ -152,16 +176,49 @@ this.selectedSpeciesMaturity = selectedSpeciesMaturity; } - public String getComment() { - return comment; + public String getSelectedSpeciesComment() { + return selectedSpeciesComment; } - public void setComment(String comment) { - String oldValue = this.comment; - this.comment = comment; - getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); + public void setSelectedSpeciesComment(String selectedSpeciesComment) { + String oldValue = this.selectedSpeciesComment; + this.selectedSpeciesComment = selectedSpeciesComment; + getPropertyChangeSupport().firePropertyChange("selectedSpeciesComment", oldValue, selectedSpeciesComment); } + public String getSelectedSpeciesOccDensComment() { + return selectedSpeciesOccDensComment; + } + + public void setSelectedSpeciesOccDensComment( + String selectedSpeciesOccDensComment) { + String oldValue = this.selectedSpeciesOccDensComment; + this.selectedSpeciesOccDensComment = selectedSpeciesOccDensComment; + getPropertyChangeSupport().firePropertyChange("selectedSpeciesOccDensComment", oldValue, selectedSpeciesOccDensComment); + } + + public String getSelectedSpeciesSizeAllYearComment() { + return selectedSpeciesSizeAllYearComment; + } + + public void setSelectedSpeciesSizeAllYearComment( + String selectedSpeciesSizeAllYearComment) { + String oldValue = this.selectedSpeciesSizeAllYearComment; + this.selectedSpeciesSizeAllYearComment = selectedSpeciesSizeAllYearComment; + getPropertyChangeSupport().firePropertyChange("selectedSpeciesSizeAllYearComment", oldValue, selectedSpeciesSizeAllYearComment); + } + + public String getSelectedSpeciesMaturityComment() { + return selectedSpeciesMaturityComment; + } + + public void setSelectedSpeciesMaturityComment( + String selectedSpeciesMaturityComment) { + String oldValue = this.selectedSpeciesMaturityComment; + this.selectedSpeciesMaturityComment = selectedSpeciesMaturityComment; + getPropertyChangeSupport().firePropertyChange("selectedSpeciesMaturityComment", oldValue, selectedSpeciesMaturityComment); + } + public boolean isValidated() { return validated; } @@ -183,6 +240,9 @@ public Properties toProperties() { Properties props = new Properties(); + if (description != null) { + props.setProperty("selection.description", description); + } if (getAllYears() != null) { props.setProperty("selection.allYears", StringUtils.join(getAllYears(),',')); } @@ -192,6 +252,9 @@ if (getSelectedStrata() != null) { props.setProperty("selection.selectedStrata", StringUtils.join(getSelectedStrata(),',')); } + if (comment != null) { + props.setProperty("selection.comment", comment); + } if (getSelectedSpecies() != null) { props.setProperty("selection.selectedSpecies", StringUtils.join(getSelectedSpecies(),',')); } @@ -204,17 +267,27 @@ if (getSelectedSpeciesMaturity() != null) { props.setProperty("selection.selectedSpeciesMaturity", StringUtils.join(getSelectedSpeciesMaturity(),',')); } - if (description != null) { - props.setProperty("selection.description", description); + if (selectedSpeciesComment != null) { + props.setProperty("selection.selectedSpeciesComment", selectedSpeciesComment); } + if (selectedSpeciesOccDensComment != null) { + props.setProperty("selection.selectedSpeciesOccDensComment", selectedSpeciesOccDensComment); + } + if (selectedSpeciesSizeAllYearComment != null) { + props.setProperty("selection.selectedSpeciesSizeAllYearComment", selectedSpeciesSizeAllYearComment); + } + if (selectedSpeciesMaturityComment != null) { + props.setProperty("selection.selectedSpeciesMaturityComment", selectedSpeciesMaturityComment); + } props.setProperty("selection.validated", String.valueOf(isValidated())); - if (comment != null) { - props.setProperty("selection.comment", comment); - } + return props; } public void fromProperties(Properties props) { + if (props.containsKey("selection.description")) { + setDescription(props.getProperty("selection.description")); + } if (props.containsKey("selection.allYears")) { setAllYears(splitAsList(props.getProperty("selection.allYears"))); } @@ -224,6 +297,9 @@ if (props.containsKey("selection.selectedStrata")) { setSelectedStrata(splitAsList(props.getProperty("selection.selectedStrata"))); } + if (props.containsKey("selection.comment")) { + setComment(props.getProperty("selection.comment")); + } if (props.containsKey("selection.selectedSpecies")) { setSelectedSpecies(splitAsList(props.getProperty("selection.selectedSpecies"))); } @@ -236,12 +312,18 @@ if (props.containsKey("selection.selectedSpeciesMaturity")) { setSelectedSpeciesMaturity(splitAsList(props.getProperty("selection.selectedSpeciesMaturity"))); } - if (props.containsKey("selection.description")) { - setDescription(props.getProperty("selection.description")); + if (props.containsKey("selection.selectedSpeciesComment")) { + setSelectedSpeciesComment(props.getProperty("selection.selectedSpeciesComment")); } - if (props.containsKey("selection.comment")) { - setComment(props.getProperty("selection.comment")); + if (props.containsKey("selection.selectedSpeciesOccDensComment")) { + setSelectedSpeciesOccDensComment(props.getProperty("selection.selectedSpeciesOccDensComment")); } + if (props.containsKey("selection.selectedSpeciesSizeAllYearComment")) { + setSelectedSpeciesSizeAllYearComment(props.getProperty("selection.selectedSpeciesSizeAllYearComment")); + } + if (props.containsKey("selection.selectedSpeciesMaturityComment")) { + setSelectedSpeciesMaturityComment(props.getProperty("selection.selectedSpeciesMaturityComment")); + } if (props.containsKey("selection.validated")) { setValidated(Boolean.parseBoolean(props.getProperty("selection.validated"))); } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-25 09:27:45 UTC (rev 272) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-25 10:40:51 UTC (rev 273) @@ -24,6 +24,7 @@ --> <Table> <SelectionHandler id="handler" javaBean="null" /> + <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> <script><![CDATA[ import fr.ifremer.coser.ui.selection.model.*; @@ -172,22 +173,34 @@ <row> <cell fill="horizontal" columns="2"> <JScrollPane> - <JTextArea id="allSpeciesCommentField" rows="3" /> + <JTextArea id="allSpeciesCommentField" rows="3" text="{getSelection().getSelectedSpeciesComment()}"/> + <javax.swing.text.Document javaBean="allSpeciesCommentField.getDocument()" + onInsertUpdate='getSelection().setSelectedSpeciesComment(allSpeciesCommentField.getText())' + onRemoveUpdate='getSelection().setSelectedSpeciesComment(allSpeciesCommentField.getText())' /> </JScrollPane> </cell> <cell fill="horizontal" columns="2"> <JScrollPane> - <JTextArea id="occurrenceDensityCommentField" rows="3" /> + <JTextArea id="occurrenceDensityCommentField" rows="3" text="{getSelection().getSelectedSpeciesOccDensComment()}"/> + <javax.swing.text.Document javaBean="occurrenceDensityCommentField.getDocument()" + onInsertUpdate='getSelection().setSelectedSpeciesOccDensComment(occurrenceDensityCommentField.getText())' + onRemoveUpdate='getSelection().setSelectedSpeciesOccDensComment(occurrenceDensityCommentField.getText())' /> </JScrollPane> </cell> <cell fill="horizontal" columns="2"> <JScrollPane> - <JTextArea id="sizeAllYearCommentField" rows="3" /> + <JTextArea id="sizeAllYearCommentField" rows="3" text="{getSelection().getSelectedSpeciesSizeAllYearComment()}"/> + <javax.swing.text.Document javaBean="sizeAllYearCommentField.getDocument()" + onInsertUpdate='getSelection().setSelectedSpeciesSizeAllYearComment(sizeAllYearCommentField.getText())' + onRemoveUpdate='getSelection().setSelectedSpeciesSizeAllYearComment(sizeAllYearCommentField.getText())' /> </JScrollPane> </cell> <cell fill="horizontal" columns="2"> <JScrollPane> - <JTextArea id="maturityCommentField" rows="3" /> + <JTextArea id="maturityCommentField" rows="3" text="{getSelection().getSelectedSpeciesMaturityComment()}"/> + <javax.swing.text.Document javaBean="maturityCommentField.getDocument()" + onInsertUpdate='getSelection().setSelectedSpeciesMaturityComment(maturityCommentField.getText())' + onRemoveUpdate='getSelection().setSelectedSpeciesMaturityComment(maturityCommentField.getText())' /> </JScrollPane> </cell> </row> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-11-25 09:27:45 UTC (rev 272) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-11-25 10:40:51 UTC (rev 273) @@ -45,7 +45,7 @@ </tab> <tab title="coser.ui.selection.tab.lists"> <SelectionListsView id="selectionListsView" constructorParams="this" - handler="{getHandler()}" /> + handler="{getHandler()}" selection="{getSelection()}" /> </tab> <tab title="coser.ui.selection.tab.rsufi"> <SelectionRsufiView id="selectionResultView" constructorParams="this"

1 0

r272 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection: . model
by chatellier＠users.labs.libre-entreprise.org 25 Nov '10

25 Nov '10

Author: chatellier Date: 2010-11-25 09:27:45 +0000 (Thu, 25 Nov 2010) New Revision: 272 Log: Ajout de bindings pour activer les boutons et listes seulement quand n?\195?\169c?\195?\169ssaire. Filter occurrence and density with occurrence and density 'mean value'. Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/OccurrenceDensitySpecyListModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-25 09:26:21 UTC (rev 271) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-25 09:27:45 UTC (rev 272) @@ -37,6 +37,8 @@ <SelectionHandler id="handler" javaBean="null" /> <Boolean id="creationState" javaBean="false" /> + <Boolean id="yearsValidated" javaBean="false" /> + <Boolean id="strataValidated" javaBean="false" />  <fr.ifremer.coser.bean.Selection id="selection" javaBean="null" /> @@ -46,6 +48,7 @@ uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" errorTableModel="errorsTableModel"> <field name="name" component="detailsSelectionNameField" /> + <field name="description" component="detailsDescription" /> </BeanValidator> <row> @@ -92,14 +95,15 @@ <JScrollPane> <YearListModel id="datesListModel" /> <JList id="datesList" model="{datesListModel}" - onValueChanged="validDatesButton.setEnabled(true)" - selectionModel="{new CoserListSelectionModel(datesList.getSelectionModel(), 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);" /> + onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" + enabled="{!isYearsValidated()}"/> </cell> </row> <row> @@ -121,12 +125,13 @@ <StrataListModel id="strataListModel" /> <JList id="strataList" model="{strataListModel}" selectionModel="{new CoserListSelectionModel(strataList.getSelectionModel(), strataListModel)}" - onValueChanged="validStrataButton.setEnabled(true)"/> + onValueChanged="setStrataValidated(false)"/> </JScrollPane> </cell> <cell anchor="south" columns="2"> <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" - onActionPerformed="getHandler().strataListChanged(this)" /> + onActionPerformed="getHandler().strataListChanged(this);setStrataValidated(true)" + enabled="{isYearsValidated() && !isStrataValidated()}"/> </cell> </row> <row> @@ -140,12 +145,14 @@ <SpecyTypesListModel id="typeSpecyModel" constructorParams="this" /> <JList id="typeSpecyList" model="{typeSpecyModel}" selectionModel="{new CoserListSelectionModel(typeSpecyList.getSelectionModel(), typeSpecyModel)}" - onValueChanged="validFilterButton.setEnabled(true)"/> + onValueChanged="validFilterButton.setEnabled(true)" + enabled="{isYearsValidated() && isStrataValidated()}" /> </JScrollPane> </cell> <cell anchor="south" columns="2"> <JButton id="validFilterButton" text="coser.ui.selection.details.validFilter" - onActionPerformed="getHandler().updateSelectionSpecies(this)" /> + onActionPerformed="getHandler().updateSelectionSpecies(this);validFilterButton.setEnabled(false)" + enabled="false"/> </cell> </row> <row> @@ -165,7 +172,8 @@ <SpecyListModel id="filteredSpecyListModel" /> <JList id="filteredSpecyList" model="{filteredSpecyListModel}" onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" - selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" /> + selectionModel="{new CoserListSelectionModel(filteredSpecyList.getSelectionModel(), filteredSpecyListModel)}" + enabled="{isYearsValidated() && isStrataValidated()}" /> <ListSelectionModel id="filteredSpecyListSelectionModel" javaBean="filteredSpecyList.getSelectionModel()" /> </JScrollPane> </cell> @@ -175,21 +183,21 @@ <cell> <JButton icon="arrow_right.png" onActionPerformed="getHandler().addSelectedFilteredSpecies(this)" - enabled="{getFilteredSpecyList().getSelectedIndex() != -1}"/> + enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> </cell> </row> <row> <cell> <JButton icon="arrow_left.png" onActionPerformed="getHandler().removeSelectedSpecies(this)" - enabled="{getSelectedSpecyList().getSelectedIndex() != -1}"/> + enabled="{getSelectedSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}"/> </cell> </row> <row> <cell> <JButton icon="chart_curve.png" onActionPerformed='getHandler().showSelectedSpeciesGraph(this, "SPECIESGRAPH")' - enabled="{getFilteredSpecyList().getSelectedIndex() != -1}" /> + enabled="{getFilteredSpecyList().getSelectedIndex() != -1 && isYearsValidated() && isStrataValidated()}" /> </cell> </row> </Table> @@ -198,8 +206,8 @@ <JScrollPane> <SpecyListModel id="selectedSpecyListModel" /> <JList id="selectedSpecyList" model="{selectedSpecyListModel}" - onMouseClicked="getHandler().showSpeciesContextMenu(this, event)" - selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}" /> + selectionModel="{new CoserListSelectionModel(selectedSpecyList.getSelectionModel(), selectedSpecyListModel)}" + enabled="{isYearsValidated() && isStrataValidated()}" /> <ListSelectionModel id="selectedSpecyListSelectionModel" javaBean="selectedSpecyList.getSelectionModel()" /> </JScrollPane> </cell> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-25 09:26:21 UTC (rev 271) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-25 09:27:45 UTC (rev 272) @@ -111,7 +111,9 @@ Project project = view.getContextValue(Project.class); ProjectService projectService = view.getContextValue(ProjectService.class); MatrixND occurrence = projectService.getOccurrence(project, selection); + occurrence.meanOverDim(1); // moyenne sur les années MatrixND density = projectService.getDensity(project, selection); + density.meanOverDim(1); // moyenne sur les années Collection<String> speciesAllYear = projectService.getSpeciesWithSizeAllYears(selection); Collection<String> speciesWithMaturity = projectService.getSpeciesWithMaturity(selection); //MatrixND samplingEffort = projectService.getSamplingEffort(project, selection); @@ -201,7 +203,9 @@ log.debug("Selection reloaded."); } - // disable tabs + // disable tabs and other actions + detailView.setYearsValidated(!selectedYears.isEmpty()); + detailView.setStrataValidated(!selectedStrata.isEmpty()); view.setEnabledAt(2, selection.isValidated()); // rsufi } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/OccurrenceDensitySpecyListModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/OccurrenceDensitySpecyListModel.java 2010-11-25 09:26:21 UTC (rev 271) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/OccurrenceDensitySpecyListModel.java 2010-11-25 09:27:45 UTC (rev 272) @@ -76,12 +76,14 @@ public double getOccurrence(String specy) { List<String> years = (List<String>)occurrence.getSemantic(1); + // get(0) == mean value (meanOverDim(1)) double result = occurrence.getValue(specy, years.get(0)); return result; } public double getDensity(String specy) { List<String> years = (List<String>)density.getSemantic(1); + // get(0) == mean value (meanOverDim(1)) double result = density.getValue(specy, years.get(0)); return result; }

1 0

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

25 Nov '10

Author: chatellier Date: 2010-11-25 09:26:21 +0000 (Thu, 25 Nov 2010) New Revision: 271 Log: Selection file is now named <selectionname>.selection Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-24 15:33:29 UTC (rev 270) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-25 09:26:21 UTC (rev 271) @@ -309,11 +309,12 @@ File[] selectionDirectories = selectionsDirectory.listFiles(); for (File selectionDirectory : selectionDirectories) { if (selectionDirectory.isDirectory()) { + String selectionName = selectionDirectory.getName(); Selection selection = new Selection(); - selection.setName(selectionDirectory.getName()); + selection.setName(selectionName); // relecture des informations de la selection (properties) - File selectionPropertiesFile = new File(selectionDirectory, "selection.properties"); + File selectionPropertiesFile = new File(selectionDirectory, selectionName + ".selection"); InputStream inputStream = null; try { Properties props = new Properties(); @@ -536,8 +537,9 @@ project.clearData(); // try to load validated data first + String selectionName = selection.getName(); File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); - File selectionDirectory = new File(selectionsDirectory, selection.getName()); + File selectionDirectory = new File(selectionsDirectory, selectionName); int fileLoaded = 0; for (Category category : Category.values()) { @@ -558,7 +560,7 @@ } // relecture des commandes de la selection (properties) - File selectionPropertiesFile = new File(selectionDirectory, "selection.properties"); + File selectionPropertiesFile = new File(selectionDirectory, selectionName + ".selection"); InputStream inputStream = null; try { Properties props = new Properties(); @@ -734,7 +736,8 @@ File selectionsDirectory = new File(projectDirectory, CoserConstants.STORAGE_SELECTION_DIRECTORY); // creation du dossier de la selection courante - File selectionDirectory = new File(selectionsDirectory, selection.getName()); + String selectionName = selection.getName(); + File selectionDirectory = new File(selectionsDirectory, selectionName); for (Category category : Category.values()) { if (category.isDataCategory()) { @@ -755,7 +758,7 @@ } // sauvegarde des informations de la selection (properties) - File propertiesFile = new File(selectionDirectory, "selection.properties"); + File propertiesFile = new File(selectionDirectory, selectionName + ".selection"); Properties props = selection.toProperties(); addHistoryCommandsToProperties(props, selection.getHistoryCommand(), "selection.commands"); OutputStream outputStream = null; @@ -1793,7 +1796,7 @@ matrix.setValue(dynMatrixEntry.getKey(), haulCountForYearEntry.getKey(), occurence); } } - + return matrix; }

1 0

r270 - in trunk: . coser-business/src/main/java/fr/ifremer/coser/validators coser-business/src/main/resources coser-ui/src/main/resources/fr/ifremer/coser/bean
by chatellier＠users.labs.libre-entreprise.org 24 Nov '10

24 Nov '10

Author: chatellier Date: 2010-11-24 15:33:29 +0000 (Wed, 24 Nov 2010) New Revision: 270 Log: Valid project name, selection name, result name as word (alphanum chars) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java trunk/coser-business/src/main/resources/validators.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml trunk/pom.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/RegexFieldValidator.java 2010-11-24 15:33:29 UTC (rev 270) @@ -31,7 +31,7 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; /** - * Same validator, but empty string is not valid. + * Same validator, but empty or null string is not valid. * *  * Validates a string field using a regular expression. @@ -82,10 +82,16 @@ Object value = this.getFieldValue(fieldName, object); // if there is no value - don't do comparison // if a value is required, a required validator should be added to the field - if (value == null || expression == null) { + + if (value == null) { + addFieldError(fieldName, object); return; } + if (expression == null) { + return; + } + // XW-375 - must be a string if (!(value instanceof String)) { return; Modified: trunk/coser-business/src/main/resources/validators.xml =================================================================== --- trunk/coser-business/src/main/resources/validators.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-business/src/main/resources/validators.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -44,7 +44,7 @@ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>  <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/> - + <validator name="checkDouble" class="fr.ifremer.coser.validators.CoserCheckDoubleValidator"/> <validator name="coserDouble" class="fr.ifremer.coser.validators.CoserDoubleValidator"/> <validator name="coserExpression" class="fr.ifremer.coser.validators.CoserExpressionValidator"/> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,8 +27,9 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> - <field-validator type="requiredstring"> - <param name="trim">true</param> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> <message>coser.ui.control.project.requiredname</message> </field-validator> </field> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/RSufiResult-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,8 +27,9 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> - <field-validator type="requiredstring"> - <param name="trim">true</param> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> <message>coser.ui.result.requiredname</message> </field-validator> </field> Modified: trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml =================================================================== --- trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -27,9 +27,16 @@ "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> <validators> <field name="name"> + <field-validator type="regex"> + <param name="expression">\w+</param> + <param name="trim">false</param> + <message>coser.ui.selection.selection.requiredName</message> + </field-validator> + </field> + <field name="description"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>coser.ui.selection.selection.requiredName</message> + <message>coser.ui.selection.selection.requiredDescription</message> </field-validator> </field> </validators> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-24 15:32:48 UTC (rev 269) +++ trunk/pom.xml 2010-11-24 15:33:29 UTC (rev 270) @@ -112,6 +112,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>

1 0

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

24 Nov '10

Author: chatellier Date: 2010-11-24 15:32:48 +0000 (Wed, 24 Nov 2010) New Revision: 269 Log: Selection description is required 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-24 15:15:19 UTC (rev 268) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-24 15:32:48 UTC (rev 269) @@ -148,6 +148,7 @@ coser.ui.selection.occurenceDensitySpecies=L2 \: Filtered species coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.saveError=Save error +coser.ui.selection.selection.requiredDescription= coser.ui.selection.selection.requiredName= coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year coser.ui.selection.speciesMenuFusion=Merge 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-24 15:15:19 UTC (rev 268) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-24 15:32:48 UTC (rev 269) @@ -148,6 +148,7 @@ coser.ui.selection.occurenceDensitySpecies=L2 \: Esp\u00E8ces filtr\u00E9es coser.ui.selection.occurrencedensityrenderer=<html>%s<span style\='font-size\:85%%;color\:gray;'>(Occ\=%.2f, Dens\=%.2f)</span></html> coser.ui.selection.saveError=Erreur de sauvegarde +coser.ui.selection.selection.requiredDescription=Le champ 'description' est requis coser.ui.selection.selection.requiredName=Le champ 'nom' est requis coser.ui.selection.sizeAllYearSpecies=L3 \: Esp\u00E8ces avec taille pour toutes les ann\u00E9es coser.ui.selection.speciesMenuFusion=Fusion

1 0

r268 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Nov '10

24 Nov '10

Author: chatellier Date: 2010-11-24 15:15:19 +0000 (Wed, 24 Nov 2010) New Revision: 268 Log: Always set i18n to strict mode Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-24 15:15:16 UTC (rev 267) +++ trunk/pom.xml 2010-11-24 15:15:19 UTC (rev 268) @@ -242,6 +242,9 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> <version>${i18n.version}</version> + <configuration> + <strictMode>true</strictMode> + </configuration> </plugin> <plugin> <artifactId>maven-site-plugin</artifactId>

1 0

r267 - trunk/coser-ui
by chatellier＠users.labs.libre-entreprise.org 24 Nov '10

24 Nov '10

Author: chatellier Date: 2010-11-24 15:15:16 +0000 (Wed, 24 Nov 2010) New Revision: 267 Log: Always set i18n to strict mode Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-11-24 15:04:36 UTC (rev 266) +++ trunk/coser-ui/pom.xml 2010-11-24 15:15:16 UTC (rev 267) @@ -154,15 +154,15 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - </entry> - </entries> - </configuration> <executions> <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> <goals> <goal>parserJava</goal> <goal>parserValidation</goal>

1 0

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

24 Nov '10

Author: chatellier Date: 2010-11-24 15:04:36 +0000 (Wed, 24 Nov 2010) New Revision: 266 Log: Deplacement des boutons de validations des listes 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-11-24 14:51:28 UTC (rev 265) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-24 15:04:36 UTC (rev 266) @@ -63,7 +63,7 @@ <cell anchor="west"> <JLabel text="coser.ui.selection.details.name" /> </cell> - <cell weightx="1" fill="horizontal"> + <cell weightx="1" fill="horizontal" columns="3"> <JTextField id="detailsSelectionNameField" text="{getSelection().getName()}" enabled="{isCreationState()}"/> <javax.swing.text.Document javaBean="detailsSelectionNameField.getDocument()" @@ -75,7 +75,7 @@ <cell anchor="west"> <JLabel text="coser.ui.selection.details.description" /> </cell> - <cell weightx="1" fill="horizontal"> + <cell weightx="1" fill="horizontal" columns="3"> <JScrollPane> <JTextArea id="detailsDescription" text="{getSelection().getDescription()}" rows="3" /> </JScrollPane> @@ -97,21 +97,23 @@ <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" onActionPerformed="getHandler().updateSelectionDateData(this);" /> </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" columns="2"> <JLabel text="coser.ui.selection.details.strata" /> </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"> @@ -122,21 +124,15 @@ onValueChanged="validStrataButton.setEnabled(true)"/> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" onActionPerformed="getHandler().strataListChanged(this)" /> </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" columns="4"> <JLabel text="coser.ui.selection.details.type" /> </cell> - <cell anchor="east"> - <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> - </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> @@ -147,15 +143,13 @@ onValueChanged="validFilterButton.setEnabled(true)"/> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validFilterButton" text="coser.ui.selection.details.validFilter" onActionPerformed="getHandler().updateSelectionSpecies(this)" /> </cell> </row> <row> - <cell weighty="2" fill="both" columns="2"> + <cell weighty="2" fill="both" columns="4"> <Table> <row> <cell fill="horizontal" columns="2"> @@ -217,7 +211,7 @@ <cell anchor="northwest"> <JLabel text="coser.ui.selection.details.comment" /> </cell> - <cell weighty="1" fill="both" columns="4"> + <cell weighty="1" fill="both" columns="3"> <JScrollPane> <JTextArea id="detailsComment" rows="3" /> <javax.swing.text.Document javaBean="detailsComment.getDocument()"

1 0

r265 - in trunk: coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/project coser-ui/src/main/resources/i18n coser-ui/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org 24 Nov '10

24 Nov '10

Author: chatellier Date: 2010-11-24 14:51:28 +0000 (Wed, 24 Nov 2010) New Revision: 265 Log: Add basic summary view Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx trunk/coser-ui/src/main/resources/icons/cancel.png Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-24 14:04:29 UTC (rev 264) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-11-24 14:51:28 UTC (rev 265) @@ -31,9 +31,6 @@ coser.business.control.error.diffCatchLengthDetail= coser.business.control.error.duplicatedLine= coser.business.control.error.duplicatedLineDetails= -coser.business.control.error.incompleteHaulDataCatch= -coser.business.control.error.incompleteHaulDataLength= -coser.business.control.error.incompleteHaulSpeciesData= coser.business.control.error.invalidLengthLengthStep= coser.business.control.error.minObservationCount= coser.business.control.error.minObservationCountDetail= 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-24 14:04:29 UTC (rev 264) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-11-24 14:51:28 UTC (rev 265) @@ -31,8 +31,6 @@ coser.business.control.error.diffCatchLengthDetail=Diff\u00E9rence entre les captures et taille pour l'esp\u00E8ce %s (ann\u00E9e %s) 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.incompleteHaulDataCatch=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les captures -coser.business.control.error.incompleteHaulDataLength=Certains couples Annee|Trait ne sont pas pr\u00E9sents dans les tailles coser.business.control.error.invalidLengthLengthStep=Pas de longeur invalide (autoris\u00E9 centim\u00E8tre et 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 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-24 14:04:29 UTC (rev 264) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2010-11-24 14:51:28 UTC (rev 265) @@ -33,13 +33,14 @@ <JMenuItem text="coser.ui.mainframe.menu.newProject" onActionPerformed="getHandler().showProjectCreationView()"/> <JMenuItem text="coser.ui.mainframe.menu.openProject" onActionPerformed="getHandler().showProjectOpenView()"/> <JSeparator/> - <JMenuItem actionIcon="i18n-fr" text="coser.ui.mainframe.menu.locale.fr" onActionPerformed="getHandler().switchLanguage(Locale.FRANCE)"/> - <JMenuItem actionIcon="i18n-gb" text="coser.ui.mainframe.menu.locale.uk" onActionPerformed="getHandler().switchLanguage(Locale.UK)"/> + <JMenuItem actionIcon="i18n-fr" text="coser.ui.mainframe.menu.locale.fr" onActionPerformed="getHandler().switchLanguage(this, Locale.FRANCE)"/> + <JMenuItem actionIcon="i18n-gb" text="coser.ui.mainframe.menu.locale.uk" onActionPerformed="getHandler().switchLanguage(this, Locale.UK)"/> <JSeparator/> <JMenuItem text="coser.ui.mainframe.menu.quit" onActionPerformed="getHandler().quit()"/> </JMenu> <JMenu id='menuWindow' text="coser.ui.mainframe.menu.data" enabled="false"> + <JMenuItem text="coser.ui.mainframe.menu.data.summary" onActionPerformed="getHandler().showSummaryView()"/> <JMenuItem text="coser.ui.mainframe.menu.data.control" onActionPerformed="getHandler().showControlView()"/> <SelectionsListMenuItem id="menuWindowSelectionMenuItem" text="coser.ui.mainframe.menu.data.selection" constructorParams="this" /> 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-24 14:04:29 UTC (rev 264) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-24 14:51:28 UTC (rev 265) @@ -27,8 +27,6 @@ import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Frame; -import java.awt.Window; import java.beans.PropertyChangeEvent; import java.io.File; import java.net.URL; @@ -40,17 +38,13 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.JTextField; -import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; -import org.apache.commons.lang.xwork.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; -import org.nuiton.util.StringUtil; import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessConfig; @@ -66,6 +60,7 @@ import fr.ifremer.coser.ui.control.ControlView; import fr.ifremer.coser.ui.project.ProjectCreationView; import fr.ifremer.coser.ui.project.ProjectOpenView; +import fr.ifremer.coser.ui.project.ProjectSummaryView; import fr.ifremer.coser.ui.selection.SelectionHandler; import fr.ifremer.coser.ui.selection.SelectionView; import fr.ifremer.coser.ui.widgets.LookAndFeelViewMenuItem; @@ -94,15 +89,15 @@ /** * Switch application locale. * - * @param newLocale + * @param frame frame + * @param newLocale new locale */ - public void switchLanguage(Locale newLocale) { - I18n.init(newLocale); - // refresh uis - Window windows[] = Frame.getWindows(); - for (Window window : windows) { - SwingUtilities.updateComponentTreeUI(window); - } + public void switchLanguage(CoserFrame frame, Locale newLocale) { + CoserConfig config = frame.getContextValue(CoserConfig.class); + config.setLocale(newLocale); + config.saveForUser(); + JOptionPane.showMessageDialog(frame, _("coser.ui.locale.mustRestart"), + _("coser.ui.locale.title"), JOptionPane.INFORMATION_MESSAGE); } /** @@ -318,8 +313,7 @@ try { Project project = projectService.openProject(projectName); projectLoaded(project); - //showControlView(); - setMainComponent(null); + showSummaryView(); } catch (CoserBusinessException ex) { if (log.isErrorEnabled()) { log.error("Can't open project", ex); @@ -339,6 +333,19 @@ } /** + * Affiche la fenêtre de résumé d'un projet. + */ + public void showSummaryView() { + Project project = view.getContextValue(Project.class); + + ProjectSummaryView projectSummaryView = new ProjectSummaryView(view); + projectSummaryView.setHandler(this); + projectSummaryView.setProject(project); + + setMainComponent(projectSummaryView); + } + + /** * Charge les données de control et affiche la vue de control. */ public void showControlView() { Added: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx (rev 0) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectSummaryView.jaxx 2010-11-24 14:51:28 UTC (rev 265) @@ -0,0 +1,55 @@ + +<Table> + <fr.ifremer.coser.ui.CoserFrameHandler id="handler" javaBean="null" /> + + <fr.ifremer.coser.bean.Project id="project" javaBean="null" /> + + <row> + <cell weightx="1" fill="horizontal"> + <Table border='{BorderFactory.createTitledBorder(_("coser.ui.project.summary.title"))}'> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.path" /> + </cell> + <cell anchor="west" weightx="1" fill="horizontal"> + <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + File.separator + getProject().getName()}' /> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel text="coser.ui.project.summary.validated" /> + </cell> + <cell anchor="west"> + <JPanel> + <JLabel icon='accept.png' visible="{getProject().getControl().isValidated()}" /> + <JLabel icon='cancel.png' visible="{!getProject().getControl().isValidated()}" /> + </JPanel> + </cell> + </row> + </Table> + </cell> + </row> +</Table> 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-24 14:04:29 UTC (rev 264) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-11-24 14:51:28 UTC (rev 265) @@ -49,10 +49,11 @@ coser.ui.control.validcontrol= coser.ui.control.validcontroltip= coser.ui.error.htmlmessage=An error occurs \: %s -coser.ui.error.missingFile= coser.ui.error.title=Global application error coser.ui.graph.compareNumberCatchSize= coser.ui.graph.lengthStructure= +coser.ui.locale.mustRestart=You must restart application to take effect +coser.ui.locale.title=Locale modification coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.data=Data coser.ui.mainframe.menu.data.control=Control @@ -60,6 +61,7 @@ coser.ui.mainframe.menu.data.noSelection=No selection coser.ui.mainframe.menu.data.noValidation= coser.ui.mainframe.menu.data.selection=S\u00E9lection +coser.ui.mainframe.menu.data.summary= coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -88,6 +90,9 @@ coser.ui.project.projectcomment=Comments \: coser.ui.project.projectname=Project name \: coser.ui.project.stratesFile=Strates file \: +coser.ui.project.summary.path= +coser.ui.project.summary.title= +coser.ui.project.summary.validated= coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file coser.ui.project.usedReferenceSpeciesFile=Current reference file (Reffax) \: 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-24 14:04:29 UTC (rev 264) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-11-24 14:51:28 UTC (rev 265) @@ -52,6 +52,8 @@ coser.ui.error.title=Erreur globale coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles coser.ui.graph.lengthStructure=Structures en taille +coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. +coser.ui.locale.title=Modification de la langue coser.ui.mainframe.menu.configuration=Configuration coser.ui.mainframe.menu.data=Donn\u00E9es coser.ui.mainframe.menu.data.control=Contr\u00F4le @@ -59,6 +61,7 @@ coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection coser.ui.mainframe.menu.data.noValidation=Contr\u00F4le non valid\u00E9 coser.ui.mainframe.menu.data.selection=S\u00E9lections +coser.ui.mainframe.menu.data.summary=R\u00E9sum\u00E9 coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -87,6 +90,9 @@ coser.ui.project.projectcomment=Commentaire \: coser.ui.project.projectname=Nom du projet \: coser.ui.project.stratesFile=Fichiers des strates \: +coser.ui.project.summary.path=Chemin du projet \: +coser.ui.project.summary.title=R\u00E9sum\u00E9 du projet +coser.ui.project.summary.validated=Contr\u00F4le valid\u00E9 \: 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 (Reftax) \: Added: trunk/coser-ui/src/main/resources/icons/cancel.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/cancel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0