diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b6c276..aa4e517 100644 --- 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 index 695e783..5affcbc 100644 --- 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 index 13f8fa4..2a61f6f 100644 --- a/djf-demo/pom.xml +++ b/djf-demo/pom.xml @@ -5,7 +5,7 @@ djf-parent ru.smartflex.djf - 1.3 + 1.4 4.0.0 @@ -16,7 +16,7 @@ ru.smartflex.djf djf - 1.3 + 1.4 org.slf4j @@ -95,7 +95,7 @@ maven-assembly-plugin - djf-demo-1.3-standalone + djf-demo-1.4-standalone ru.smartflex.djf.demo.MainDjfDemo diff --git a/djf/pom.xml b/djf/pom.xml index 0f47e65..3ad249b 100644 --- a/djf/pom.xml +++ b/djf/pom.xml @@ -5,7 +5,7 @@ djf-parent ru.smartflex.djf - 1.3 + 1.4 4.0.0 diff --git a/djf/src/main/java/ru/smartflex/djf/widget/FieldFocusHandler.java b/djf/src/main/java/ru/smartflex/djf/widget/FieldFocusHandler.java index d84a873..b512751 100644 --- 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 index 0a742fe..11881a8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ ru.smartflex.djf djf-parent pom - 1.3 + 1.4 UTF-8