Merge pull request #25 from dlsc-software-consulting-gmbh/master

Misc

phonenumberfx-demo/pom.xml

@@ -6,12 +6,12 @@
 
     <name>PhoneNumberFXDemo</name>
 
-    <version>1.6.0</version>
+    <version>1.9.0</version>
 
     <parent>
         <groupId>com.dlsc.phonenumberfx</groupId>
         <artifactId>parent</artifactId>
-        <version>1.6.0</version>
+        <version>1.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -141,7 +141,7 @@
         <dependency>
             <groupId>com.dlsc.phonenumberfx</groupId>
             <artifactId>phonenumberfx</artifactId>
-            <version>1.6.0</version>
+            <version>1.9.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>

phonenumberfx/pom.xml

@@ -7,13 +7,13 @@
     <parent>
         <groupId>com.dlsc.phonenumberfx</groupId>
         <artifactId>parent</artifactId>
-        <version>1.6.0</version>
+        <version>1.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>com.dlsc.phonenumberfx</groupId>
     <artifactId>phonenumberfx</artifactId>
-    <version>1.6.0</version>
+    <version>1.9.0</version>
     <packaging>jar</packaging>
 
     <name>PhoneNumberFX</name>

phonenumberfx/src/main/java/com/dlsc/phonenumberfx/PhoneNumberField.java

@@ -189,6 +189,7 @@ protected void layoutChildren(double x, double y, double w, double h) {
             }
         });
 
+        // Platform.runLater() is important or formatting will not work
         ChangeListener<Object> updateFormattedPhoneNumberListener = (obs, oldV, newV) -> Platform.runLater(() -> formatter.setFormattedPhoneNumber(getRawPhoneNumber()));
         rawPhoneNumberProperty().addListener(updateFormattedPhoneNumberListener);
         countryCodeVisibleProperty().addListener(updateFormattedPhoneNumberListener);

phonenumberfx/src/main/java/com/dlsc/phonenumberfx/PhoneNumberLabel.java

@@ -32,6 +32,8 @@ public class PhoneNumberLabel extends Label {
 
     private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
 
+    private boolean updatingText;
+
     /**
      * Builds a new phone number field with the default settings. The available country
      * calling codes are defined on {@link Country}.
@@ -42,8 +44,18 @@ public PhoneNumberLabel() {
 
         validProperty().addListener((obs, oldV, newV) -> pseudoClassStateChanged(INVALID_PSEUDO_CLASS, !newV));
 
+        textProperty().addListener(it -> {
+            if (!updatingText) {
+                // somebody called setText(...) instead of setRawPhoneNumber(...)
+                setRawPhoneNumber(getText());
+            }
+        });
+
         rawPhoneNumber.addListener((obs, oldRawPhoneNumber, newRawPhoneNumber) -> {
+            updatingText = true;
+
             errorType.set(null);
+
             try {
                 Phonenumber.PhoneNumber phoneNumber;
 
@@ -94,6 +106,8 @@ public PhoneNumberLabel() {
                 nationalPhoneNumber.set("");
                 setText(newRawPhoneNumber);
                 setValid(false);
+            } finally {
+                updatingText = false;
             }
         });
 

phonenumberfx/src/main/test/com/dlsc/phonenumberfx/PhoneNumberFieldTest.java

@@ -0,0 +1,15 @@
+package com.dlsc.phonenumberfx;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PhoneNumberFieldTest {
+
+    @Before
+    public void setup() {
+    }
+
+    @Test
+    public void shouldDoThis() {
+    }
+}

pom.xml

@@ -7,7 +7,7 @@
     <name>PhoneNumberFXParent</name>
     <groupId>com.dlsc.phonenumberfx</groupId>
     <artifactId>parent</artifactId>
-    <version>1.6.0</version>
+    <version>1.9.0</version>
     <packaging>pom</packaging>
 
     <parent>