1.4 version released

smart-flex · Dec 5, 2021 · 7b9f4c4 · 7b9f4c4
1 parent e79b437
commit 7b9f4c4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version history
 
 |Date      | Ver | Author                      | Description        |
 |----------|-----|-----------------------------|--------------------|
+|2021-12-05| 1.4 | galisha.                    | Fixed phone bug with NPE |
 |2021-07-11| 1.3 | galisha.                    | Added method for centering non Djf dialog and checking data form modifying |
 |2020-12-27| 1.2 | galisha.                    | Added ability for tab panel selection event |
 |2020-08-19| 1.1 | galisha.                    | Fix bug with closing HTML and text panel by ESC pressing. Added a new widget for phone. Added ability to close form with refreshing parent form. |

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 Djf is Desktop Java Forms, a compact master-detail UI library like FoxBase, but based on Swing.
 Djf uses Hibernate mapping concepts for data, for component layout - Miglayout and RSyntaxTextArea for text panels.
 
-You can see almost all examples of forms definition, data bindings and assistances in [demo application](https://github.com/smart-flex/Djf/releases/download/1.3/djf-demo-1.3-standalone.jar).
+You can see almost all examples of forms definition, data bindings and assistances in [demo application](https://github.com/smart-flex/Djf/releases/download/1.4/djf-demo-1.4-standalone.jar).
 After downloading you can run this demo: java -jar djf-demo-1.3-standalone.jar
 
 ![One of the Djf demo form](djf-demo.png)

diff --git a/djf-demo/pom.xml b/djf-demo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>djf-parent</artifactId>
         <groupId>ru.smartflex.djf</groupId>
-        <version>1.3</version>
+        <version>1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>ru.smartflex.djf</groupId>
             <artifactId>djf</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -95,7 +95,7 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>djf-demo-1.3-standalone</finalName>
+                    <finalName>djf-demo-1.4-standalone</finalName>
                     <archive>
                         <manifest>
                             <mainClass>ru.smartflex.djf.demo.MainDjfDemo</mainClass>

diff --git a/djf/pom.xml b/djf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>djf-parent</artifactId>
         <groupId>ru.smartflex.djf</groupId>
-        <version>1.3</version>
+        <version>1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/djf/src/main/java/ru/smartflex/djf/widget/FieldFocusHandler.java b/djf/src/main/java/ru/smartflex/djf/widget/FieldFocusHandler.java
@@ -101,7 +101,9 @@ public void focusLost(FocusEvent e) {
                     case PHONE: {
                         Object data = uiw.getCurrentValue();
                         PhoneBag phoneBag = PhoneZoneUtil.formatPhoneWithZone((String) data);
-                        field.setText(phoneBag.getPhoneFormatted());
+                        if (phoneBag != null) {
+                            field.setText(phoneBag.getPhoneFormatted());
+                        }
                     }
                     break;
                 }

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>ru.smartflex.djf</groupId>
     <artifactId>djf-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3</version>
+    <version>1.4</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>