r210 - in trunk: coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/services coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/java/fr/ifremer/coser/ui/project coser-ui/src/main/resources/fr/ifremer/coser/bean coser-ui/src/main/resources/i18n
Author: chatellier Date: 2010-11-15 16:41:17 +0000 (Mon, 15 Nov 2010) New Revision: 210 Log: Modification de l'ui de creation de projet Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.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 trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 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:26:33 UTC (rev 209) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-15 16:41:17 UTC (rev 210) @@ -56,12 +56,24 @@ "Types","Commentaire","NumSys min","NumSys max" }; - public static final String PROPERTY_SELECTIONS="selections"; + public static final String PROPERTY_SELECTIONS = "selections"; protected String name; - protected String personInCharge; + protected String author; + /** Utilisé seulement lors de la création du projet (sinon, non valorisé). */ + protected String catchFile; + + /** Utilisé seulement lors de la création du projet (sinon, non valorisé). */ + protected String haulFile; + + /** Utilisé seulement lors de la création du projet (sinon, non valorisé). */ + protected String lengthFile; + + /** Utilisé seulement lors de la création du projet (sinon, non valorisé). */ + protected String strataFile; + protected String comment; protected Control control; @@ -84,20 +96,64 @@ getPropertyChangeSupport().firePropertyChange("name", oldValue, name); } - public String getPersonInCharge() { - return personInCharge; + public String getAuthor() { + return author; } - public void setPersonInCharge(String personInCharge) { - this.personInCharge = personInCharge; + public void setAuthor(String author) { + String oldValue = this.author; + this.author = author; + getPropertyChangeSupport().firePropertyChange("author", oldValue, author); } + public String getCatchFile() { + return catchFile; + } + + public void setCatchFile(String catchFile) { + String oldValue = this.catchFile; + this.catchFile = catchFile; + getPropertyChangeSupport().firePropertyChange("catchFile", oldValue, catchFile); + } + + public String getHaulFile() { + return haulFile; + } + + public void setHaulFile(String haulFile) { + String oldValue = this.haulFile; + this.haulFile = haulFile; + getPropertyChangeSupport().firePropertyChange("haulFile", oldValue, haulFile); + } + + public String getLengthFile() { + return lengthFile; + } + + public void setLengthFile(String lengthFile) { + String oldValue = this.lengthFile; + this.lengthFile = lengthFile; + getPropertyChangeSupport().firePropertyChange("lengthFile", oldValue, lengthFile); + } + + public String getStrataFile() { + return strataFile; + } + + public void setStrataFile(String strataFile) { + String oldValue = this.strataFile; + this.strataFile = strataFile; + getPropertyChangeSupport().firePropertyChange("strataFile", oldValue, strataFile); + } + public String getComment() { return comment; } public void setComment(String comment) { + String oldValue = this.comment; this.comment = comment; + getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); } public Control getControl() { 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-15 16:41:17 UTC (rev 210) @@ -47,6 +47,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import java.util.regex.Pattern; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; @@ -895,15 +896,16 @@ * @param project project * @param category category * @param fieldName fieldName - * @param currentValue current value + * @param searchString current value + * @param replaceString new value * @param data current data - * @param newValue new value + * @param isRegex is regex * @param commandUUID commandUUID * @return modified data * @throws CoserBusinessException */ public String[] replaceFieldValue(Project project, Category category, String fieldName, - String currentValue, String newValue, String[] data, String commandUUID) throws CoserBusinessException { + String searchString, String replaceString, String[] data, boolean isRegex, String commandUUID) throws CoserBusinessException { AbstractDataEntity beanData = null; @@ -926,9 +928,16 @@ // get current data value try { - String value = (String)PropertyUtils.getProperty(beanData, fieldName); + String currentValue = (String)PropertyUtils.getProperty(beanData, fieldName); - if (value.equals(currentValue)) { + String escapeSearchString = searchString; + if (!isRegex) { + escapeSearchString = Pattern.quote(escapeSearchString); + } + String newValue = currentValue.replaceAll(escapeSearchString, replaceString); + + // si le remplacement a fonctionné, une command doit être créée + if (!currentValue.equals(newValue)) { String lineNumber = data[AbstractDataEntity.INDEX_LINE]; ModifyFieldCommand command = new ModifyFieldCommand(); command.setCommandUUID(commandUUID); 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-15 16:41:17 UTC (rev 210) @@ -11,9 +11,7 @@ Number\ attribute\ is\ not\ a\ valid\ double= Project\ %s\ already\ exist= Project\ %s\ doesn't\ exists\ \!= -Project\ name\ is\ required= Selection\ %s\ already\ exists= -Selection\ name\ is\ required= Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential= Weight\ attribute\ is\ not\ a\ valid\ double= 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-15 16:41:17 UTC (rev 210) @@ -11,9 +11,7 @@ Number\ attribute\ is\ not\ a\ valid\ double= Project\ %s\ already\ exist=Le projet %s existe d\u00E9j\u00E0 \! Project\ %s\ doesn't\ exists\ \!=Le projet %s n'existe pas \! -Project\ name\ is\ required= Selection\ %s\ already\ exists=La s\u00E9lection %s existe d\u00E9j\u00E0 \! -Selection\ name\ is\ required= Sex\ is\ mandatory= Specy\ %s\ doesn't\ exist\ in\ referential=L'esp\u00E8ce %s n'existe pas dans le r\u00E9f\u00E9rentiel Weight\ attribute\ is\ not\ a\ valid\ double= 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-15 16:41:17 UTC (rev 210) @@ -218,12 +218,7 @@ */ public void createProject(final ProjectCreationView projectView) { CoserConfig config = projectView.getContextValue(CoserConfig.class); - - final String projectName = projectView.getProjectProjectName().getText().trim(); - String capturesPath = projectView.getProjectCapturesFileField().getText(); - String stratesPath = projectView.getProjectStratesFileField().getText(); - String traitsPath = projectView.getProjectTraitsFileField().getText(); - String taillesPath = projectView.getProjectLengthFileField().getText(); + final Project project = projectView.getProject(); // get correct reftax to use depending on project configuration String reftaxSpeciesPath = null; @@ -238,10 +233,10 @@ String codeTypeEspecePath = config.getReferenceTypeEspecesPath(); // convert to file - File capturesFile = new File(capturesPath); - File stratesFile = new File(stratesPath); - File traitsFile = new File(traitsPath); - File taillesFile = new File(taillesPath); + File capturesFile = new File(project.getCatchFile()); + File stratesFile = new File(project.getStrataFile()); + File traitsFile = new File(project.getHaulFile()); + File taillesFile = new File(project.getLengthFile()); File reftaxSpeciesFile = new File(reftaxSpeciesPath); File codeTypeEspeceFile = new File(codeTypeEspecePath); @@ -263,12 +258,9 @@ @Override protected Project doInBackground() { ProjectService projectService = projectView.getContextValue(ProjectService.class); - Project project = null; + Project resultProject = null; try { - Project p = new Project(); - p.setName(projectName); - p = projectService.createProject(p, fileToLoad); - project = p; + resultProject = projectService.createProject(project, fileToLoad); } catch (CoserBusinessException ex) { if (log.isErrorEnabled()) { log.error("Can't create project", ex); @@ -277,7 +269,7 @@ JOptionPane.ERROR_MESSAGE); projectView.getCreateProjectButton().setEnabled(true); } - return project; + return resultProject; } @Override @@ -287,9 +279,9 @@ log.info("4 import take " + (after-before) + "ms"); } try { - Project project = get(); - if (project != null) { - projectLoaded(project); + Project resultProject = get(); + if (resultProject != null) { + projectLoaded(resultProject); showControlView(false); } } catch (Exception ex) { 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-11-15 16:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-15 16:41:17 UTC (rev 210) @@ -33,6 +33,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.beans.Introspector; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.UUID; @@ -259,29 +260,35 @@ try { // on suppose que la fenetre est modale, et // que la selection ne peut pas avoir changée + int replaceCount = 0; int[] dataSelectedRows = controlView.getControlDataTable().getSelectedRows(); for (int dataSelectedRow : dataSelectedRows) { String[] data = controlDataModel.getDataAt(dataSelectedRow); - data = projectService.replaceFieldValue(project, category, field, find, replace, data, commandUUID); - controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); + String[] newData = projectService.replaceFieldValue(project, category, field, find, replace, data, false, commandUUID); - switch (category) { - case CATCH: - project.getControl().getCatch().set(dataSelectedRow + 1, data); // csv header + if (Arrays.equals(data, newData)) { controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); - break; - case HAUL: - project.getControl().getHaul().set(dataSelectedRow + 1, data); // csv header - controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); - break; - case LENGTH: - project.getControl().getLength().set(dataSelectedRow + 1, data); // csv header - controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); - break; - case STRATA: - project.getControl().getStrata().set(dataSelectedRow + 1, data); // csv header - controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); - break; + + switch (category) { + case CATCH: + project.getControl().getCatch().set(dataSelectedRow + 1, newData); // csv header + controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); + break; + case HAUL: + project.getControl().getHaul().set(dataSelectedRow + 1, newData); // csv header + controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); + break; + case LENGTH: + project.getControl().getLength().set(dataSelectedRow + 1, newData); // csv header + controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); + break; + case STRATA: + project.getControl().getStrata().set(dataSelectedRow + 1, newData); // csv header + controlDataModel.fireTableRowsUpdated(dataSelectedRow, dataSelectedRow); + break; + } + + replaceCount++; } } } catch (CoserBusinessException ex) { 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/project/ProjectCreationView.jaxx 2010-11-15 16:41:17 UTC (rev 210) @@ -33,6 +33,11 @@ uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" errorTableModel="errorsTableModel"> <field name="name" component="projectProjectName" /> + <field name="author" component="projectAuthor" /> + <field name="catchFile" component="projectCatchFile" /> + <field name="strataFile" component="projectStrataFile" /> + <field name="lengthFile" component="projectLengthFile" /> + <field name="haulFile" component="projectHaulFile" /> </BeanValidator> <script><
chatellier＠users.labs.libre-entreprise.org