From scm@users.codelutin.com Wed Apr 22 19:54:26 2015 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] 01/04: ajout de la suppression d'une mise en oeuvre de =?utf-8?q?caract=C3=A9ristique?= (refs #7012) Date: Wed, 22 Apr 2015 19:54:27 +0000 Message-ID: <20150422195426.37CD05C6394@goh.codelutin.com> In-Reply-To: <20150422195426.26667.68519@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1469191624724755768==" --===============1469191624724755768== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 7724404c74083d27d99345be7c09a6ae73b82c57 Author: Tony CHEMIT Date: Wed Apr 22 21:48:17 2015 +0200 ajout de la suppression d'une mise en oeuvre de caract=C3=A9ristique (ref= s #7012) --- .../table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 4 ++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 83 ++++++++++++++++++++= +- .../resources/i18n/observe-swing_en_GB.properties | 3 + .../resources/i18n/observe-swing_es_ES.properties | 3 + .../resources/i18n/observe-swing_fr_FR.properties | 3 + 6 files changed, 101 insertions(+), 1 deletion(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl= /seine/GearUseFeaturesSeineUI.css b/observe-swing/src/main/java/fr/ird/observ= e/ui/content/table/impl/seine/GearUseFeaturesSeineUI.css index 707782e..d2f186b 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/= GearUseFeaturesSeineUI.css +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/= GearUseFeaturesSeineUI.css @@ -89,3 +89,9 @@ _tablePropertyName: {GearUseFeaturesSeine.PROPERTY_COMMENT}; text:{getStringValue(tableEditBean.getComment())}; } + +#deleteSelectedMeasurement { + text: "observe.gearUseFeaturesSeine.action.deleteSelectedMeasurement"; + toolTipText: "observe.gearUseFeaturesSeine.action.deleteSelectedMeasuremen= t.tip"; + actionIcon: delete; +} 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/obser= ve/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index ec7d6b5..bcac11b 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 @@ -78,6 +78,10 @@ errorTableModel=3D'{getErrorTableModel()}' context=3D'n1-update'/> =20 + + + + 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/ir= d/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 183f188..2e4911d 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 @@ -36,10 +36,13 @@ import fr.ird.observe.entities.seine.GearUseFeaturesMeasu= rementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineDAO; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; +import fr.ird.observe.ui.ObserveMainUI; 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 fr.ird.observe.ui.util.table.AutotSelectRowAndShowPopupActionSupport; +import fr.ird.observe.ui.util.table.EditableTableModelSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -52,7 +55,11 @@ import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.validator.NuitonValidatorScope; =20 import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.ListSelectionModel; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; @@ -60,6 +67,7 @@ import java.awt.GridBagConstraints; import java.awt.Insets; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -256,13 +264,18 @@ public class GearUseFeaturesSeineUIHandler extends Cont= entTableUIHandler. --===============1469191624724755768==-- From scm@users.codelutin.com Wed Apr 22 19:54:26 2015 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] branch develop updated (15967ef -> 571a41e) Date: Wed, 22 Apr 2015 19:54:26 +0000 Message-ID: <20150422195426.26667.68519@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1040999359901540055==" --===============1040999359901540055== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 15967ef fixes #7010: [ObServePS] Avoir plus de place pour saisi= r les mises en oeuvre d'un =C3=A9quipement Merge branch 'feature/7010' into d= evelop new 7724404 ajout de la suppression d'une mise en oeuvre de caract= =C3=A9ristique (refs #7012) new a7b954b fixes #7012: [ObServePS] Pouvoir supprimer une mise en = oeuvre de caract=C3=A9ristique d'un =C3=A9quipement Merge branch 'feature/701= 2' into develop new 60d9ba6 =C3=89coute de la s=C3=A9lection sur le tableau des mis= es en oeuvre (refs #7011) new 571a41e fixes #7011: [ObServePS] Impossible de rajouter des mis= es en oeuvre de caract=C3=A9ristique =C3=A0 un =C3=A9quipement Merge branch '= feature/7011' into develop The 4 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 571a41e42d5c1ea6ab6d2ddfdb8b81ba7eded6ed Merge: a7b954b 60d9ba6 Author: Tony CHEMIT Date: Wed Apr 22 21:54:12 2015 +0200 fixes #7011: [ObServePS] Impossible de rajouter des mises en oeuvre de ca= ract=C3=A9ristique =C3=A0 un =C3=A9quipement Merge branch 'feature/7011' into develop commit 60d9ba6f50dbdeff2a181c7c96168f5aa7e2838d Author: Tony CHEMIT Date: Wed Apr 22 21:54:07 2015 +0200 =C3=89coute de la s=C3=A9lection sur le tableau des mises en oeuvre (refs= #7011) commit a7b954b18e05c4bd96c354291c909c770d5b4695 Merge: 15967ef 7724404 Author: Tony CHEMIT Date: Wed Apr 22 21:52:38 2015 +0200 fixes #7012: [ObServePS] Pouvoir supprimer une mise en oeuvre de caract= =C3=A9ristique d'un =C3=A9quipement Merge branch 'feature/7012' into develop commit 7724404c74083d27d99345be7c09a6ae73b82c57 Author: Tony CHEMIT Date: Wed Apr 22 21:48:17 2015 +0200 ajout de la suppression d'une mise en oeuvre de caract=C3=A9ristique (ref= s #7012) Summary of changes: .../table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 4 + .../impl/seine/GearUseFeaturesSeineUIHandler.java | 87 ++++++++++++++++++++= +- .../resources/i18n/observe-swing_en_GB.properties | 3 + .../resources/i18n/observe-swing_es_ES.properties | 3 + .../resources/i18n/observe-swing_fr_FR.properties | 3 + 6 files changed, 105 insertions(+), 1 deletion(-) --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============1040999359901540055==-- From scm@users.codelutin.com Wed Apr 22 19:54:26 2015 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] 02/04: fixes #7012: [ObServePS] Pouvoir supprimer une mise en oeuvre de =?utf-8?q?caract=C3=A9ristique_d=27un_=C3=A9quipement?= Merge branch 'feature/7012' into develop Date: Wed, 22 Apr 2015 19:54:28 +0000 Message-ID: <20150422195426.4967E5C65D7@goh.codelutin.com> In-Reply-To: <20150422195426.26667.68519@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6241442563586135138==" --===============6241442563586135138== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 a7b954b18e05c4bd96c354291c909c770d5b4695 Merge: 15967ef 7724404 Author: Tony CHEMIT Date: Wed Apr 22 21:52:38 2015 +0200 fixes #7012: [ObServePS] Pouvoir supprimer une mise en oeuvre de caract= =C3=A9ristique d'un =C3=A9quipement Merge branch 'feature/7012' into develop .../table/impl/seine/GearUseFeaturesSeineUI.css | 6 ++ .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 4 ++ .../impl/seine/GearUseFeaturesSeineUIHandler.java | 83 ++++++++++++++++++++= +- .../resources/i18n/observe-swing_en_GB.properties | 3 + .../resources/i18n/observe-swing_es_ES.properties | 3 + .../resources/i18n/observe-swing_fr_FR.properties | 3 + 6 files changed, 101 insertions(+), 1 deletion(-) --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============6241442563586135138==-- From scm@users.codelutin.com Wed Apr 22 19:54:26 2015 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] 03/04: =?utf-8?q?=C3=89coute_de_la_s=C3=A9lectio?= =?utf-8?q?n?= sur le tableau des mises en oeuvre (refs #7011) Date: Wed, 22 Apr 2015 19:54:29 +0000 Message-ID: <20150422195426.77CD05C65D6@goh.codelutin.com> In-Reply-To: <20150422195426.26667.68519@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6283997596907916943==" --===============6283997596907916943== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 60d9ba6f50dbdeff2a181c7c96168f5aa7e2838d Author: Tony CHEMIT Date: Wed Apr 22 21:54:07 2015 +0200 =C3=89coute de la s=C3=A9lection sur le tableau des mises en oeuvre (refs= #7011) --- .../ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 4 ++= ++ 1 file changed, 4 insertions(+) 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/ir= d/observe/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 2e4911d..5fa35cc 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 @@ -264,6 +264,10 @@ public class GearUseFeaturesSeineUIHandler extends Conte= ntTableUIHandler. --===============6283997596907916943==-- From scm@users.codelutin.com Wed Apr 22 19:54:26 2015 From: "codelutin.com scm" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] 04/04: fixes #7011: [ObServePS] Impossible de rajouter des mises en oeuvre de =?utf-8?q?caract=C3=A9ristique_=C3=A0_un_?= =?utf-8?q?=C3=A9quipement?= Merge branch 'feature/7011' into develop Date: Wed, 22 Apr 2015 19:54:30 +0000 Message-ID: <20150422195426.A99A55C65D9@goh.codelutin.com> In-Reply-To: <20150422195426.26667.68519@bihar.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0171127993515522723==" --===============0171127993515522723== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 571a41e42d5c1ea6ab6d2ddfdb8b81ba7eded6ed Merge: a7b954b 60d9ba6 Author: Tony CHEMIT Date: Wed Apr 22 21:54:12 2015 +0200 fixes #7011: [ObServePS] Impossible de rajouter des mises en oeuvre de ca= ract=C3=A9ristique =C3=A0 un =C3=A9quipement Merge branch 'feature/7011' into develop .../ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java | 4 ++= ++ 1 file changed, 4 insertions(+) --=20 To stop receiving notification emails like this one, please contact codelutin.com SCM administrator . --===============0171127993515522723==--