Author: chatellier Date: 2010-12-15 09:35:55 +0000 (Wed, 15 Dec 2010) New Revision: 407 Log: Ajout des unit?\195?\169s (occurrence/densit?\195?\169) Modified: 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/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-12-15 09:35:26 UTC (rev 406) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-12-15 09:35:55 UTC (rev 407) @@ -81,11 +81,13 @@ <javax.swing.text.Document javaBean="selectionFilterOccurrenceField.getDocument()" onInsertUpdate='applyOccDensFilter.setEnabled(true)' onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> + <JLabel text="coser.ui.selection.filter.occurrenceunit" /> <JLabel text="coser.ui.selection.filter.density" /> <JTextField id="selectionFilterDensityField" columns="3" text="{String.valueOf(getSelection().getDensityFilter())}" /> <javax.swing.text.Document javaBean="selectionFilterDensityField.getDocument()" onInsertUpdate='applyOccDensFilter.setEnabled(true)' onRemoveUpdate='applyOccDensFilter.setEnabled(true)' /> + <JLabel text="coser.ui.selection.filter.densityunit" /> <JButton id="applyOccDensFilter" text="coser.ui.selection.filter.filter" enabled="false" onActionPerformed="getHandler().updateOccurrenceDensityFilter(this);applyOccDensFilter.setEnabled(false)" /> </JPanel> 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-15 09:35:26 UTC (rev 406) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-15 09:35:55 UTC (rev 407) @@ -174,8 +174,10 @@ coser.ui.selection.details.validYears=Valid years coser.ui.selection.details.years=Years \: coser.ui.selection.filter.density=Density \: +coser.ui.selection.filter.densityunit=ind. ct/km2 coser.ui.selection.filter.filter=Filter coser.ui.selection.filter.occurrence=Occurrence \: +coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Comment \: coser.ui.selection.fusion.description=Species merge. Fill new species name with name existing in referential. coser.ui.selection.fusion.name=New name \: 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-15 09:35:26 UTC (rev 406) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-15 09:35:55 UTC (rev 407) @@ -174,8 +174,10 @@ coser.ui.selection.details.validYears=Valider les ann\u00E9es coser.ui.selection.details.years=Ann\u00E9es \: coser.ui.selection.filter.density=Densit\u00E9 \: +coser.ui.selection.filter.densityunit=nb ind./km2 coser.ui.selection.filter.filter=Filtrer coser.ui.selection.filter.occurrence=Occurence \: +coser.ui.selection.filter.occurrenceunit=% coser.ui.selection.fusion.comment=Commentaire \: coser.ui.selection.fusion.description=Fusion d'esp\u00E8ces. Veuillez renseigner un nouveau nom pr\u00E9sent dans le r\u00E9f\u00E9rentiel. coser.ui.selection.fusion.name=Nouveau nom \: