branch develop updated (1ffebb9 -> 15967ef)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 1ffebb9 fixes #7009 Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé Merge branch 'feature/7009' into develop new f03b2ea utilisation du dernier pom + mise à jour d'un plugin de report new 59b905b ajout de place pour le tableau des mises en oeuvre de caractéristiques d'un équipement (refs #7010) new 15967ef fixes #7010: [ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement Merge branch 'feature/7010' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 15967ef42ec4552b200e1cdd4ad7e39feddac9c1 Merge: f03b2ea 59b905b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:17:15 2015 +0200 fixes #7010: [ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement Merge branch 'feature/7010' into develop commit 59b905b3ad332c6231cc61436dd0ebf17aec6fc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:17:12 2015 +0200 ajout de place pour le tableau des mises en oeuvre de caractéristiques d'un équipement (refs #7010) commit f03b2eac96a89f3d852f778eae96d7285e285b10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:16:29 2015 +0200 utilisation du dernier pom + mise à jour d'un plugin de report Summary of changes: .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 84 +++++++++++----------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +++ pom.xml | 4 +- 3 files changed, 53 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f03b2eac96a89f3d852f778eae96d7285e285b10 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:16:29 2015 +0200 utilisation du dernier pom + mise à jour d'un plugin de report --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 809c67f..8285c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.8.2</version> + <version>1.8.3</version> </parent> <groupId>fr.ird.observe</groupId> @@ -523,7 +523,7 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>nuiton-maven-report-plugin</artifactId> - <version>3.0-rc-1</version> + <version>3.0</version> </plugin> <plugin> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 59b905b3ad332c6231cc61436dd0ebf17aec6fc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:17:12 2015 +0200 ajout de place pour le tableau des mises en oeuvre de caractéristiques d'un équipement (refs #7010) --- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 84 +++++++++++----------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +++ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index e0242f0..ec7d6b5 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -53,7 +53,8 @@ <!-- model --> <GearUseFeaturesSeineUIModel id='model' constructorParams='this'/> - <GearUseFeaturesMeasurementSeinesTableModel id='measurementsTableModel' initializer="getModel().getMeasurementsTableModel()"/> + <GearUseFeaturesMeasurementSeinesTableModel id='measurementsTableModel' + initializer="getModel().getMeasurementsTableModel()"/> <!-- edit bean --> <TripSeine id='bean'/> @@ -77,47 +78,52 @@ errorTableModel='{getErrorTableModel()}' context='n1-update'/> - <Table id='editorPanel' fill='both' insets='0'> + <Table id='editorPanel' fill='both' insets='0' weighty="1"> <row> - <cell weightx="1" weighty="1"> + <cell weightx="1" weighty="0.9"> <JTabbedPane id='gearUseFeaturesTabPane'> <tab id='generalTab'> - <Table id='editForm' fill='both' insets='1'> - - <!-- gear --> - <row> - <cell> - <JLabel id='gearLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BeanComboBox id='gear' constructorParams='this' genericType='Gear'/> - </cell> - </row> - - <!-- number --> - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' constructorParams='this'/> - </cell> - </row> - - <!-- usedInTrip --> - <row> - <cell> - <JLabel id='usedInTripLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <BooleanEditor id='usedInTrip'/> - </cell> - </row> - - </Table> + <JPanel layout='{new BorderLayout()}'> + + <Table id='editForm' fill='both' insets='1' constraints="BorderLayout.NORTH"> + + <!-- gear --> + <row> + <cell> + <JLabel id='gearLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BeanComboBox id='gear' constructorParams='this' genericType='Gear'/> + </cell> + </row> + + <!-- number --> + <row> + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' constructorParams='this'/> + </cell> + </row> + + <!-- usedInTrip --> + <row> + <cell> + <JLabel id='usedInTripLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <BooleanEditor id='usedInTrip'/> + </cell> + </row> + + </Table> + + </JPanel> + </tab> @@ -133,7 +139,7 @@ </cell> </row> <row> - <cell weighty='1'> + <cell weighty='0.1'> <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> <JTextArea id='comment2'/> </JScrollPane> @@ -141,8 +147,4 @@ </row> </Table> - <Table id='extraZone' fill='both' weightx='1' insets='0'> - - </Table> - </fr.ird.observe.ui.content.table.ContentTableUI> diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index e97d570..183f188 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIInitializer; import fr.ird.observe.ui.content.table.ContentTableUIHandler; +import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -55,6 +56,8 @@ import javax.swing.JTable; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; +import java.awt.GridBagConstraints; +import java.awt.Insets; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; @@ -255,6 +258,11 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } + getUi().getShowForm().remove(1); + getUi().getShowForm().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditor()), new GridBagConstraints(0, 1, 1, 1, 1.0, 0.3, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 1); + + getUi().getEditor().remove(0); + getUi().getEditor().add(SwingUtil.boxComponentWithJxLayer(getUi().getEditorPanel()), new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0), 0); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 15967ef42ec4552b200e1cdd4ad7e39feddac9c1 Merge: f03b2ea 59b905b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 21:17:15 2015 +0200 fixes #7010: [ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement Merge branch 'feature/7010' into develop .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 84 +++++++++++----------- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 8 +++ 2 files changed, 51 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm