Author: chatellier Date: 2010-11-08 16:22:13 +0000 (Mon, 08 Nov 2010) New Revision: 190 Log: Ajout des champ comment, person in charge, selection description Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 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-business/src/main/java/fr/ifremer/coser/bean/Project.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-08 15:54:12 UTC (rev 189) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-08 16:22:13 UTC (rev 190) @@ -59,7 +59,11 @@ public static final String PROPERTY_SELECTIONS="selections"; protected String name; - + + protected String personInCharge; + + protected String comment; + protected Control control; protected Map<String, Selection> selections; @@ -80,6 +84,22 @@ getPropertyChangeSupport().firePropertyChange("name", oldValue, name); } + public String getPersonInCharge() { + return personInCharge; + } + + public void setPersonInCharge(String personInCharge) { + this.personInCharge = personInCharge; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + public Control getControl() { return control; } 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-08 16:22:13 UTC (rev 190) @@ -47,6 +47,8 @@ protected String name; + protected String description; + protected int beginDate; protected int endDate; @@ -57,10 +59,8 @@ protected List<String> species; - protected String technicalComment; + protected String comment; - protected String otherComment; - public String getName() { return name; } @@ -71,6 +71,14 @@ getPropertyChangeSupport().firePropertyChange("name", oldValue, name); } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public int getBeginDate() { return beginDate; } @@ -111,21 +119,13 @@ this.species = species; } - public String getThechnicalComment() { - return technicalComment; + public String getComment() { + return comment; } - public void setTechnicalComment(String technicalComment) { - this.technicalComment = technicalComment; + public void setComment(String comment) { + this.comment = comment; } - - public String getOtherComment() { - return otherComment; - } - - public void setOtherComment(String otherComment) { - this.otherComment = otherComment; - } public Properties toProperties() { Properties props = new Properties(); @@ -140,11 +140,11 @@ if (getFilterSpecyTypes() != null) { props.setProperty("selection.specy.types", StringUtils.join(getFilterSpecyTypes(),',')); } - if (technicalComment != null) { - props.setProperty("selection.technicalcomment", technicalComment); + if (description != null) { + props.setProperty("selection.description", description); } - if (otherComment != null) { - props.setProperty("selection.othercomment", otherComment); + if (comment != null) { + props.setProperty("selection.comment", comment); } return props; } @@ -165,11 +165,11 @@ if (props.containsKey("selection.specy.types")) { setFilterSpecyTypes(splitAsList(props.getProperty("selection.specy.types"))); } - if (props.containsKey("selection.technicalcomment")) { - setTechnicalComment(props.getProperty("selection.technicalcomment")); + if (props.containsKey("selection.description")) { + setDescription(props.getProperty("selection.description")); } - if (props.containsKey("selection.othercomment")) { - setOtherComment(props.getProperty("selection.othercomment")); + if (props.containsKey("selection.comment")) { + setComment(props.getProperty("selection.comment")); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-08 16:22:13 UTC (rev 190) @@ -64,6 +64,18 @@ </row> <row> <cell anchor="west"> + <JLabel text="coser.ui.project.projectpersonincharge" /> + </cell> + <cell weightx="1" fill="horizontal"> + <JTextField id="projectPersonInCharge" text="{project.getPersonInCharge()}" /> + <javax.swing.text.Document javaBean="projectPersonInCharge.getDocument()" + onInsertUpdate='getProject().setPersonInCharge(projectPersonInCharge.getText())' + onRemoveUpdate='getProject().setPersonInCharge(projectPersonInCharge.getText())' /> + + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.project.captureFile" /> </cell> <cell weightx="1" fill="horizontal"> @@ -142,6 +154,20 @@ </cell> </row> <row> + <cell anchor="northwest"> + <JLabel text="coser.ui.project.projectcomment" /> + </cell> + <cell fill="horizontal"> + <JScrollPane> + <JXTextArea id="projectComment" constructorParams='_("coser.ui.common.comment")' rows="3" /> + </JScrollPane> + <javax.swing.text.Document javaBean="projectComment.getDocument()" + onInsertUpdate='getProject().setComment(projectComment.getText())' + onRemoveUpdate='getProject().setComment(projectComment.getText())' /> + + </cell> + </row> + <row> <cell columns="3" anchor="east"> <JButton id="createProjectButton" text="coser.ui.project.createProject" onActionPerformed="getHandler().createProject(this)" /> 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-08 16:22:13 UTC (rev 190) @@ -35,7 +35,7 @@ <BeanValidator id='validatorSelection' bean='selection' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" errorTableModel="errorsTableModel"> - <field name="name" component="selectionDetailsSelecionNameField" /> + <field name="name" component="selectionDetailsSelectionNameField" /> </BeanValidator> <row> @@ -46,15 +46,28 @@ <JLabel text="coser.ui.selection.details.name" /> </cell> <cell weightx="1" fill="horizontal" columns="3"> - <JTextField id="selectionDetailsSelecionNameField" text="{getSelection().getName()}" + <JTextField id="selectionDetailsSelectionNameField" text="{getSelection().getName()}" enabled="{isCreationState()}"/> - <javax.swing.text.Document javaBean="selectionDetailsSelecionNameField.getDocument()" - onInsertUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' - onRemoveUpdate='getSelection().setName(selectionDetailsSelecionNameField.getText())' /> + <javax.swing.text.Document javaBean="selectionDetailsSelectionNameField.getDocument()" + onInsertUpdate='getSelection().setName(selectionDetailsSelectionNameField.getText())' + onRemoveUpdate='getSelection().setName(selectionDetailsSelectionNameField.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="selectionDetailsDescription" text="{getSelection().getDescription()}" rows="3" /> + </JScrollPane> + <javax.swing.text.Document javaBean="selectionDetailsDescription.getDocument()" + onInsertUpdate='getSelection().setDescription(selectionDetailsDescription.getText())' + onRemoveUpdate='getSelection().setDescription(selectionDetailsDescription.getText())' /> + </cell> + </row> + <row> + <cell anchor="west"> <JLabel text="coser.ui.selection.details.beginDate" /> </cell> <cell weightx="1" fill="horizontal"> @@ -95,7 +108,7 @@ </cell> </row> <row> - <cell weightx="1" fill="horizontal" columns="4"> + <cell weighty="2" fill="both" columns="4"> <Table border='{BorderFactory.createTitledBorder(_("coser.ui.selection.details.species"))}'> <row> <cell fill="horizontal"> @@ -107,7 +120,7 @@ </cell> </row> <row> - <cell fill="horizontal" weightx="1" weighty="1" columns="2"> + <cell fill="both" weightx="1" weighty="1" columns="2"> <JScrollPane> <TypeSpecyListModel id="typeSpecyModel" constructorParams="this" /> <JList id="typeSpecyList" model="{typeSpecyModel}" @@ -135,18 +148,11 @@ <row> <cell weighty="1" fill="both" columns="4"> <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.selection.details.technicalComment")' rows="3" /> + <JXTextArea constructorParams='_("coser.ui.selection.details.comment")' rows="3" /> </JScrollPane> </cell> </row> <row> - <cell weighty="1" fill="both" columns="4"> - <JScrollPane> - <JXTextArea constructorParams='_("coser.ui.selection.details.otherComment")' rows="3" /> - </JScrollPane> - </cell> - </row> - <row> <cell fill="horizontal" columns="4"> <JButton id="saveSelectionButton" text="coser.ui.selection.details.saveSelection" onActionPerformed="getHandler().saveSelection(this)" /> 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:22:13 UTC (rev 190) @@ -41,6 +41,11 @@ coser.ui.graph.compareNumberCatchSize= coser.ui.graph.lengthStructure= coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Data +coser.ui.mainframe.menu.data.control=Control +coser.ui.mainframe.menu.data.newSelection=New selection +coser.ui.mainframe.menu.data.noSelection=No selection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainframe.menu.file=File coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -51,11 +56,6 @@ coser.ui.mainframe.menu.validators=Validators coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Theme -coser.ui.mainframe.menu.data=Data -coser.ui.mainframe.menu.data.control=Control -coser.ui.mainframe.menu.data.newSelection=New selection -coser.ui.mainframe.menu.data.noSelection=No selection -coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Capture file \: coser.ui.project.createProject=Create project @@ -67,7 +67,9 @@ coser.ui.project.openProject=Open coser.ui.project.openProjectTitle=Open existing project coser.ui.project.project=Project \: +coser.ui.project.projectcomment=Comments \: coser.ui.project.projectname=Project name \: +coser.ui.project.projectpersonincharge=Person in charge \: coser.ui.project.stratesFile=Strates file \: coser.ui.project.traitsFile=Traits file \: coser.ui.project.useCustomReferenceSpeciesFile=Use custom reference file @@ -87,6 +89,8 @@ coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.createError=Creation error coser.ui.selection.details.beginDate=Begin date \: +coser.ui.selection.details.comment=Comments +coser.ui.selection.details.description=Description \: coser.ui.selection.details.endDate=End date \: coser.ui.selection.details.family=Filter by family \: coser.ui.selection.details.gender=Filter by gender \: 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-08 15:54:12 UTC (rev 189) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:22:13 UTC (rev 190) @@ -41,6 +41,11 @@ coser.ui.graph.compareNumberCatchSize=Comparaison Captures/Tailles coser.ui.graph.lengthStructure=Structures en taille coser.ui.mainframe.menu.configuration=Configuration +coser.ui.mainframe.menu.data=Donn\u00E9es +coser.ui.mainframe.menu.data.control=Contr\u00F4le +coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection +coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection +coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainframe.menu.file=Fichier coser.ui.mainframe.menu.locale.fr=Fran\u00E7ais coser.ui.mainframe.menu.locale.uk=English @@ -51,11 +56,6 @@ coser.ui.mainframe.menu.validators=Validateurs coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me -coser.ui.mainframe.menu.data=Donn\u00E9es -coser.ui.mainframe.menu.data.control=Contr\u00F4le -coser.ui.mainframe.menu.data.newSelection=Nouvelle s\u00E9lection -coser.ui.mainframe.menu.data.noSelection=Aucune s\u00E9lection -coser.ui.mainframe.menu.data.selection=S\u00E9lection coser.ui.mainview.title=Contr\u00F4le et S\u00E9lection RSufi coser.ui.project.captureFile=Fichier de captures \: coser.ui.project.createProject=Cr\u00E9er le projet @@ -67,7 +67,9 @@ coser.ui.project.openProject=Ouvrir coser.ui.project.openProjectTitle=Ouvrir un projet existant coser.ui.project.project=Projet \: +coser.ui.project.projectcomment=Commentaire \: coser.ui.project.projectname=Nom du projet \: +coser.ui.project.projectpersonincharge=Responsable \: coser.ui.project.stratesFile=Fichiers des strates \: coser.ui.project.traitsFile=Fichiers des traits \: coser.ui.project.useCustomReferenceSpeciesFile=Utiliser un autre fichier de r\u00E9f\u00E9rence @@ -87,6 +89,8 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces coser.ui.selection.createError=Erreur de cr\u00E9action coser.ui.selection.details.beginDate=Date de d\u00E9but \: +coser.ui.selection.details.comment=Commentaire +coser.ui.selection.details.description=Description \: coser.ui.selection.details.endDate=Date de fin \: coser.ui.selection.details.family=Filtrer par famille \: coser.ui.selection.details.gender=Filtrer par genre \: