#709 fix binding/prevent NPE

cismet · Sep 19, 2024 · 689f342 · 689f342
1 parent 1b75407
commit 689f342
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
             <dependency>
                 <groupId>de.cismet.cids.custom.wupp.server</groupId>
                 <artifactId>cids-custom-server-wuppertal</artifactId>
-                <version>8.4.3</version>
+                <version>8.4.5</version>
                 <type>jar</type>
             </dependency>
 

diff --git a/.../java/de/cismet/cids/custom/objecteditors/utils/FastBindableReferenceComboCellEditor.java b/.../java/de/cismet/cids/custom/objecteditors/utils/FastBindableReferenceComboCellEditor.java
@@ -40,8 +40,8 @@ public class FastBindableReferenceComboCellEditor extends AbstractCellEditor imp
      * @throws  UnsupportedOperationException  DOCUMENT ME!
      */
     public FastBindableReferenceComboCellEditor() {
-        throw new UnsupportedOperationException("Not supported yet.");    // To change body of generated methods, choose
-                                                                          // Tools | Templates.
+        throw new UnsupportedOperationException("Not supported yet."); // To change body of generated methods, choose
+                                                                       // Tools | Templates.
     }
 
     /**

diff --git a/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/BillingBillingEditor.java b/src/main/java/de/cismet/cids/custom/objecteditors/wunda_blau/BillingBillingEditor.java
@@ -862,7 +862,11 @@ private void fillTextFields() {
             txtaBerechnung.setText("");
         }
 
-        txtAngelegt_am.setText(DATE_FORMAT.format(cidsBean.getProperty("ts")));
+        if (cidsBean.getProperty("ts") != null) {
+            txtAngelegt_am.setText(DATE_FORMAT.format(cidsBean.getProperty("ts")));
+        } else {
+            txtAngelegt_am.setText(null);
+        }
 
         final Boolean storniert = (Boolean)cidsBean.getProperty("storniert");
         text = "Buchung ist storniert";

diff --git a/src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/AlkisPointRenderer.form b/src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/AlkisPointRenderer.form
@@ -978,7 +978,7 @@
             </Component>
             <Component class="javax.swing.JLabel" name="lblTxtPLIdentifikator">
               <BindingProperties>
-                <BindingProperty name="text" source="cbPunktorte" sourcePath="${selectedItem.UUId}" target="lblTxtPLIdentifikator" targetPath="text" updateStrategy="1" immediately="false">
+                <BindingProperty name="text" source="cbPunktorte" sourcePath="${selectedItem.uuid}" target="lblTxtPLIdentifikator" targetPath="text" updateStrategy="1" immediately="false">
                   <Property name="nullValue" type="java.lang.String" value="keine Angabe"/>
                   <Property name="incompletePathValue" type="java.lang.String" value="&lt;Error&gt;"/>
                 </BindingProperty>

diff --git a/src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/AlkisPointRenderer.java b/src/main/java/de/cismet/cids/custom/objectrenderer/wunda_blau/AlkisPointRenderer.java
@@ -1525,7 +1525,7 @@ public void actionPerformed(final java.awt.event.ActionEvent evt) {
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(
                 org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ,
                 cbPunktorte,
-                org.jdesktop.beansbinding.ELProperty.create("${selectedItem.UUId}"),
+                org.jdesktop.beansbinding.ELProperty.create("${selectedItem.uuid}"),
                 lblTxtPLIdentifikator,
                 org.jdesktop.beansbinding.BeanProperty.create("text"));
         binding.setSourceNullValue("keine Angabe");