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

r214 - in trunk/coser-business/src: main/java/fr/ifremer/coser/bean main/java/fr/ifremer/coser/services test/java/fr/ifremer/coser/services
by chatellier＠users.labs.libre-entreprise.org Nov. 16, 2010

Nov. 16, 2010

Author: chatellier Date: 2010-11-16 08:43:10 +0000 (Tue, 16 Nov 2010) New Revision: 214 Log: Merge commands file and properties file into properties file Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2010-11-15 17:27:03 UTC (rev 213) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/AbstractDataContainer.java 2010-11-16 08:43:10 UTC (rev 214) @@ -79,7 +79,6 @@ deletedDataHaul = null; dataLength = null; deletedDataLength = null; - historyCommand = null; } public DataStorage getCatch() { 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 17:27:03 UTC (rev 213) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-16 08:43:10 UTC (rev 214) @@ -27,17 +27,15 @@ import static org.nuiton.i18n.I18n._; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; import java.util.ArrayList; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -53,7 +51,6 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.math.util.MathUtils; @@ -296,6 +293,9 @@ inputStream = new FileInputStream(propertiesFile); props.load(inputStream); selection.fromProperties(props); + + List<Command> commands = getHistoryCommandsFromProperties(props, "selection.commands"); + selection.setHistoryCommand(commands); if (log.isDebugEnabled()) { log.debug("Read selection properties file : " + propertiesFile); @@ -311,6 +311,7 @@ } } } + project.setSelections(selections); // relecture des informations du projet (properties) @@ -417,22 +418,19 @@ } } - // command file reloading - File historyFile = new File(controlDirectory, CoserConstants.STORAGE_HISTORY_FILENAME + - CoserConstants.STORAGE_HISTORY_SELECTION_EXTENSION); - List<Command> commands = loadHistoryCommands(historyFile); - control.setHistoryCommand(commands); - // relecture des informations du control (properties) File propertiesFile = new File(controlDirectory, "control.properties"); - if (propertiesFile.exists()) { // si on a vraiment pas sauver le control ... + if (propertiesFile.exists()) { // si on a vraiment pas sauve le control ... InputStream inputStream = null; try { Properties props = new Properties(); inputStream = new FileInputStream(propertiesFile); props.load(inputStream); control.fromProperties(props); - + + List<Command> commands = getHistoryCommandsFromProperties(props, "control.commands"); + control.setHistoryCommand(commands); + if (log.isDebugEnabled()) { log.debug("Read control properties file : " + propertiesFile); } @@ -443,6 +441,9 @@ IOUtils.closeQuietly(inputStream); } } + else { + control.setHistoryCommand(new ArrayList<Command>()); + } project.setControl(control); @@ -488,12 +489,6 @@ } } - // command file reloading - File historyFile = new File(selectionDirectory, CoserConstants.STORAGE_HISTORY_FILENAME + - CoserConstants.STORAGE_HISTORY_SELECTION_EXTENSION); - List<Command> commands = loadHistoryCommands(historyFile); - selection.setHistoryCommand(commands); - return project; } @@ -545,6 +540,7 @@ // sauvegarde des informations du control (properties) File propertiesFile = new File(controlDirectory, "control.properties"); Properties props = control.toProperties(); + addHistoryCommandsToProperties(props, project.getControl().getHistoryCommand(), "control.commands"); OutputStream outputStream = null; try { outputStream = new FileOutputStream(propertiesFile); @@ -560,10 +556,6 @@ IOUtils.closeQuietly(outputStream); } - // sauvegarde de l'historique des commandes - File historyFile = new File(controlDirectory, CoserConstants.STORAGE_HISTORY_FILENAME + - CoserConstants.STORAGE_HISTORY_SELECTION_EXTENSION); - saveHistoryCommands(project.getControl().getHistoryCommand(), historyFile); } /** @@ -692,6 +684,7 @@ // sauvegarde des informations de la selection (properties) File propertiesFile = new File(selectionDirectory, "selection.properties"); Properties props = selection.toProperties(); + addHistoryCommandsToProperties(props, selection.getHistoryCommand(), "selection.commands"); OutputStream outputStream = null; try { outputStream = new FileOutputStream(propertiesFile); @@ -706,93 +699,99 @@ finally { IOUtils.closeQuietly(outputStream); } - - // sauvegarde de l'historique des commandes - File historyFile = new File(selectionDirectory, CoserConstants.STORAGE_HISTORY_FILENAME + - CoserConstants.STORAGE_HISTORY_SELECTION_EXTENSION); - saveHistoryCommands(selection.getHistoryCommand(), historyFile); } - + /** * Sauve une liste ordonnées de commande dans le fichier specifié. * + * @param props proparties to add command to * @param historyCommand command list to save - * @param historyFile file to save to + * @param propertyPrefix property prefix * @throws CoserBusinessException */ - protected void saveHistoryCommands(List<Command> historyCommand, - File historyFile) throws CoserBusinessException { + protected void addHistoryCommandsToProperties(Properties props, List<Command> historyCommand, + String propertyPrefix) throws CoserBusinessException { - // don't save empty file if list is empty - if (CollectionUtils.isEmpty(historyCommand)) { - return; + int commandIndex = 0; + for (Command command : historyCommand) { + String commandProperty = propertyPrefix + "." + commandIndex; + String commandValue = convertCommandToLine(command); + props.setProperty(commandProperty, commandValue); + commandIndex++; } - - PrintStream printStream = null; - - try { - printStream = new PrintStream(historyFile); - - for (Command command : historyCommand) { - List<String> args = new ArrayList<String>(); - args.add(command.getCommandUUID()); - args.add(command.getClass().getSimpleName()); - args.add(command.getComment() == null ? "" : command.getComment()); - args.add(command.toStringRepresentation()); - String argsString = CoserUtils.convertBracketString(args); - printStream.println(argsString); - } - - } catch (IOException ex) { - throw new CoserBusinessException("Can't save command file", ex); - } - finally { - IOUtils.closeQuietly(printStream); - } } /** * Load history command list from file. * + * @param props properties to parse + * @param propertyPrefix property prefix * @return command list (never null) * @throws CoserBusinessException */ - protected List<Command> loadHistoryCommands(File historyFile) throws CoserBusinessException { + protected List<Command> getHistoryCommandsFromProperties(Properties props, final String propertyPrefix) throws CoserBusinessException { List<Command> historyCommand = new ArrayList<Command>(); - if (historyFile.exists()) { - if (log.isDebugEnabled()) { - log.debug("Loading command list from file " + historyFile.getAbsolutePath()); - } - - BufferedReader fileReader = null; - try { - fileReader = new BufferedReader(new FileReader(historyFile)); - - String line = null; - while ((line = fileReader.readLine()) != null) { - if (StringUtils.isNotBlank(line)) { - Command command = convertLineToCommand(line); - historyCommand.add(command); + // take care of property name order + List<String> propertiesNames = new ArrayList<String>(props.stringPropertyNames()); + Collections.sort(propertiesNames, new Comparator<String>() { + @Override + public int compare(String o1, String o2) { + int result = -1; + if (o1.matches(Pattern.quote(propertyPrefix + ".") + "\\d+")) { + if (o2.matches(Pattern.quote(propertyPrefix + ".") + "\\d+")) { + int int1 = Integer.parseInt(o1.substring(propertyPrefix.length() + 1)); + int int2 = Integer.parseInt(o2.substring(propertyPrefix.length() + 1)); + result = int1 - int2; } + else { + result = o1.compareTo(o2); + } } + else { + result = o1.compareTo(o2); + } + return result; } - catch (IOException ex) { - throw new CoserBusinessException("Can't read history file", ex); + + }); + + for (String propertyName : propertiesNames) { + + if (propertyName.startsWith(propertyPrefix + ".")) { + String commandAsString = props.getProperty(propertyName); + Command command = convertLineToCommand(commandAsString); + historyCommand.add(command); } - finally { - IOUtils.closeQuietly(fileReader); - } } return historyCommand; } /** - * Convert a string line to parametized command. + * Convert a command to string info * + * @param command command to convert + * @return string command + * @throws CoserBusinessException + */ + protected String convertCommandToLine(Command command) { + + List<String> args = new ArrayList<String>(); + args.add(command.getCommandUUID()); + args.add(command.getClass().getSimpleName()); + args.add(command.getComment() == null ? "" : command.getComment()); + args.add(command.toStringRepresentation()); + String result = CoserUtils.convertBracketString(args); + + return result; + } + + /** + * Convert a string line to parameized command. + * * @param line line to convert - * @return + * @return command * @throws CoserBusinessException */ protected Command convertLineToCommand(String line) throws CoserBusinessException { Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-15 17:27:03 UTC (rev 213) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/ProjectServiceTest.java 2010-11-16 08:43:10 UTC (rev 214) @@ -31,6 +31,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Properties; import org.junit.Assert; import org.junit.Before; @@ -42,7 +43,10 @@ import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.bean.Selection; +import fr.ifremer.coser.command.Command; import fr.ifremer.coser.command.DeleteLineCommand; +import fr.ifremer.coser.command.MergeSpeciesCommand; +import fr.ifremer.coser.command.ModifyFieldCommand; /** * Project service tests. @@ -299,8 +303,62 @@ commandService.undoAction(project, project.getControl()); Assert.assertEquals(30, project.getControl().getLength().size()); } - + /** + * Test que les commandes sont bien sauvées et restaurées dans l'ordre + * d'ajout. + * @throws CoserBusinessException + */ + @Test + public void testPropertiesCommandOrder() throws CoserBusinessException { + Properties props = new Properties(); + props.setProperty("test wrong data", "wrong data"); + + List<Command> commands = new ArrayList<Command>(); + + // make real commands + MergeSpeciesCommand msc1 = new MergeSpeciesCommand(); + //msc1.setCategory(Category.CATCH); + msc1.setSpeciesNames(new String[]{"thuna"}); + MergeSpeciesCommand msc2 = new MergeSpeciesCommand(); + //msc2.setCategory(Category.CATCH); + msc2.setSpeciesNames(new String[]{"bar"}); + + DeleteLineCommand dlc1 = new DeleteLineCommand(); + dlc1.setCategory(Category.CATCH); + dlc1.setLineNumber("10"); + DeleteLineCommand dlc2 = new DeleteLineCommand(); + dlc2.setCategory(Category.STRATA); + dlc2.setLineNumber("99"); + + ModifyFieldCommand mfc1 = new ModifyFieldCommand(); + mfc1.setCategory(Category.CATCH); + ModifyFieldCommand mfc2 = new ModifyFieldCommand(); + mfc2.setCategory(Category.STRATA); + + commands.add(msc1); + commands.add(dlc1); + commands.add(mfc1); + commands.add(dlc2); + commands.add(mfc2); + commands.add(msc2); + + projectService.addHistoryCommandsToProperties(props, commands, "control.commands"); + + // try to read it + commands = projectService.getHistoryCommandsFromProperties(props, "control.commands"); + + Assert.assertTrue(commands.get(0) instanceof MergeSpeciesCommand); + Assert.assertTrue(commands.get(1) instanceof DeleteLineCommand); + Assert.assertTrue(commands.get(2) instanceof ModifyFieldCommand); + Assert.assertTrue(commands.get(3) instanceof DeleteLineCommand); + Assert.assertTrue(commands.get(4) instanceof ModifyFieldCommand); + Assert.assertTrue(commands.get(5) instanceof MergeSpeciesCommand); + + + } + + /** * Test de la method sampling effort. * * @throws CoserBusinessException

1 0

r213 - in trunk: coser-business/src/main/java/fr/ifremer/coser/bean coser-business/src/main/java/fr/ifremer/coser/services coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/java/fr/ifremer/coser/ui/control
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

Author: chatellier Date: 2010-11-15 17:27:03 +0000 (Mon, 15 Nov 2010) New Revision: 213 Log: Ajout de la sauvegarde/relecture des control Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Control.java 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-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 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/control/ControlView.jaxx Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Control.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Control.java 2010-11-15 16:57:53 UTC (rev 212) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Control.java 2010-11-15 17:27:03 UTC (rev 213) @@ -25,6 +25,8 @@ package fr.ifremer.coser.bean; +import java.util.Properties; + /** * Control entity. * @@ -39,4 +41,29 @@ /** serialVersionUID. */ private static final long serialVersionUID = 3693938021315541627L; + protected String comment; + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + String oldValue = this.comment; + this.comment = comment; + getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); + } + + public Properties toProperties() { + Properties props = new Properties(); + if (comment != null) { + props.setProperty("control.comment", comment); + } + return props; + } + + public void fromProperties(Properties props) { + if (props.containsKey("control.comment")) { + setComment(props.getProperty("control.comment")); + } + } } 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:57:53 UTC (rev 212) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-15 17:27:03 UTC (rev 213) @@ -213,8 +213,21 @@ public Properties toProperties() { Properties props = new Properties(); - props.setProperty("project.author", author); - props.setProperty("project.comment", comment); + if (author != null) { + props.setProperty("project.author", author); + } + if (comment != null) { + props.setProperty("project.comment", comment); + } return props; } + + public void fromProperties(Properties props) { + if (props.containsKey("project.author")) { + setAuthor(props.getProperty("project.author")); + } + if (props.containsKey("control.comment")) { + setComment(props.getProperty("control.comment")); + } + } } 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-15 16:57:53 UTC (rev 212) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Selection.java 2010-11-15 17:27:03 UTC (rev 213) @@ -124,7 +124,9 @@ } public void setComment(String comment) { + String oldValue = this.comment; this.comment = comment; + getPropertyChangeSupport().firePropertyChange("comment", oldValue, comment); } public Properties toProperties() { 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:57:53 UTC (rev 212) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-15 17:27:03 UTC (rev 213) @@ -231,7 +231,7 @@ IOUtils.closeQuietly(outputStream); } - // init additional structures + // init additional structures (load empty control) project.setSelections(new HashMap<String, Selection>()); control.setHistoryCommand(new ArrayList<Command>()); project.setControl(control); @@ -290,7 +290,6 @@ // relecture des informations de la selection (properties) File propertiesFile = new File(selectionDirectory, "selection.properties"); - InputStream inputStream = null; try { Properties props = new Properties(); @@ -314,6 +313,25 @@ } project.setSelections(selections); + // relecture des informations du projet (properties) + File propertiesFile = new File(projectDirectory, "project.properties"); + InputStream inputStream = null; + try { + Properties props = new Properties(); + inputStream = new FileInputStream(propertiesFile); + props.load(inputStream); + project.fromProperties(props); + + if (log.isDebugEnabled()) { + log.debug("Read project properties file : " + propertiesFile); + } + } catch (IOException ex) { + throw new CoserBusinessException("Can't read project properties file", ex); + } + finally { + IOUtils.closeQuietly(inputStream); + } + return project; } @@ -405,6 +423,27 @@ List<Command> commands = loadHistoryCommands(historyFile); control.setHistoryCommand(commands); + // relecture des informations du control (properties) + File propertiesFile = new File(controlDirectory, "control.properties"); + if (propertiesFile.exists()) { // si on a vraiment pas sauver le control ... + InputStream inputStream = null; + try { + Properties props = new Properties(); + inputStream = new FileInputStream(propertiesFile); + props.load(inputStream); + control.fromProperties(props); + + if (log.isDebugEnabled()) { + log.debug("Read control properties file : " + propertiesFile); + } + } catch (IOException ex) { + throw new CoserBusinessException("Can't read control properties file", ex); + } + finally { + IOUtils.closeQuietly(inputStream); + } + } + project.setControl(control); return project; @@ -471,6 +510,8 @@ String projectName = project.getName(); File projectDirectory = new File(projectsDirectory, projectName); + Control control = project.getControl(); + // creation du dossier de control (il peut deja exister) File controlDirectory = new File(projectDirectory, CoserConstants.STORAGE_CONTROL_DIRECTORY); controlDirectory.mkdirs(); @@ -485,11 +526,11 @@ if (log.isDebugEnabled()) { log.debug("Saving control file : " + controlFile); } - DataStorage content = getProjectContent(project, project.getControl(), category, false); + DataStorage content = getProjectContent(project, control, category, false); importService.storeData(project, content, controlFile); // save deleted content (if needed) - DataStorage contentDeleted = getProjectContent(project, project.getControl(), category, true); + DataStorage contentDeleted = getProjectContent(project, control, category, true); // if more content than header if (contentDeleted.size() > 1) { File deletedDataFile = new File(controlDirectory, @@ -500,7 +541,25 @@ } } } - + + // sauvegarde des informations du control (properties) + File propertiesFile = new File(controlDirectory, "control.properties"); + Properties props = control.toProperties(); + OutputStream outputStream = null; + try { + outputStream = new FileOutputStream(propertiesFile); + props.store(outputStream, null); + + if (log.isDebugEnabled()) { + log.debug("Saving control properties file : " + propertiesFile); + } + } catch (IOException ex) { + throw new CoserBusinessException("Can't save control properties file", ex); + } + finally { + IOUtils.closeQuietly(outputStream); + } + // sauvegarde de l'historique des commandes File historyFile = new File(controlDirectory, CoserConstants.STORAGE_HISTORY_FILENAME + CoserConstants.STORAGE_HISTORY_SELECTION_EXTENSION); 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:57:53 UTC (rev 212) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-15 17:27:03 UTC (rev 213) @@ -349,6 +349,7 @@ ControlView controlView = new ControlView(view); controlView.setHandler(new ControlHandler()); + controlView.setControl(project.getControl()); // restore session size SwingSession session = (SwingSession)view.getContextValue(SwingSession.class); 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:57:53 UTC (rev 212) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlHandler.java 2010-11-15 17:27:03 UTC (rev 213) @@ -68,6 +68,7 @@ import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserConstants.ValidationLevel; import fr.ifremer.coser.CoserException; +import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; import fr.ifremer.coser.control.ValidationError; import fr.ifremer.coser.data.AbstractDataEntity; 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:57:53 UTC (rev 212) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2010-11-15 17:27:03 UTC (rev 213) @@ -35,6 +35,7 @@ ]]></script> <ControlHandler id="handler" javaBean="null" /> + <fr.ifremer.coser.bean.Control id="control" javaBean="null" /> <row> <cell fill="horizontal" insets="0" anchor="west" columns="2"> @@ -137,9 +138,12 @@ </JScrollPane> <JPanel layout="{new BorderLayout()}"> - <JLabel text="coser.ui.control.comment" constraints="{BorderLayout.NORTH}"/> - <JScrollPane constraints="{BorderLayout.CENTER}"> - <JTextArea rows="3" /> + <JLabel text="coser.ui.control.comment" constraints="BorderLayout.NORTH"/> + <JScrollPane constraints="BorderLayout.CENTER"> + <JTextArea id="controlComment" rows="3" text="{getControl().getComment()}" /> + <javax.swing.text.Document javaBean="controlComment.getDocument()" + onInsertUpdate='getControl().setComment(controlComment.getText()); saveButton.setEnabled(true)' + onRemoveUpdate='getControl().setComment(controlComment.getText()); saveButton.setEnabled(true)' /> </JScrollPane> </JPanel> </JSplitPane>

1 0

r212 - in trunk: coser-business/src/main/java/fr/ifremer/coser/bean coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

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 ?

1 0

r211 - in trunk/coser-business/src/main/java/fr/ifremer/coser: bean services
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

Author: chatellier Date: 2010-11-15 16:47:23 +0000 (Mon, 15 Nov 2010) New Revision: 211 Log: Save project properties 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 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:41:17 UTC (rev 210) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/bean/Project.java 2010-11-15 16:47:23 UTC (rev 211) @@ -26,7 +26,10 @@ package fr.ifremer.coser.bean; import java.util.Map; +import java.util.Properties; +import org.apache.commons.lang.StringUtils; + import fr.ifremer.coser.storage.DataStorage; /** @@ -209,4 +212,11 @@ } } } + + public Properties toProperties() { + Properties props = new Properties(); + props.setProperty("project.author", author); + props.setProperty("project.comment", comment); + return props; + } } 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:41:17 UTC (rev 210) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ProjectService.java 2010-11-15 16:47:23 UTC (rev 211) @@ -213,6 +213,25 @@ } } + // save project properties file + File propertiesFile = new File(projectDirectory, "project.properties"); + Properties props = project.toProperties(); + OutputStream outputStream = null; + try { + outputStream = new FileOutputStream(propertiesFile); + props.store(outputStream, null); + + if (log.isDebugEnabled()) { + log.debug("Saving project properties file : " + propertiesFile); + } + } catch (IOException ex) { + throw new CoserBusinessException("Can't save project properties file", ex); + } + finally { + IOUtils.closeQuietly(outputStream); + } + + // init additional structures project.setSelections(new HashMap<String, Selection>()); control.setHistoryCommand(new ArrayList<Command>()); project.setControl(control);

1 0

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
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

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><![CDATA[ @@ -54,7 +59,10 @@ <cell anchor="west"> <JLabel text="coser.ui.project.projectname" /> </cell> - <cell anchor="west"> + <cell> + <JLabel text='{getContextValue(fr.ifremer.coser.CoserConfig.class).getProjectsDirectory().getAbsolutePath() + "/"}' /> + </cell> + <cell anchor="west" weightx="1" fill="horizontal"> <JTextField id="projectProjectName" text="{project.getName()}" /> <javax.swing.text.Document javaBean="projectProjectName.getDocument()" onInsertUpdate='getProject().setName(projectProjectName.getText())' @@ -64,13 +72,13 @@ </row> <row> <cell anchor="west"> - <JLabel text="coser.ui.project.projectpersonincharge" /> + <JLabel text="coser.ui.project.projectauthor" /> </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 weightx="1" fill="horizontal" columns="2"> + <JTextField id="projectAuthor" text="{project.getAuthor()}" /> + <javax.swing.text.Document javaBean="projectAuthor.getDocument()" + onInsertUpdate='getProject().setAuthor(projectAuthor.getText())' + onRemoveUpdate='getProject().setAuthor(projectAuthor.getText())' /> </cell> </row> @@ -78,48 +86,60 @@ <cell anchor="west"> <JLabel text="coser.ui.project.captureFile" /> </cell> - <cell weightx="1" fill="horizontal"> - <JTextField id="projectCapturesFileField" /> + <cell weightx="1" fill="horizontal" columns="2"> + <JTextField id="projectCatchFile" text="{project.getCatchFile()}" /> + <javax.swing.text.Document javaBean="projectCatchFile.getDocument()" + onInsertUpdate='getProject().setCatchFile(projectCatchFile.getText())' + onRemoveUpdate='getProject().setCatchFile(projectCatchFile.getText())' /> </cell> <cell> <JButton id="projectCapturesSelectButton" text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectInputFile(this, projectCapturesFileField)" /> + onActionPerformed="getHandler().selectInputFile(this, projectCatchFile)" /> </cell> </row> <row> <cell anchor="west"> <JLabel text="coser.ui.project.stratesFile" /> </cell> - <cell fill="horizontal"> - <JTextField id="projectStratesFileField" /> + <cell fill="horizontal" columns="2"> + <JTextField id="projectStrataFile" text="{project.getStrataFile()}" /> + <javax.swing.text.Document javaBean="projectStrataFile.getDocument()" + onInsertUpdate='getProject().setStrataFile(projectStrataFile.getText())' + onRemoveUpdate='getProject().setStrataFile(projectStrataFile.getText())' /> </cell> <cell> <JButton id="projectStratesFileSelectButton" text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectInputFile(this, projectStratesFileField)" /> + onActionPerformed="getHandler().selectInputFile(this, projectStrataFile)" /> </cell> </row> <row> <cell anchor="west"> <JLabel text="coser.ui.project.lengthFile" /> </cell> - <cell fill="horizontal"> - <JTextField id="projectLengthFileField" /> + <cell fill="horizontal" columns="2"> + <JTextField id="projectLengthFile" text="{project.getLengthFile()}" /> + <javax.swing.text.Document javaBean="projectLengthFile.getDocument()" + onInsertUpdate='getProject().setLengthFile(projectLengthFile.getText())' + onRemoveUpdate='getProject().setLengthFile(projectLengthFile.getText())' /> </cell> <cell> <JButton id="projectSizeFileSelectButton" text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectInputFile(this, projectLengthFileField)" /> + onActionPerformed="getHandler().selectInputFile(this, projectLengthFile)" /> </cell> </row> <row> <cell anchor="west"> <JLabel text="coser.ui.project.traitsFile" /> </cell> - <cell fill="horizontal"> - <JTextField id="projectTraitsFileField" /> + <cell fill="horizontal" columns="2"> + <JTextField id="projectHaulFile" text="{project.getHaulFile()}" /> + <javax.swing.text.Document javaBean="projectHaulFile.getDocument()" + onInsertUpdate='getProject().setHaulFile(projectHaulFile.getText())' + onRemoveUpdate='getProject().setHaulFile(projectHaulFile.getText())' /> </cell> <cell> <JButton id="projectTraitsFileSelectButton" text="coser.ui.common.selectFile" - onActionPerformed="getHandler().selectInputFile(this, projectTraitsFileField)" /> + onActionPerformed="getHandler().selectInputFile(this, projectHaulFile)" /> </cell> </row> <row> @@ -127,13 +147,13 @@ <JLabel id="referenceSpeciesDescriptionLabel" text="coser.ui.project.usedReferenceSpeciesFile" enabled="{!customReferenceCheckBox.isSelected()}" /> </cell> - <cell anchor="west"> + <cell anchor="west" columns="2"> <JLabel id="referenceSpeciesFileLabel" text="{getContextValue(fr.ifremer.coser.CoserConfig.class).getReferenceSpeciesPath()}" enabled="{!customReferenceCheckBox.isSelected()}" /> </cell> </row> <row> - <cell columns="3" fill="horizontal"> + <cell columns="4" fill="horizontal"> <Table id="useCustomReferenceFilePanel"> <row> <cell> @@ -157,9 +177,9 @@ <cell anchor="northwest"> <JLabel text="coser.ui.project.projectcomment" /> </cell> - <cell fill="horizontal"> + <cell fill="horizontal" columns="2"> <JScrollPane> - <JXTextArea id="projectComment" constructorParams='_("coser.ui.common.comment")' rows="3" /> + <JTextArea id="projectComment" rows="3" /> </JScrollPane> <javax.swing.text.Document javaBean="projectComment.getDocument()" onInsertUpdate='getProject().setComment(projectComment.getText())' @@ -168,7 +188,7 @@ </cell> </row> <row> - <cell columns="3" anchor="east"> + <cell columns="4" anchor="east"> <JButton id="createProjectButton" text="coser.ui.project.createProject" onActionPerformed="getHandler().createProject(this)" /> </cell> 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Project-error-validation.xml 2010-11-15 16:41:17 UTC (rev 210) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -29,7 +29,37 @@ <field name="name"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>Project name is required</message> + <message>coser.ui.control.project.requiredname</message> </field-validator> </field> + <field name="author"> + <field-validator type="requiredstring"> + <param name="trim">true</param> + <message>coser.ui.control.project.requiredauthor</message> + </field-validator> + </field> + <field name="catchFile"> + <field-validator type="requiredstring"> + <param name="trim">true</param> + <message>coser.ui.control.project.requiredcatchFile</message> + </field-validator> + </field> + <field name="haulFile"> + <field-validator type="requiredstring"> + <param name="trim">true</param> + <message>coser.ui.control.project.requiredhaulFile</message> + </field-validator> + </field> + <field name="lengthFile"> + <field-validator type="requiredstring"> + <param name="trim">true</param> + <message>coser.ui.control.project.requiredlengthFile</message> + </field-validator> + </field> + <field name="strataFile"> + <field-validator type="requiredstring"> + <param name="trim">true</param> + <message>coser.ui.control.project.requiredstrataFile</message> + </field-validator> + </field> </validators> \ No newline at end of file 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-15 16:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/Selection-error-validation.xml 2010-11-15 16:41:17 UTC (rev 210) @@ -29,7 +29,7 @@ <field name="name"> <field-validator type="requiredstring"> <param name="trim">true</param> - <message>Selection name is required</message> + <message>coser.ui.selection.selection.requiredName</message> </field-validator> </field> </validators> \ No newline at end of file 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:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-15 16:41:17 UTC (rev 210) @@ -33,6 +33,12 @@ coser.ui.control.globalErrorMenuSelectAll=Select all lines coser.ui.control.graph.specy=Specy \: coser.ui.control.graphtitle=Graph +coser.ui.control.project.requiredauthor= +coser.ui.control.project.requiredcatchFile= +coser.ui.control.project.requiredhaulFile= +coser.ui.control.project.requiredlengthFile= +coser.ui.control.project.requiredname= +coser.ui.control.project.requiredstrataFile= coser.ui.control.replace.find=Find \: coser.ui.control.replace.inField=In field \: coser.ui.control.replace.replace=Replace \: @@ -69,9 +75,9 @@ coser.ui.project.openProject=Open coser.ui.project.openProjectTitle=Open existing project coser.ui.project.project=Project \: +coser.ui.project.projectauthor= 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 @@ -114,6 +120,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.requiredName= coser.ui.selection.sizeAllYearSpecies=L3 \: Species with size all year coser.ui.selection.speciesMenuFusion=Merge coser.ui.selection.speciesMenuLabel=Species menu 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:26:33 UTC (rev 209) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-15 16:41:17 UTC (rev 210) @@ -33,6 +33,12 @@ coser.ui.control.globalErrorMenuSelectAll=S\u00E9lectionner toutes les lignes coser.ui.control.graph.specy=Esp\u00E8ces \: coser.ui.control.graphtitle=Graphique +coser.ui.control.project.requiredauthor=Le champs 'auteur' est requis +coser.ui.control.project.requiredcatchFile=Le fichier 'capture' est requis +coser.ui.control.project.requiredhaulFile=Le fichier 'traits' est requis +coser.ui.control.project.requiredlengthFile=Le fichier 'taille' est requis +coser.ui.control.project.requiredname=Le champs 'nom' est requis +coser.ui.control.project.requiredstrataFile=Le fichier 'strates' est requis coser.ui.control.replace.find=Chercher \: coser.ui.control.replace.inField=Dans le champ \: coser.ui.control.replace.replace=Remplacer \: @@ -69,9 +75,9 @@ coser.ui.project.openProject=Ouvrir coser.ui.project.openProjectTitle=Ouvrir un projet existant coser.ui.project.project=Projet \: +coser.ui.project.projectauthor=Auteur \: 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 @@ -114,6 +120,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.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 coser.ui.selection.speciesMenuLabel=Menu esp\u00E8ces

1 0

r209 - trunk/coser-ui
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

Author: chatellier Date: 2010-11-15 16:26:33 +0000 (Mon, 15 Nov 2010) New Revision: 209 Log: Parse validation files Modified: trunk/coser-ui/pom.xml Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2010-11-15 15:42:19 UTC (rev 208) +++ trunk/coser-ui/pom.xml 2010-11-15 16:26:33 UTC (rev 209) @@ -165,6 +165,7 @@ <execution> <goals> <goal>parserJava</goal> + <goal>parserValidation</goal> <goal>gen</goal> <goal>bundle</goal> </goals>

1 0

r208 - in trunk: coser-business/src/main/resources/fr/ifremer/coser coser-ui/src/main/resources coser-ui/src/main/resources/fr coser-ui/src/main/resources/fr/ifremer coser-ui/src/main/resources/fr/ifremer/coser
by chatellier＠users.labs.libre-entreprise.org Nov. 15, 2010

Nov. 15, 2010

Author: chatellier Date: 2010-11-15 15:42:19 +0000 (Mon, 15 Nov 2010) New Revision: 208 Log: Move bean validation file to ui module Added: trunk/coser-ui/src/main/resources/fr/ trunk/coser-ui/src/main/resources/fr/ifremer/ trunk/coser-ui/src/main/resources/fr/ifremer/coser/ trunk/coser-ui/src/main/resources/fr/ifremer/coser/bean/ Removed: trunk/coser-business/src/main/resources/fr/ifremer/coser/bean/

1 0

r207 - trunk/coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org Nov. 10, 2010

Nov. 10, 2010

Author: chatellier Date: 2010-11-10 17:31:36 +0000 (Wed, 10 Nov 2010) New Revision: 207 Log: Clean file 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-10 17:31:28 UTC (rev 206) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-10 17:31:36 UTC (rev 207) @@ -94,16 +94,12 @@ 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 \: coser.ui.selection.details.name=Selection name \: -coser.ui.selection.details.otherComment=Other comments coser.ui.selection.details.saveSelection=Save selection coser.ui.selection.details.showMapTip= coser.ui.selection.details.showSpreciesTip= coser.ui.selection.details.species=Species \: coser.ui.selection.details.strata=Strata \: -coser.ui.selection.details.technicalComment=Technical comment coser.ui.selection.details.type= coser.ui.selection.filter.density=Density \: coser.ui.selection.filter.filter=Filter 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-10 17:31:28 UTC (rev 206) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-10 17:31:36 UTC (rev 207) @@ -94,16 +94,12 @@ 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 \: coser.ui.selection.details.name=Nom de la s\u00E9lection \: -coser.ui.selection.details.otherComment=Autre commentaire coser.ui.selection.details.saveSelection=Sauvegarder la s\u00E9lection 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.species=Esp\u00E8ces \: coser.ui.selection.details.strata=Strates \: -coser.ui.selection.details.technicalComment=Commentaire technique coser.ui.selection.details.type=Filtrer par type \: coser.ui.selection.filter.density=Densit\u00E9 \: coser.ui.selection.filter.filter=Filtrer

1 0

r206 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-business/src/main/resources/i18n coser-ui/src/main/java/fr/ifremer/coser/ui
by chatellier＠users.labs.libre-entreprise.org Nov. 10, 2010

Nov. 10, 2010

Author: chatellier Date: 2010-11-10 17:31:28 +0000 (Wed, 10 Nov 2010) New Revision: 206 Log: Ajout d'une configuration pour les ecarts tol?\195?\169r?\195?\169 lors du control entre les captures et les tailles Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.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 Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2010-11-10 17:31:28 UTC (rev 206) @@ -76,7 +76,7 @@ String result = getOption(CoserBusinessOption.REFERENCE_SPECIES.key); return result; } - + public String getReferenceTypeEspecesPath() { String result = getOption(CoserBusinessOption.REFERENCE_TYPE_ESPECES.key); return result; @@ -87,6 +87,11 @@ return result; } + public double getControlDiffCatchLength() { + double result = getOptionAsDouble(CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH.key); + return result; + } + public static enum CoserBusinessOption implements OptionDef { DATABASE_DIRECTORY("coser.database.directory", _("coser.config.database.directory.description"), "${user.home}" + File.separator + "coser", String.class, false, false), @@ -96,7 +101,8 @@ REFERENCE_SPECIES("coser.reference.species", _("coser.config.reference.species.description"), "", String.class, false, false), REFERENCE_TYPE_ESPECES("coser.reference.typeEspeces", _("coser.config.reference.typeEspeces.description"), "", String.class, false, false), - OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false); + OBSERVATION_NOBSMIN("coser.observation.nobsmin", _("coser.config.observation.nobsmin.description"), "1.0", Double.class, false, false), + CONTROL_DIFF_CACTH_LENGTH("coser.control.diffcatchlength", _("coser.config.control.diffcatchlength.description"), "5.0", Double.class, false, false); protected String key; protected String description; 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-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/resources/i18n/coser-business-en_GB.properties 2010-11-10 17:31:28 UTC (rev 206) @@ -19,8 +19,6 @@ Weight\ attribute\ is\ not\ a\ valid\ double= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s= Wrong\ header\ detected\ in\ file\ %s.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s= -Wrong\ header\ detected\ in\ file.\ Find\ \:\ %s,\ expected\ %s\ or\ %s= You\ must\ enter\ a\ campagne\ name.= You\ must\ enter\ a\ espece\ name.= You\ must\ enter\ a\ haul\ name.= @@ -41,18 +39,17 @@ coser.business.control.error.duplicatedLine= coser.business.control.error.minObservationCount= coser.business.control.error.minObservationCountDetail= -coser.business.control.error.noCatchNumberWithWeight= coser.business.control.noerrorfound=No error found coser.business.control.step.observation= coser.business.control.step.xworks= coser.business.line=Line coser.business.selection.noControlForSelection= +coser.config.control.diffcatchlength.description= coser.config.database.directory.description= coser.config.observation.nobsmin.description= coser.config.projects.directory.description= coser.config.reference.species.description= coser.config.reference.typeEspeces.description= -coser.config.reference.zones.description= coser.config.validator.directory.description= lat\ attribute\ is\ not\ a\ valid\ double= lat\ must\ contains\ at\ least\ 5\ decimal= 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-10 17:07:31 UTC (rev 205) +++ trunk/coser-business/src/main/resources/i18n/coser-business-fr_FR.properties 2010-11-10 17:31:28 UTC (rev 206) @@ -39,18 +39,17 @@ coser.business.control.error.duplicatedLine=Ligne en doublon coser.business.control.error.minObservationCount=Nombre minimal d'observation non atteint coser.business.control.error.minObservationCountDetail=Nombre minimal d'observation non atteint (%s) \: %.2f -coser.business.control.error.noCatchNumberWithWeight=Poids renseign\u00E9, mais capture non pr\u00E9sente coser.business.control.noerrorfound=Aucune erreur d\u00E9tect\u00E9e coser.business.control.step.observation=V\u00E9rification du nombre d'observation (%d%%) coser.business.control.step.xworks=Validation par lignes (%d%%) coser.business.line=Ligne coser.business.selection.noControlForSelection=Impossible de creer une s\u00E9lection sans donn\u00E9es control\u00E9es. +coser.config.control.diffcatchlength.description=Pourcentage d'\u00E9cart tol\u00E9r\u00E9 entre les captures et les tailles coser.config.database.directory.description=Emplacement de la base de campagnes de coser coser.config.observation.nobsmin.description=Nombre minimal d'observation coser.config.projects.directory.description=Emplacement des projets Coser coser.config.reference.species.description=Emplacement du fichier de r\u00E9f\u00E9rence des esp\u00E8ces coser.config.reference.typeEspeces.description=Emplacement du fichier de code type des esp\u00E8ces -coser.config.reference.zones.description=Emplacement du fichier de r\u00E9f\u00E9rence des zones coser.config.validator.directory.description=Emplacement des fichiers de validations lat\ attribute\ is\ not\ a\ valid\ double= lat\ must\ contains\ at\ least\ 5\ decimal= 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-10 17:07:31 UTC (rev 205) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2010-11-10 17:31:28 UTC (rev 206) @@ -162,6 +162,7 @@ modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_SPECIES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.REFERENCE_TYPE_ESPECES); modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.OBSERVATION_NOBSMIN); + modelBuilder.addOption(CoserBusinessConfig.CoserBusinessOption.CONTROL_DIFF_CACTH_LENGTH); ConfigUI configUI = modelBuilder.buildUI(view, _("coser.config.category.main")); JDialog dialogUI = new JDialog(view, _("coser.ui.config.title"));

1 0

r205 - in trunk: coser-business/src/main/java/fr/ifremer/coser/validators coser-ui/src/main/java/fr/ifremer/coser/ui/selection coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model coser-ui/src/main/java/fr/ifremer/coser/ui/util
by chatellier＠users.labs.libre-entreprise.org Nov. 10, 2010

Nov. 10, 2010

Author: chatellier Date: 2010-11-10 17:07:31 +0000 (Wed, 10 Nov 2010) New Revision: 205 Log: Fix license headers Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserExpressionValidator.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/SpecyTypesListModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListModel.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserExpressionValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserExpressionValidator.java 2010-11-10 16:58:38 UTC (rev 204) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserExpressionValidator.java 2010-11-10 17:07:31 UTC (rev 205) @@ -1,3 +1,27 @@ +/* + * #%L + * Coser :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package fr.ifremer.coser.validators; import com.opensymphony.xwork2.util.ValueStack; 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-10 16:58:38 UTC (rev 204) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionView.jaxx 2010-11-10 17:07:31 UTC (rev 205) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 Ifremer, Codelutin + Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -30,15 +30,6 @@ <SelectionHandler id="handler" javaBean="null" /> <script><![CDATA[ void $afterCompleteSetup() { - /*// modification (species -> all species list) - SpecyListTestModel model = getSelectionListsView().getSelectionAllSpeciesListModel(); - getSelectionDetailsTab().getSpecyList().addListSelectionListener(model); - ((SpecyListSelectionModel)getSelectionDetailsTab().getSpecyList().getSelectionModel()).fillSelection(); - - // FIXME add common interface to species models - //getSelectionDetailsTab().getSpecyList().getModel().addListDataListener((SpecyListSelectionModel)getSelectionDetailsTab().getSpecyList().getSelectionModel()); - */ - addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent event) { if (getHandler() != null) { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/SpecyTypesListModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/SpecyTypesListModel.java 2010-11-10 16:58:38 UTC (rev 204) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/model/SpecyTypesListModel.java 2010-11-10 17:07:31 UTC (rev 205) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListModel.java 2010-11-10 16:58:38 UTC (rev 204) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/CoserListModel.java 2010-11-10 17:07:31 UTC (rev 205) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2010 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public + * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */

1 0