Author: chatellier Date: 2010-11-15 16:57:53 +0000 (Mon, 15 Nov 2010) New Revision: 212 Log: Add explicits labels in control view Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.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-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-15 16:47:23 UTC (rev 211) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-15 16:57:53 UTC (rev 212) @@ -28,8 +28,6 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.lang.StringUtils; - import fr.ifremer.coser.storage.DataStorage; /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-15 16:47:23 UTC (rev 211) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-15 16:57:53 UTC (rev 212) @@ -43,6 +43,7 @@ text="coser.ui.control.save" enabled="false" onActionPerformed="getHandler().saveControl(this)" /> <JToolBar.Separator /> + <JLabel text="coser.ui.control.categorylabel" /> <fr.ifremer.coser.ui.control.ControlCategoryListModel id="categoryComboBoxModel" /> <JComboBox id="categoryComboBox" model="{categoryComboBoxModel}" renderer="{new fr.ifremer.coser.ui.control.ControlCategoryListRenderer()}" @@ -135,9 +136,12 @@ onValueChanged="getHandler().showSelectedError(this, event)" /> </JScrollPane> - <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.common.comment")' rows="3" /> - </JScrollPane> + <JPanel layout="{new BorderLayout()}"> + <JLabel text="coser.ui.control.comment" constraints="{BorderLayout.NORTH}"/> + <JScrollPane constraints="{BorderLayout.CENTER}"> + <JTextArea rows="3" /> + </JScrollPane> + </JPanel> </JSplitPane> </JSplitPane> </JSplitPane> 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-15 16:47:23 UTC (rev 211) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-15 16:57:53 UTC (rev 212) @@ -16,9 +16,11 @@ coser.ui.common.unselectAll.short= coser.ui.common.valid=Valid coser.ui.config.title=Configuration +coser.ui.control.categorylabel= coser.ui.control.check.containsError= coser.ui.control.check.containsUncheckedWarning= coser.ui.control.check.title= +coser.ui.control.comment= 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 ? 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-15 16:47:23 UTC (rev 211) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-15 16:57:53 UTC (rev 212) @@ -16,9 +16,11 @@ coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider coser.ui.config.title=Configuration +coser.ui.control.categorylabel=Donn\u00E9es affich\u00E9es \: coser.ui.control.check.containsError=Les donn\u00E9es contiennent encore des erreurs non corrig\u00E9es\npouvant fausser la cr\u00E9ation de la s\u00E9lection.\nVoulez vous poursuivre la cr\u00E9ation de la s\u00E9lection ? coser.ui.control.check.containsUncheckedWarning=Les donn\u00E9es contiennent encore %d avertissements non coch\uFFFDs pouvant fausser la cr\u00E9ation de la selection.\nVoulez vous poursuivre la cr\u00E9ation de la s\u00E9lection ? coser.ui.control.check.title=V\u00E9rification des erreurs +coser.ui.control.comment=Commentaire \: 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 ?