Refactor XML elements of Formatters jmix-projects/jmix-ui#452

jmix-framework · May 18, 2021 · f96cbe3 · f96cbe3
1 parent e3817df
commit f96cbe3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/main/resources/io/jmix/sampler/screen/ui/components/label/formatter/label-formatter.xml b/src/main/resources/io/jmix/sampler/screen/ui/components/label/formatter/label-formatter.xml
@@ -1,10 +1,14 @@
 <window xmlns="http://jmix.io/schema/ui/window">
     <layout spacing="true">
         <label id="dateLabel">
-            <dateFormatter type="DATE"/>
+            <formatter>
+                <date type="DATE"/>
+            </formatter>
         </label>
         <label id="numberLabel">
-            <numberFormatter format="#,###"/>
+            <formatter>
+                <number format="#,###"/>
+            </formatter>
         </label>
     </layout>
 </window>
diff --git a/src/main/resources/io/jmix/sampler/screen/ui/components/table/formatter/table-formatter.xml b/src/main/resources/io/jmix/sampler/screen/ui/components/table/formatter/table-formatter.xml
@@ -20,10 +20,14 @@
                width="100%">
             <columns>
                 <column id="name">
-                    <customFormatter bean="sampler_UppercaseFormatter"/>
+                    <formatter>
+                        <custom bean="sampler_UppercaseFormatter"/>
+                    </formatter>
                 </column>
                 <column id="lastName">
-                    <customFormatter bean="sampler_LowercaseFormatter"/>
+                    <formatter>
+                        <custom bean="sampler_LowercaseFormatter"/>
+                    </formatter>
                 </column>
             </columns>
         </table>

diff --git a/...esources/io/jmix/sampler/screen/ui/components/timefield/dataaware/timefield-dataaware.xml b/...esources/io/jmix/sampler/screen/ui/components/timefield/dataaware/timefield-dataaware.xml
@@ -11,7 +11,9 @@
             <label value="Time in the container:"/>
             <label dataContainer="taskDc"
                    property="dueDate">
-                <dateFormatter format="HH:mm"/>
+                <formatter>
+                    <date format="HH:mm"/>
+                </formatter>
             </label>
         </hbox>
     </layout>