1.3 version released

smart-flex · Jul 11, 2021 · e79b437 · e79b437
1 parent ee12fa2
commit e79b437
Show file tree

Hide file tree

Showing 50 changed files with 86 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version history
 
 |Date      | Ver | Author                      | Description        |
 |----------|-----|-----------------------------|--------------------|
+|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. |
 |2019-11-17| 1.0 | galisha.                    | Inital commit |
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 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.1/djf-demo-1.1-standalone.jar).
-After downloading you can run this demo: java -jar djf-demo-1.1-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.3/djf-demo-1.3-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.2</version>
+        <version>1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>ru.smartflex.djf</groupId>
             <artifactId>djf</artifactId>
-            <version>1.2</version>
+            <version>1.3</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -95,7 +95,7 @@
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>djf-demo-1.2-standalone</finalName>
+                    <finalName>djf-demo-1.3-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.2</version>
+        <version>1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/djf/src/main/java/ru/smartflex/djf/Djf.java b/djf/src/main/java/ru/smartflex/djf/Djf.java
@@ -3,6 +3,9 @@
 import ru.smartflex.djf.controller.FormStack;
 import ru.smartflex.djf.controller.LongTaskManagerThread;
 import ru.smartflex.djf.tool.FormUtil;
+import ru.smartflex.djf.tool.FrameUtil;
+
+import java.awt.*;
 
 public class Djf extends DesktopJavaForms {
 
@@ -84,4 +87,21 @@ public static void doLongAssistantMethod(String longMethod, String longMessage)
         LongTaskManagerThread task = new LongTaskManagerThread(longMethod);
         task.execute();
     }
+
+    @SuppressWarnings("unused")
+    public static void centerOnFrame(Component c) {
+        FrameUtil.centerOnFrame(c);
+    }
+
+    @SuppressWarnings("unused")
+    public static boolean isCurrentFormWasChanged() {
+        boolean fok = false;
+
+        if (FormStack.getCurrentFormBag() != null
+                && FormStack.getCurrentFormBag().isFormWasChanged()) {
+            fok = true;
+        }
+
+        return fok;
+    }
 }
diff --git a/djf/src/main/java/ru/smartflex/djf/model/BeanType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/BeanType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="BeanPropertyType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="BeanType">
 		<xs:sequence>

diff --git a/djf/src/main/java/ru/smartflex/djf/model/FormType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/FormType-1.0.xsd
@@ -7,7 +7,7 @@
 	<xs:include schemaLocation="LayoutType-1.0.xsd" />
 	<xs:include schemaLocation="PanelType-1.0.xsd" />
 	<xs:include schemaLocation="AssistType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="FormType">
 		<xs:sequence>

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemButtonRunType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemButtonRunType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemButtonRunType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemButtonType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemButtonType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemButtonType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemByteType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemByteType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemByteType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemCheckboxBaseType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemCheckboxBaseType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemCheckboxBaseType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemCheckboxType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemCheckboxType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemCheckboxBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemCheckboxType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemComboboxBaseType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemComboboxBaseType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:ct="ru/smartflex/djf/model" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemComboboxBaseType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemComboboxType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemComboboxType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemComboboxBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemComboboxType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemDateType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemDateType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemDateType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemFileType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemFileType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemFileType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridByteType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridByteType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridByteType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridCheckboxType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridCheckboxType-1.0.xsd
@@ -5,7 +5,7 @@
 	xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemCheckboxBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridCheckboxType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridComboboxType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridComboboxType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemComboboxBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridComboboxType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridDateType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridDateType-1.0.xsd
@@ -5,7 +5,7 @@
 	xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridDateType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridIntType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridIntType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridIntType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridLongType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridLongType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridLongType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridNumType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridNumType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridNumType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridPeriodType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridPeriodType-1.0.xsd
@@ -5,7 +5,7 @@
 	xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemPeriodBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridPeriodType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridPhoneType-1.1.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridPhoneType-1.1.xsd
@@ -5,7 +5,7 @@
 	xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemPhoneBaseType-1.1.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridPhoneType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridShortType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridShortType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridShortType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridTextType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridTextType-1.0.xsd
@@ -5,7 +5,7 @@
 	xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGridTextType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGridType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGridType-1.0.xsd
@@ -6,7 +6,7 @@
 	<xs:include schemaLocation="ItemGridTextType-1.0.xsd" />
 	<xs:include schemaLocation="ItemGridCheckboxType-1.0.xsd" />
 	<xs:include schemaLocation="ItemGridDateType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 	<xs:include schemaLocation="ItemGridComboboxType-1.0.xsd" />
 	<xs:include schemaLocation="ItemTreeGridCellType-1.0.xsd" />
 	<xs:include schemaLocation="ItemGridPeriodType-1.0.xsd" />

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemGroupType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemGroupType-1.0.xsd
@@ -5,7 +5,7 @@
 
 	<xs:include schemaLocation="ItemRadioType-1.0.xsd" />
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemGroupType">
 		<xs:sequence>

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemInputType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemInputType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemInputType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemIntType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemIntType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemIntType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemLabelType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemLabelType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemLabelType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemLongType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemLongType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemLongType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemNumType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemNumType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemNumType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemOperatorType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemOperatorType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemOperatorType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemPasswordType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemPasswordType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemPasswordType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemPeriodType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemPeriodType-1.0.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemPeriodBaseType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemPeriodType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemPhoneType-1.1.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemPhoneType-1.1.xsd
@@ -4,7 +4,7 @@
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
 	<xs:include schemaLocation="ItemInputType-1.0.xsd" />
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemPhoneType">
 

diff --git a/djf/src/main/java/ru/smartflex/djf/model/ItemRadioType-1.0.xsd b/djf/src/main/java/ru/smartflex/djf/model/ItemRadioType-1.0.xsd
@@ -3,7 +3,7 @@
 <xs:schema targetNamespace="ru/smartflex/djf/model" xmlns:ct="ru/smartflex/djf/model"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ru/smartflex/djf/model">
 
-	<xs:include schemaLocation="AttributeTypes-1.0.xsd" />
+	<xs:include schemaLocation="AttributeTypes-1.2.xsd" />
 
 	<xs:complexType name="ItemRadioType">