GitLab

at 2023-02-13T16:35:10+01:00

Champ manquant sur un formulaire échantillons - Closes #2625

Dto autoTrim - review some missing autoTrim (mainly on comment)

                 </JPanel>

             </cell>

         </row>

+        <row>

+          <cell>

+            <JLabel id='sizeMeasureMethodLabel'/>

+          </cell>

+          <cell weightx='0.5' anchor='east'>

+            <FilterableComboBox id='sizeMeasureMethod' genericType='SizeMeasureMethodReference'/>

+          </cell>

+        </row>

         <row>

             <cell>

                 <JLabel id='weightMeasureMethodLabel'/>

                 <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/>

             </cell>

         </row>

+

         <row>

             <cell>

                 <JLabel id='sexLabel'/>

   disabledIcon:{getStates().getSourceInformationIcon(tableEditBean.isIsLengthComputed())};

 }

 

+#sizeMeasureMethod {

+  enabled: {tableEditBean.getLength() != null && !tableEditBean.isIsLengthComputed()};

+}

+

 #weightSourceInformation {

   enabled: {tableEditBean.getAcquisitionMode() == 1 && tableEditBean.isIsWeightComputed()};

   toolTipText:{getStates().getWeightDataTip(tableEditBean.isIsWeightComputed())};

 import java.util.Date;

 import java.util.Objects;

 import java.util.Optional;

-import java.util.function.Consumer;

 import java.util.function.Predicate;

-import java.util.function.Supplier;

 

 /**

  * Created on 21/07/2021.

     public void autoTrim() {

     }

 

-    protected void autoTrim(Supplier<String> getter, Consumer<String> setter) {

+    public static void autoTrim(Supplier<String> getter, Consumer<String> setter) {

         String stringValue = getter.get();

         if (stringValue != null) {

             String stringTrimmedValue = stringValue.trim();

         firePropertyChange(PROPERTY_CHILDREN, oldValue, children);

     }

 

+    @Override

+    public void autoTrim() {

+        super.autoTrim();

+        WithSimpleComment.super.autoTrim();

+    }

 }
     @Override

     public void autoTrim() {

         super.autoTrim();

-        autoTrim(this::getComment, this::setComment);

+        WithSimpleComment.super.autoTrim();

     }

 }
         firePropertyChange(PROPERTY_COMMENT, oldValue, comment);

     }

 

+    @Override

+    public void autoTrim() {

+        super.autoTrim();

+        WithSimpleComment.super.autoTrim();

+    }

 }
  * #L%

  */

 

+import fr.ird.observe.dto.IdDto;

 import fr.ird.observe.dto.ObserveDto;

 import io.ultreia.java4all.bean.JavaBean;

 

 

     void setComment(String comment);

 

+    default void autoTrim() {

+        IdDto.autoTrim(this::getComment, this::setComment);

+    }

+

 }

...	...	@@ -81,4 +81,9 @@ public abstract class ContainerDto<C extends ContainerChildDto> extends DataDto
81	81	firePropertyChange(PROPERTY_CHILDREN, oldValue, children);
82	82	}
83	83
	84	+ @Override
	85	+ public void autoTrim() {
	86	+ super.autoTrim();
	87	+ WithSimpleComment.super.autoTrim();
	88	+ }
84	89	}

...	...	@@ -55,6 +55,6 @@ public abstract class EditableDto extends DataDto implements WithSimpleComment {
55	55	@Override
56	56	public void autoTrim() {
57	57	super.autoTrim();
58		- autoTrim(this::getComment, this::setComment);
	58	+ WithSimpleComment.super.autoTrim();
59	59	}
60	60	}

...	...	@@ -46,4 +46,9 @@ public abstract class SimpleDto extends DataDto implements WithSimpleComment {
46	46	firePropertyChange(PROPERTY_COMMENT, oldValue, comment);
47	47	}
48	48
	49	+ @Override
	50	+ public void autoTrim() {
	51	+ super.autoTrim();
	52	+ WithSimpleComment.super.autoTrim();
	53	+ }
49	54	}

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

8 changed files:

Changes: