From scm@users.codelutin.com Thu Mar 24 19:12:13 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 01/01: correction du redimensionnement (fixes #8162)
Date: Thu, 24 Mar 2016 19:12:14 +0100
Message-ID: <20160324181213.5A3565C007C@goh.codelutin.com>
In-Reply-To: <20160324181213.456.51303@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4249981417038625363=="

--===============4249981417038625363==
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 feature/8162 in repository tutti.

See https://gitlab.nuiton.org/codelutin/tutti.git

commit f590a7cba045e4797f96e91aa2ccfc5e32f70530
Author: Kevin Morin <morin@codelutin.com>
Date:   Thu Mar 24 19:11:31 2016 +0100

    correction du redimensionnement (fixes #8162)
---
 .../species/frequency/SpeciesFrequencyUI.jaxx      | 20 +++++----
 .../frequency/SpeciesFrequencyUIHandler.java       | 12 +++---
 .../tutti/ui/swing/util/WideDataComboBoxUI.java    | 49 ++++++++++++++++++++=
++
 3 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/s=
rc/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/freq=
uency/SpeciesFrequencyUI.jaxx
index 5fffd0a..cf06030 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jaxx
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jaxx
@@ -20,7 +20,8 @@
   #L%
   -->
 <JPanel id=3D'editSpeciesFrequenciesTopPanel' layout=3D'{new BorderLayout()}=
' decorator=3D'help'
-        implements=3D'fr.ifremer.tutti.ui.swing.util.TuttiUI&lt;SpeciesFrequ=
encyUIModel, SpeciesFrequencyUIHandler&gt;'>
+        implements=3D'fr.ifremer.tutti.ui.swing.util.TuttiUI&lt;SpeciesFrequ=
encyUIModel, SpeciesFrequencyUIHandler&gt;'
+        onComponentResized=3D"JAXXWidgetUtil.setComponentWidth(lengthStepCar=
acteristicComboBox, getLengthStepPanelPreferedWidth())  ;">
=20
   <import>
     fr.ifremer.tutti.persistence.entities.data.CopyIndividualObservationMode
@@ -40,6 +41,7 @@
     fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor
=20
     jaxx.runtime.swing.CardLayout2Ext
+    jaxx.runtime.swing.JAXXWidgetUtil
     jaxx.runtime.swing.editor.bean.BeanFilterableComboBox
     org.nuiton.jaxx.widgets.number.NumberEditor
=20
@@ -66,6 +68,10 @@ public SpeciesFrequencyUI(TuttiUI<?,?> parentUI, String sp=
eciesOrBenthosContext)
 }
=20
 public String getSpeciesOrBenthosContext() { return speciesOrBenthosContext;=
 }
+
+protected int getLengthStepPanelPreferedWidth() {
+    return getWidth() - frequencyModePanel.getPreferredSize().width - histog=
ramPanel.getPreferredSize().width;
+}
   ]]></script>
=20
   <SpeciesFrequencyUIModel id=3D'model' initializer=3D'getContextValue(Speci=
esFrequencyUIModel.class)'/>
@@ -147,7 +153,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
=20
       <cell rows=3D"2">
         <!-- length step caracteristic -->
-        <Table id=3D"lengthStepCaracteristicPanel" anchor=3D"west" styleClas=
s=3D"visibleIfFrequencies">
+        <Table id=3D"lengthStepCaracteristicPanel" anchor=3D"west" styleClas=
s=3D"visibleIfFrequencies" fill=3D"both">
=20
           <row>
             <cell>
@@ -174,7 +180,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
         </Table>
       </cell>
=20
-      <cell rows=3D"4" weightx=3D"1">
+      <cell rows=3D"4">
         <JPanel id=3D"histogramPanel" layout=3D"{new BorderLayout()}" styleC=
lass=3D"visibleIfFrequencies"/>
       </cell>
     </row>
@@ -191,7 +197,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
=20
       <cell rows=3D"3">
         <JPanel id=3D'modeConfigurationPanel' styleClass=3D"visibleIfFrequen=
cies">
-          <Table  id=3D'autoGenModePanel' constraints=3D'"autoGenMode"'>
+          <Table  id=3D'autoGenModePanel' constraints=3D'"autoGenMode"' fill=
=3D"both">
             <!-- Min step-->
             <row>
               <cell anchor=3D'west'>
@@ -219,7 +225,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
               </cell>
             </row>
           </Table>
-          <Table id=3D'rafaleModePanel' constraints=3D'"rafaleMode"'>
+          <Table id=3D'rafaleModePanel' constraints=3D'"rafaleMode"' fill=3D=
"both">
             <!-- Rafale step-->
             <row>
               <cell weightx=3D'1.0'>
@@ -273,7 +279,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
                     <cell anchor=3D"east">
                       <JLabel id=3D'totalNumberLabel'/>
                     </cell>
-                    <cell>
+                    <cell weightx=3D"1">
                       <JTextField id=3D'totalNumberField'/>
                     </cell>
                   </row>
@@ -281,7 +287,7 @@ public String getSpeciesOrBenthosContext() { return speci=
esOrBenthosContext; }
                     <cell>
                       <JLabel id=3D'totalWeightLabel'/>
                     </cell>
-                    <cell>
+                    <cell weightx=3D"1">
                       <ComputableDataEditor id=3D'totalWeightField' genericT=
ype=3D"Float" constructorParams=3D'this'/>
                     </cell>
                   </row>
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-=
swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/speci=
es/frequency/SpeciesFrequencyUIHandler.java
index 6c3cde9..f692fe4 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUIHandler.java
@@ -47,12 +47,8 @@ import fr.ifremer.tutti.type.WeightUnit;
 import fr.ifremer.tutti.ui.swing.TuttiUIContext;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.IndividualObservationBatchRowModel;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.IndividualObservationBatchTableModel;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.SamplingCodeCellRenderer;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.SamplingCodeCellEditor;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeci=
esBatchPanelUI;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOr=
BenthosBatchUISupport;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.IndividualObservationBatchRowModel;
-import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.IndividualObservationBatchTableModel;
+import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobserva=
tion.SamplingCodeCellRenderer;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.EditSpeci=
esBatchPanelUI;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesOr=
BenthosBatchUISupport;
 import fr.ifremer.tutti.ui.swing.content.operation.catches.species.edit.Spec=
iesBatchRowModel;
@@ -63,6 +59,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
 import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource;
 import fr.ifremer.tutti.ui.swing.util.TuttiUI;
 import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil;
+import fr.ifremer.tutti.ui.swing.util.WideDataComboBoxUI;
 import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor;
 import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer;
 import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapCellCom=
ponent;
@@ -97,6 +94,7 @@ import org.nuiton.decorator.Decorator;
 import org.nuiton.jaxx.application.ApplicationBusinessException;
 import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler;
=20
+import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -523,6 +521,10 @@ public class SpeciesFrequencyUIHandler extends AbstractT=
uttiTableUIHandler<Speci
                                    lengthStepCaracteristics,
                                    modelCaracteristic);
=20
+        // on change l'ui pour pouvoir redimensionner la liste mais pas sa p=
opup
+        JComboBox lengthStepCaracteristicComboBox =3D ui.getLengthStepCaract=
eristicComboBox().getCombobox();
+        lengthStepCaracteristicComboBox.setUI(new WideDataComboBoxUI(lengthS=
tepCaracteristicComboBox.getPreferredSize()));
+
         // get step from the pmfm
         float step =3D getStep(modelCaracteristic);
         model.setStep(step);
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/Wide=
DataComboBoxUI.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/=
util/WideDataComboBoxUI.java
new file mode 100644
index 0000000..0a6a588
--- /dev/null
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WideDataCom=
boBoxUI.java
@@ -0,0 +1,49 @@
+package fr.ifremer.tutti.ui.swing.util;
+
+import javax.swing.plaf.basic.BasicComboPopup;
+import javax.swing.plaf.basic.ComboPopup;
+import javax.swing.plaf.synth.SynthComboBoxUI;
+import java.awt.Dimension;
+import java.awt.Rectangle;
+
+/**
+ * ComboBox ui pour les listes d=C3=A9roulantes dont la popup est tr=C3=A8s =
large alors qu'on n'a pas trop la place pour une liste large.
+ *
+ * @author Kevin Morin (Code Lutin)
+ * @since 4.5
+ */
+public class WideDataComboBoxUI extends SynthComboBoxUI {
+
+    private Dimension popupSize;
+
+    public WideDataComboBoxUI(Dimension popupSize) {
+        this.popupSize =3D popupSize;
+    }
+
+    protected ComboPopup createPopup() {
+        BasicComboPopup popup =3D new BasicComboPopup(comboBox) {
+
+            public void show() {
+                int width =3D Math.max(popupSize.width, comboBox.getPreferre=
dSize().width);
+                popupSize.setSize(width, getPopupHeightForRowCount(comboBox.=
getMaximumRowCount()));
+                Rectangle popupBounds =3D computePopupBounds(0, comboBox.get=
Bounds().height, width, popupSize.height);
+                scroller.setMaximumSize(popupBounds.getSize());
+                scroller.setPreferredSize(popupBounds.getSize());
+                scroller.setMinimumSize(popupBounds.getSize());
+                list.invalidate();
+                int selectedIndex =3D comboBox.getSelectedIndex();
+                if (selectedIndex =3D=3D -1) {
+                    list.clearSelection();
+                } else {
+                    list.setSelectedIndex(selectedIndex);
+                }
+                list.ensureIndexIsVisible(list.getSelectedIndex());
+                setLightWeightPopupEnabled(comboBox.isLightWeightPopupEnable=
d());
+
+                show(comboBox, popupBounds.x, popupBounds.y);
+            }
+        };
+        popup.getAccessibleContext().setAccessibleParent(comboBox);
+        return popup;
+    }
+}

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4249981417038625363==--


From scm@users.codelutin.com Thu Mar 24 19:12:13 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch feature/8162 created (now f590a7c)
Date: Thu, 24 Mar 2016 19:12:13 +0100
Message-ID: <20160324181213.456.51303@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5382638842927385336=="

--===============5382638842927385336==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script.

New change to branch feature/8162 in repository tutti.

See https://gitlab.nuiton.org/codelutin/tutti.git

        at  f590a7c   correction du redimensionnement (fixes #8162)

This branch includes the following new commits:

       new  f590a7c   correction du redimensionnement (fixes #8162)

The 1 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 f590a7cba045e4797f96e91aa2ccfc5e32f70530
Author: Kevin Morin <morin@codelutin.com>
Date:   Thu Mar 24 19:11:31 2016 +0100

    correction du redimensionnement (fixes #8162)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============5382638842927385336==--