June 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2318 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 04 Jun '09

04 Jun '09

Author: chatellier Date: 2009-06-04 14:50:05 +0000 (Thu, 04 Jun 2009) New Revision: 2318 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx Log: Make refresh work Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-04 09:34:22 UTC (rev 2317) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2009-06-04 14:50:05 UTC (rev 2318) @@ -1,7 +1,6 @@  - - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  @@ -56,6 +38,7 @@ cellMap.addMapMouseListener(getMapListener()); toolSet.setupListeners(cellMap); toolMap.add((Component)toolSet); + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { @@ -73,24 +56,30 @@ } } }); + public void refresh() { getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); Cell cell = getVerifier().getEntity(Cell.class); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); setBean((CellImpl) cell); + cellChanged = false; - jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), getBean()); + jaxx.runtime.SwingUtil.fillComboBox(fieldCell, getRegion().getCell(), getBean()); cellChanged = true; } -protected OpenMapEvents getMapListener(){ + +protected OpenMapEvents getMapListener() { if (mapListener == null){ mapListener = new OpenMapEvents(cellMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) { - @Override public boolean onMouseClicked() { - for (Cell c : cellMap.getSelectedCells()){ - if (getBean() != null){ - if (!c.getTopiaId().equals(getBean().getTopiaId())){ + for (Cell c : cellMap.getSelectedCells()) { + if (getBean() != null) { + if (!c.getTopiaId().equals(getBean().getTopiaId())) { jaxx.runtime.SwingUtil.fillComboBox(fieldCell,getRegion().getCell(), c); return true; } @@ -104,7 +93,7 @@ } protected void fieldCellChanged() { - if (cellChanged){ + if (cellChanged) { Cell c = (Cell)fieldCell.getSelectedItem(); if (c==null) { return; @@ -118,73 +107,73 @@ } } ]]></script> - <JPanel id='body' layout='{new BorderLayout()}'> - <JSplitPane id="CellTab" name="Cells" constraints='BorderLayout.CENTER' - oneTouchExpandable="true" dividerLocation="200" orientation="horizontal"> - <Table> - <row> - <cell fill='horizontal' columns='2' weightx='1.0'> - <JComboBox id="fieldCell" onActionPerformed='fieldCellChanged()' model='{new DefaultComboBoxModel()}'/> - </cell> - </row> - <row> - <cell> - <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' + <JPanel id='body' layout='{new BorderLayout()}'> + <JSplitPane id="CellTab" name="Cells" constraints='BorderLayout.CENTER' + oneTouchExpandable="true" dividerLocation="200" orientation="horizontal"> + <Table> + <row> + <cell fill='horizontal' columns='2' weightx='1.0'> + <JComboBox id="fieldCell" onActionPerformed='fieldCellChanged()' model='{new DefaultComboBoxModel()}'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.cell.name" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldCellName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getName())}' decorator='boxed' onKeyReleased='getBean().setName(fieldCellName.getText())' enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell> - <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> - </cell> - </row> - <row> - <cell> - <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> - </cell> - </row> - <row> - <cell> - <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> - </cell> - <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed'/> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JLabel text="isisfish.cell.comments" enabled='{isActif()}'/> - </cell> - </row> - <row> - <cell columns='2' fill='both' weighty='1.0' weightx='1.0'> - <JScrollPane> - <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed'/> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' decorator='boxed'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/> - </cell> - </row> - </Table> - <JPanel id='map' layout='{new BorderLayout()}'> - <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> - <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER' decorator='boxed'/> - </JPanel> - </JSplitPane> - </JPanel> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.cell.latitude" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldCellLatitude" text='{getBean().getLatitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.cell.longitude" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldCellLongitude" text='{getBean().getLongitude()}' editable="false" enabled='{isActif()}' decorator='boxed'/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.cell.land" enabled='{isActif()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldCellLand" onActionPerformed='getBean().setLand(fieldCellLand.isSelected())' enabled='{isActif()}' selected='{getBean().getLand()}' decorator='boxed'/> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JLabel text="isisfish.cell.comments" enabled='{isActif()}'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weighty='1.0' weightx='1.0'> + <JScrollPane> + <JTextArea id="fieldCellComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldCellComment.getText())' enabled='{isActif()}' decorator='boxed'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton id='save' text='isisfish.common.save' decorator='boxed'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id='cancel' text='isisfish.common.cancel' decorator='boxed'/> + </cell> + </row> + </Table> + <JPanel id='map' layout='{new BorderLayout()}'> + <fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap' javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()' constraints='BorderLayout.NORTH' decorator='boxed'/> + <fr.ifremer.isisfish.map.IsisMapBean id='cellMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' selectionMode="1" selectedCells='{getBean()}' fisheryRegion='{getRegion()}' constraints='BorderLayout.CENTER' decorator='boxed'/> + </JPanel> + </JSplitPane> + </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI>

1 0

r2317 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org 04 Jun '09

04 Jun '09

Author: chatellier Date: 2009-06-04 09:34:22 +0000 (Thu, 04 Jun 2009) New Revision: 2317 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/RegionMonitor.java Log: Refactor and comment data change monitoring class. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/RegionMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/RegionMonitor.java 2009-06-04 09:16:46 UTC (rev 2316) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/RegionMonitor.java 2009-06-04 09:34:22 UTC (rev 2317) @@ -1,7 +1,20 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ +/* *##% + * Copyright (C) 2009 Ifremer, Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ package fr.ifremer.isisfish.ui; @@ -9,45 +22,49 @@ import java.beans.PropertyChangeSupport; /** + * Class to listen for region change. + * + * For adding region, removing region... + * + * @author letellier + * @version $Revision$ * - * @author letellier + * Last update: $Date$ + * by : $Author$ */ public class RegionMonitor { - /** pour le support des modifications de propriétés */ + /** pour le support des modifications de propriétés. */ protected final PropertyChangeSupport pcs; - protected Boolean regionChanged = false; + + protected boolean regionChanged = false; + protected static String REGION_PROPERTY = "regionChanged"; public RegionMonitor() { this.pcs = new PropertyChangeSupport(this); } - public void changeRegion(){ + public void changeRegion() { setRegionChanged(!regionChanged); } - protected Boolean getRegionChanged() { + protected boolean isRegionChanged() { return regionChanged; } - protected void setRegionChanged(Boolean regionChanged) { - pcs.firePropertyChange(REGION_PROPERTY, this.regionChanged, regionChanged); + protected void setRegionChanged(boolean regionChanged) { + boolean oldValue = this.regionChanged; this.regionChanged = regionChanged; + pcs.firePropertyChange(REGION_PROPERTY, oldValue, this.regionChanged); } public void addRegionPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(REGION_PROPERTY, listener); } - public void removeRegionPropertyChangeListener(PropertyChangeListener listener) { + public void removeRegionPropertyChangeListener( + PropertyChangeListener listener) { pcs.removePropertyChangeListener(REGION_PROPERTY, listener); } - - public void removePropertyChangeListeners() { - for (PropertyChangeListener listener : pcs.getPropertyChangeListeners()) { - pcs.removePropertyChangeListener(listener); - } - } - } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/RegionMonitor.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision

1 0

r2316 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org 04 Jun '09

04 Jun '09

Author: chatellier Date: 2009-06-04 09:16:46 +0000 (Thu, 04 Jun 2009) New Revision: 2316 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Close editor before deleting file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-06-03 17:05:57 UTC (rev 2315) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2009-06-04 09:16:46 UTC (rev 2316) @@ -235,6 +235,9 @@ setInfoText(getContextValue(ScriptAction.class).importScript()); } protected void deleteScript(boolean deleteRemote) { + // reste in UI even if deleted + editor.close(); + int resp = JOptionPane.showConfirmDialog(this,_("isisfish.message.confirm.remove.script", getContextValue(ScriptAction.class).getCode().getName()), null, JOptionPane.YES_NO_OPTION); setInfoText(getContextValue(ScriptAction.class).deleteScript(resp, deleteRemote));

1 0

r2315 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 03 Jun '09

03 Jun '09

Author: chatellier Date: 2009-06-03 17:05:57 +0000 (Wed, 03 Jun 2009) New Revision: 2315 Modified: isis-fish/trunk/pom.xml Log: Utilisation de la branches 0.14.x de lutinwidget sur le repo nuiton Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-06-03 16:37:43 UTC (rev 2314) +++ isis-fish/trunk/pom.xml 2009-06-03 17:05:57 UTC (rev 2315) @@ -358,7 +358,7 @@ <lutinmatrix.version>1.3</lutinmatrix.version> <lutinutil.version>1.0.6</lutinutil.version> <i18n.version>0.9</i18n.version> - <lutinwidget.version>0.15-SNAPSHOT</lutinwidget.version> + <lutinwidget.version>0.14.1-SNAPSHOT</lutinwidget.version> <generator.version>0.64</generator.version> <lutinj2r.version>0.4</lutinj2r.version> <jrst.version>0.8.4</jrst.version>

1 0

r2314 - in isis-fish/trunk: . src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities src/main/xmi
by chatellier＠users.labs.libre-entreprise.org 03 Jun '09

03 Jun '09

Author: chatellier Date: 2009-06-03 16:37:43 +0000 (Wed, 03 Jun 2009) New Revision: 2314 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml isis-fish/trunk/src/main/xmi/isis-fish.properties Log: Modification de topia pour ne pas generer l'attribut "proxy" dans les mappings hibernate et eviter les classCastException sur les proxy javassist. Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/pom.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -353,8 +353,8 @@  <jaxx.version>1.5</jaxx.version> - <topia.version>2.1.4</topia.version> - <topia.service.version>1.0.2</topia.service.version> + <topia.version>2.1.6.1-SNAPSHOT</topia.version> + <topia.service.version>1.0.3</topia.service.version> <lutinmatrix.version>1.3</lutinmatrix.version> <lutinutil.version>1.0.6</lutinutil.version> <i18n.version>0.9</i18n.version> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ActiveRuleImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.ActiveRule" > + <class name="fr.ifremer.isisfish.entities.ActiveRuleImpl" table="activeRule" node="fr.ifremer.isisfish.entities.ActiveRuleImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/CellImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Cell" > + <class name="fr.ifremer.isisfish.entities.CellImpl" table="cell" node="fr.ifremer.isisfish.entities.CellImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EffortDescriptionImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.EffortDescription" > + <class name="fr.ifremer.isisfish.entities.EffortDescriptionImpl" table="effortDescription" node="fr.ifremer.isisfish.entities.EffortDescriptionImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/EquationImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Equation" > + <class name="fr.ifremer.isisfish.entities.EquationImpl" table="equation" node="fr.ifremer.isisfish.entities.EquationImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/FisheryRegionImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.FisheryRegion" > + <class name="fr.ifremer.isisfish.entities.FisheryRegionImpl" table="fisheryRegion" node="fr.ifremer.isisfish.entities.FisheryRegionImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/GearImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Gear" > + <class name="fr.ifremer.isisfish.entities.GearImpl" table="gear" node="fr.ifremer.isisfish.entities.GearImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Metier" > + <class name="fr.ifremer.isisfish.entities.MetierImpl" table="metier" node="fr.ifremer.isisfish.entities.MetierImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.MetierSeasonInfo" > + <union-subclass name="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="metierSeasonInfo" node="fr.ifremer.isisfish.entities.MetierSeasonInfoImpl" abstract="false" >  <property name="seasonZoneComment" type="text" access="field" column="seasonZoneComment" node="seasonZoneComment"/> <property name="comment" type="text" access="field" column="comment" node="comment"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationGroupImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationGroup" > + <class name="fr.ifremer.isisfish.entities.PopulationGroupImpl" table="populationGroup" node="fr.ifremer.isisfish.entities.PopulationGroupImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Population" > + <class name="fr.ifremer.isisfish.entities.PopulationImpl" table="population" node="fr.ifremer.isisfish.entities.PopulationImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.PopulationSeasonInfo" > + <union-subclass name="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" extends="fr.ifremer.isisfish.entities.SeasonImpl" table="populationSeasonInfo" node="fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl" abstract="false" >  <property name="reproductionDistribution" type="fr.ifremer.isisfish.types.hibernate.MatrixType" access="field" > <column name="reproductionDistribution_name"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/PortImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Port" > + <class name="fr.ifremer.isisfish.entities.PortImpl" table="port" node="fr.ifremer.isisfish.entities.PortImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ResultImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Result" > + <class name="fr.ifremer.isisfish.entities.ResultImpl" table="result" node="fr.ifremer.isisfish.entities.ResultImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SeasonImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Season" > + <class name="fr.ifremer.isisfish.entities.SeasonImpl" table="season" node="fr.ifremer.isisfish.entities.SeasonImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SelectivityImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Selectivity" > + <class name="fr.ifremer.isisfish.entities.SelectivityImpl" table="selectivity" node="fr.ifremer.isisfish.entities.SelectivityImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SetOfVesselsImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.SetOfVessels" > + <class name="fr.ifremer.isisfish.entities.SetOfVesselsImpl" table="setOfVessels" node="fr.ifremer.isisfish.entities.SetOfVesselsImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/SpeciesImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Species" > + <class name="fr.ifremer.isisfish.entities.SpeciesImpl" table="species" node="fr.ifremer.isisfish.entities.SpeciesImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Strategy" > + <class name="fr.ifremer.isisfish.entities.StrategyImpl" table="strategy" node="fr.ifremer.isisfish.entities.StrategyImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.StrategyMonthInfo" > + <class name="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" table="strategyMonthInfo" node="fr.ifremer.isisfish.entities.StrategyMonthInfoImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TargetSpeciesImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TargetSpecies" > + <class name="fr.ifremer.isisfish.entities.TargetSpeciesImpl" table="targetSpecies" node="fr.ifremer.isisfish.entities.TargetSpeciesImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/TripTypeImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.TripType" > + <class name="fr.ifremer.isisfish.entities.TripTypeImpl" table="tripType" node="fr.ifremer.isisfish.entities.TripTypeImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/VesselTypeImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.VesselType" > + <class name="fr.ifremer.isisfish.entities.VesselTypeImpl" table="vesselType" node="fr.ifremer.isisfish.entities.VesselTypeImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml =================================================================== --- isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/resources/oldmappings/IsisFish/3.2/fr/ifremer/isisfish/entities/ZoneImpl.hbm.xml 2009-06-03 16:37:43 UTC (rev 2314) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.isisfish.entities"> - <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" proxy="fr.ifremer.isisfish.entities.Zone" > + <class name="fr.ifremer.isisfish.entities.ZoneImpl" table="zone" node="fr.ifremer.isisfish.entities.ZoneImpl" abstract="false" > <id name="topiaId" type="string" length="255" node="@topiaId"/> <version name="topiaVersion" type="long" node="@topiaVersion"/> <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> Modified: isis-fish/trunk/src/main/xmi/isis-fish.properties =================================================================== --- isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-06-03 07:52:53 UTC (rev 2313) +++ isis-fish/trunk/src/main/xmi/isis-fish.properties 2009-06-03 16:37:43 UTC (rev 2314) @@ -4,3 +4,4 @@ model.tagvalue.fr.ifremer.isisfish.types.TimeUnit=fr.ifremer.isisfish.types.hibernate.TimeUnitType model.tagvalue.fr.ifremer.isisfish.types.RangeOfValues=fr.ifremer.isisfish.types.hibernate.RangeOfValuesType model.tagvalue.java.lang.String=text +model.tagvalue.hibernateProxyInterface=none \ No newline at end of file

1 0

r2313 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: input sensitivity util
by chatellier＠users.labs.libre-entreprise.org 03 Jun '09

03 Jun '09

Author: chatellier Date: 2009-06-03 07:52:53 +0000 (Wed, 03 Jun 2009) New Revision: 2313 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java Log: Refactoring "sens" > "sensitivity" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -29,7 +29,7 @@ // refresh public void refresh() { - if (isSens()) { + if (isSensitivity()) { gearTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { gearTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -19,28 +19,41 @@ --> <JPanel layout='{new BorderLayout()}' abstract="true"> -  +  <Boolean id='actif' javaBean='false'/> -  - <Boolean id='sens' javaBean='false'/> + +  + <Boolean id='sensitivity' javaBean='false'/>  <java.lang.String id='buttonTitle' javaBean='""'/> -  +  <java.lang.String id='nextPath' javaBean='null'/> + <jaxx.runtime.swing.BlockingLayerUI id='layerUI' + blockIcon='{SwingUtil.createImageIcon("building.png")}' + acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + useIcon='true' + blockingColor='{new Color(50,50,50)}' + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } + }}' />  - <jaxx.runtime.swing.BlockingLayerUI2 id='sensitivityLayerUI' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { - private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } - }}' /> + <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' + blockIcon='{SwingUtil.createImageIcon("building.png")}' + acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } + }}' /> <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; @@ -87,18 +100,23 @@ //public void setBean(TopiaEntity t) {} public void setLayer(boolean active) { - if (this.get$objectMap() != null) { + if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entré existe dans le fichier sensitivity.properties Class classBean = (Class)boxed.getClientProperty("bean"); String method = (String)boxed.getClientProperty("method"); - boolean isSensitivity = false; + boolean isSensitivityFactorEnabled = false; if (classBean != null) { - isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); + isSensitivityFactorEnabled = UtilsUI.isSensitivityFactorEnabled(classBean.getSimpleName().replace("Impl", "") + "." + method); } - if (isSensitivity) { - jaxx.runtime.swing.BlockingLayerUI2 ui = active ? sensitivityLayerUI.clone() : null; + if (isSensitivityFactorEnabled) { + jaxx.runtime.swing.BlockingLayerUI2 ui = layerUI2.clone(); SwingUtil.getLayer(boxed).setUI(ui); + } else { + jaxx.runtime.swing.BlockingLayerUI ui = layerUI.clone(); + ui.setBlock(true); + ui.setUseIcon(isActif()); + SwingUtil.getLayer(boxed).setUI(ui); } } } @@ -110,14 +128,13 @@ String beanID = (String)source.getClientProperty("beanID"); TopiaEntity bean = null; if (beanID == null){ - bean = getVerifier().getEntity(classBean); + bean = getVerifier().getEntity(classBean); } else{ bean = getVerifier().getEntity(classBean, beanID); } - if (bean != null){ + if (bean != null) { FactorWizardUI wizard = new FactorWizardUI(this); - wizard.initNew(source, bean, EditorHelper.canBeContinue(source, bean)); wizard.pack(); wizard.setVisible(true); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputNavigationTreeSelectionAdapter.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -122,7 +122,7 @@ // apply refresh method (should a contract for all this ui with a method refresh...) try { currentUI = (InputContentUI) newUI; - currentUI.setSens(false); + currentUI.setSensitivity(false); InputSaveVerifier verifier = context.getContextValue(InputSaveVerifier.class); verifier.removeAllPanels(); verifier.addCurrentPanel(currentUI); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -28,7 +28,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -494,7 +493,7 @@ editable = !currentEntities.isEmpty(); this.currentPanels.add(ui); if (rootUI == null) { - ui.setSens(true); + ui.setSensitivity(true); ui.setLayer(true); } ui.refresh(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -44,8 +44,9 @@ getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); + public void refresh() { - if (isSens()){ + if (isSensitivity()){ metierTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { metierTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/NoneUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -16,18 +16,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ - -/** - * NoneUI. - * - * Created: 1 aout 2005 18:37:25 CEST - * - * @author Benjamin POUSSIN <poussin at codelutin.com> - * @version $Revision: 1312 $ - * - * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ - * by : $Author: sletellier $ - */ --> <JPanel layout='{new BorderLayout()}'> <JLabel id='none' horizontalAlignment="0" text="isisfish.input.selectRegion" constraints='BorderLayout.CENTER'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -29,8 +29,9 @@ getVerifier().addCurrentPanel(this); setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); + public void refresh(){ - if (isSens()){ + if (isSensitivity()){ populationTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { populationTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -26,10 +26,10 @@ setButtonTitle(_("isisfish.input.continueStrategies")); setNextPath("$root/$strategies"); +getVerifier().addCurrentPanel(this); -getVerifier().addCurrentPanel(this); public void refresh() { - if (isSens()){ + if (isSensitivity()){ setOfVesselsTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { setOfVesselsTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -21,7 +21,7 @@ <fr.ifremer.isisfish.ui.input.InputContentUI>  - <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> <script><![CDATA[ import fr.ifremer.isisfish.entities.Equation; @@ -43,7 +43,7 @@ // add null before, for second to be considered as a changed event // otherwize, setBean has no effect setBean(null); - setBean(strategy); + setBean((StrategyImpl) strategy); if (getBean() != null) { setSetOfVesselsModel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-03 07:52:53 UTC (rev 2313) @@ -22,11 +22,11 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; +// is this add needed ? +getVerifier().addCurrentPanel(this); + public void refresh() { - // is this add needed ? - //getVerifier().addCurrentPanel(this); - - if (isSens()){ + if (isSensitivity()){ strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { strategyTab.addChangeListener(new InputTabbedPaneListener()); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityNavigationTreeSelectionAdapter.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -106,7 +106,7 @@ try { currentUI = (InputContentUI) newUI; if (currentUI != null){ - currentUI.setSens(true); + currentUI.setSensitivity(true); context.getContextValue(InputSaveVerifier.class).addCurrentPanel(currentUI); currentUI.setLayer(true); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -53,7 +53,7 @@ } if (InputContentUI.class.isInstance(pane.getSelectedComponent())){ ui = (InputContentUI) pane.getSelectedComponent(); - ui.setSens(true); + ui.setSensitivity(true); ui.setLayer(true); ui.refresh(); cacheSelectedIndex = pane.getSelectedIndex(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-03 07:12:54 UTC (rev 2312) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-03 07:52:53 UTC (rev 2313) @@ -53,7 +53,7 @@ * @param sensitivityFactorName name * @return <tt>true</tt> if factor name is sensitivity enabled */ - public static boolean isSensitivity(String sensitivityFactorName) { + public static boolean isSensitivityFactorEnabled(String sensitivityFactorName) { Properties data = loadProperties(); return data.getProperty(sensitivityFactorName) != null;

1 0

r2312 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util
by chatellier＠users.labs.libre-entreprise.org 03 Jun '09

03 Jun '09

Author: chatellier Date: 2009-06-03 07:12:54 +0000 (Wed, 03 Jun 2009) New Revision: 2312 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java Log: Refactor util sensitivity util class. Load properties file only once. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-02 15:48:34 UTC (rev 2311) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-06-03 07:12:54 UTC (rev 2312) @@ -1,7 +1,21 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ +/* *##% + * Copyright (C) 2002-2009 Code Lutin, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + * ##%*/ package fr.ifremer.isisfish.ui.util; @@ -12,36 +26,69 @@ import org.apache.commons.logging.LogFactory; /** + * Utility class to parse Sensitivity properties file. + * + * @author letellier + * @version $Revision$ * - * @author letellier + * Last update: $Date$ + * by : $Author$ */ public class UtilsUI { + /** Log. */ private static final Log log = LogFactory.getLog(UtilsUI.class); - static final String propertiesPath = "/sensitivity.properties"; - static public boolean isSensitivity(String sens){ + /** Properties file resource path. */ + private final static String PROPERTIES_PATH = "/sensitivity.properties"; + + /** Cached properties. */ + private static Properties sensitivityProperties; + + /** + * Is field sensitivity enabled. + * + * Return true, if field name is present in properties file. + * + * @param sensitivityFactorName name + * @return <tt>true</tt> if factor name is sensitivity enabled + */ + public static boolean isSensitivity(String sensitivityFactorName) { Properties data = loadProperties(); - return data.getProperty(sens) != null; + return data.getProperty(sensitivityFactorName) != null; } - private static Properties loadProperties(){ - InputStream stream = null; - Properties data = null; - try { - stream = UtilsUI.class.getResourceAsStream(propertiesPath); - data = new Properties(); - data.load(stream); - } catch (IOException ex) { - log.error(ex); - } finally{ + /** + * Return cached properties file. + * Load it at first call. + * + * @return properties + */ + private static Properties loadProperties() { + + if (sensitivityProperties == null) { + sensitivityProperties = new Properties(); + InputStream stream = null; try { - stream.close(); + stream = UtilsUI.class.getResourceAsStream(PROPERTIES_PATH); + sensitivityProperties.load(stream); } catch (IOException ex) { - log.error(ex); + if (log.isErrorEnabled()) { + log.error("Can't load sensitivity properties file", ex); + } + } finally { + try { + if (stream != null) { + stream.close(); + } + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't load sensitivity properties file", ex); + } + } } } - return data; + return sensitivityProperties; } } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java ___________________________________________________________________ Name: svn:keywords + Author Date Revision

1 0

r2311 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jun '09

02 Jun '09

Author: chatellier Date: 2009-06-02 15:48:34 +0000 (Tue, 02 Jun 2009) New Revision: 2311 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx Log: Work with non impl for bean (don't work) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:48:34 UTC (rev 2311) @@ -21,7 +21,7 @@ <fr.ifremer.isisfish.ui.input.InputContentUI>  - <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> + <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> <script><![CDATA[ import fr.ifremer.isisfish.entities.Equation; @@ -43,7 +43,7 @@ // add null before, for second to be considered as a changed event // otherwize, setBean has no effect setBean(null); - setBean((StrategyImpl) strategy); + setBean(strategy); if (getBean() != null) { setSetOfVesselsModel();

1 0

r2310 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jun '09

02 Jun '09

Author: chatellier Date: 2009-06-02 15:46:28 +0000 (Tue, 02 Jun 2009) New Revision: 2310 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx Log: Fix refresh cancel UI Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -42,8 +42,8 @@ fieldStrategyMonthInfoProportion.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - if (fieldStrategyMonthInfoProportion.getMatrix() != null){ - if (fieldStrategyMonthInfoProportion.getMatrix() != null){ + if (fieldStrategyMonthInfoProportion.getMatrix() != null) { + if (fieldStrategyMonthInfoProportion.getMatrix() != null) { getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix()); } } @@ -52,7 +52,12 @@ public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); - setBean((StrategyImpl) strategy); + + // add null before, for second to be considered as a changed event + // otherwize, setBean has no effect + setBean(null); + setBean((StrategyImpl)strategy); + if (getBean() != null) { Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); if (monthInfos.length != 0) { @@ -124,7 +129,7 @@ </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' - decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> + decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> </cell> </row> <row> @@ -138,14 +143,14 @@ _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/--> <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' - enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> + enabled='{isActif()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' - enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> + enabled='{isActif()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -46,12 +46,13 @@ setBean((StrategyImpl) strategy); if (getBean() != null) { - getVerifier().addCurrentPanel(strategyInactivity); setSetOfVesselsModel(); //fieldStrategyProportionSetOfVessels.init(); // code to replace bindings : strategyInactivity.setActif(isActif() && getBean().getInactivityEquationUsed()); + + getVerifier().addCurrentPanel(strategyInactivity); } else { // listener seam to be called after refresh and remove content :( Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2009-06-02 15:46:28 UTC (rev 2310) @@ -22,17 +22,21 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -getVerifier().addCurrentPanel(this); public void refresh() { + // is this add needed ? + //getVerifier().addCurrentPanel(this); + if (isSens()){ strategyTab.addChangeListener(new SensitivityTabbedPaneListener()); } else { strategyTab.addChangeListener(new InputTabbedPaneListener()); } + + getVerifier().addCurrentPanel(strategyMonthInfoUI, strategyTabUI); } ]]></script> <JPanel id='body' layout='{new BorderLayout()}'> - <JTabbedPane id="strategyTab" name="Strategy" constraints='BorderLayout.CENTER'> + <JTabbedPane id="strategyTab" constraints='BorderLayout.CENTER'> <tab title='isisfish.strategy.title'> <StrategyTabUI id='strategyTabUI' constructorParams='this'/> </tab>

1 0

r2309 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 02 Jun '09

02 Jun '09

Author: chatellier Date: 2009-06-02 15:46:04 +0000 (Tue, 02 Jun 2009) New Revision: 2309 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx Log: Remove non blocking useless layer. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-02 15:38:17 UTC (rev 2308) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2009-06-02 15:46:04 UTC (rev 2309) @@ -30,26 +30,16 @@  <java.lang.String id='nextPath' javaBean='null'/> -  - <jaxx.runtime.swing.BlockingLayerUI id='layerUI' - blockIcon='{SwingUtil.createImageIcon("building.png")}' - acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - useIcon='true' - blockingColor='{new Color(50,50,50)}' - acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } - }}' /> - <jaxx.runtime.swing.BlockingLayerUI2 id='layerUI2' +  + <jaxx.runtime.swing.BlockingLayerUI2 id='sensitivityLayerUI' blockIcon='{SwingUtil.createImageIcon("building.png")}' acceptIcon='{SwingUtil.createImageIcon("building_add.png")}' - acceptAction='{new AbstractAction() { private static final long serialVersionUID = 1L; - @Override - public void actionPerformed(ActionEvent e) { - accept(e); - } + acceptAction='{new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + accept(e); + } }}' /> <script><![CDATA[ @@ -93,10 +83,9 @@ // TODO this method cause a lot of probleme // must cast TopiaEntity to impl in inherited UIs... -public void setBean(TopiaEntity t) { +// 20090602 chatellier : useless method ? cause a lot of cast problem +//public void setBean(TopiaEntity t) {} -} - public void setLayer(boolean active) { if (this.get$objectMap() != null) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { @@ -108,13 +97,8 @@ isSensitivity = UtilsUI.isSensitivity(classBean.getSimpleName().replace("Impl", "") + "." + method); } if (isSensitivity) { - jaxx.runtime.swing.BlockingLayerUI2 ui = active ? layerUI2.clone() : null; + jaxx.runtime.swing.BlockingLayerUI2 ui = active ? sensitivityLayerUI.clone() : null; SwingUtil.getLayer(boxed).setUI(ui); - } else { - jaxx.runtime.swing.BlockingLayerUI ui = active ? layerUI.clone() : null; - ui.setBlock(true); - ui.setUseIcon(isSensitivity && isActif()); - SwingUtil.getLayer(boxed).setUI(ui); } } }

1 0