r3881 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity - Lima-commits

31 Jul 2014

Author: sbavencoff
Date: 2014-07-31 15:05:12 +0200 (Thu, 31 Jul 2014)
New Revision: 3881

Url: http://forge.chorem.org/projects/lima/repository/revisions/3881

Log:
refs #875 #1043 : identity

Added:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
===================================================================

--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css	2014-07-31 13:05:12 UTC (rev 3881)
@@ -0,0 +1,100 @@
+#dialog {
+    modal : true;
+    defaultCloseOperation : {JDialog.DO_NOTHING_ON_CLOSE};
+}
+
+#nameLabel {
+    text : "lima.identity.name";
+}
+
+#nameTextField {
+    text : {handler.getIdentity().getName()};
+}
+
+#descriptionLabel {
+    text : "lima.identity.description";
+}
+
+#descriptionTextField {
+    text : {handler.getIdentity().getDescription()};
+}
+
+#addressLabel {
+    text : "lima.identity.address";
+}
+
+#addressTextField {
+    text : {handler.getIdentity().getAddress()};
+}
+
+#address2Label {
+    text : "lima.identity.address2";
+}
+
+#address2TextField {
+    text : {handler.getIdentity().getAddress2()};
+}
+
+#zipCodeLabel {
+    text : "lima.identity.zipCode";
+}
+
+#zipCodeTextField {
+    text : {handler.getIdentity().getZipCode()};
+}
+
+#cityLabel {
+    text : "lima.identity.city";
+}
+
+#cityTextField {
+    text : {handler.getIdentity().getCity()};
+}
+
+#businessNumberLabel {
+    text : "lima.identity.businessNumber";
+}
+
+#businessNumberTextField {
+    text : {handler.getIdentity().getBusinessNumber()};
+}
+
+#vatNumberLabel {
+    text : "lima.identity.vatNumber";
+}
+
+#vatNumberTextField {
+    text : {handler.getIdentity().getVatNumber()};
+}
+
+#classificationCodeLabel {
+    text : "lima.identity.classificationCode";
+}
+
+#classificationCodeTextField {
+    text : {handler.getIdentity().getClassificationCode()};
+}
+
+#phoneNumberLabel {
+    text : "lima.identity.phoneNumber";
+}
+
+#phoneNumberTextField {
+    text : {handler.getIdentity().getPhoneNumber()};
+}
+
+#emailLabel {
+    text : "lima.identity.email";
+}
+
+#emailTextField {
+    text : {handler.getIdentity().getEmail()};
+}
+
+#cancel {
+    text : "lima.common.cancel";
+}
+
+#ok {
+    text : "lima.common.ok";
+}
\ No newline at end of file

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx	2014-07-31 12:01:23 UTC (rev 3880)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx	2014-07-31 13:05:12 UTC (rev 3881)
@@ -23,84 +23,58 @@
   #L%
   -->
 
-<JDialog modal="true"
-         defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}"
-         onWindowClosing="performCancel();">
+<JDialog id="dialog"
+         onWindowClosing="dispose();">
 
-  <IdentityHandler id="handler" javaBean="new IdentityHandler()"/>
+  <IdentityHandler id="handler" javaBean="new IdentityHandler(this)"/>
   <org.chorem.lima.entity.Identity id="identity"
                                    javaBean='handler.getIdentity()'/>
 
   <script>
     <![CDATA[
     getRootPane().setDefaultButton(ok);
-    protected void performCancel() {
-        setIdentity(null);
-        dispose();
-    }
     ]]>
   </script>
 
   <Table>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.name"/>
+        <JLabel id="nameLabel" />
       </cell>
       <cell fill="horizontal">
-        <JTextField id="nameTextField" text="{getIdentity().getName()}"/>
-        <javax.swing.text.Document javaBean="getNameTextField().getDocument()"
-                                   onInsertUpdate='getIdentity().setName(getNameTextField().getText())'
-                                   onRemoveUpdate='getIdentity().setName(getNameTextField().getText())'/>
+        <JTextField id="nameTextField" />
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.description"/>
+        <JLabel  id="descriptionLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="descriptionTextField"
-                    text="{getIdentity().getDescription()}"/>
-        <javax.swing.text.Document
-          javaBean="getDescriptionTextField().getDocument()"
-          onInsertUpdate='getIdentity().setDescription(getDescriptionTextField().getText())'
-          onRemoveUpdate='getIdentity().setDescription(getDescriptionTextField().getText())'/>
+        <JTextField id="descriptionTextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.address"/>
+        <JLabel id="addressLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="addressTextField" text="{getIdentity().getAddress()}"/>
-        <javax.swing.text.Document
-          javaBean="getAddressTextField().getDocument()"
-          onInsertUpdate='getIdentity().setAddress(getAddressTextField().getText())'
-          onRemoveUpdate='getIdentity().setAddress(getAddressTextField().getText())'/>
+        <JTextField id="addressTextField" />
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.address2"/>
+        <JLabel id="address2Label"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="address2TextField"
-                    text="{getIdentity().getAddress2()}"/>
-        <javax.swing.text.Document
-          javaBean="getAddress2TextField().getDocument()"
-          onInsertUpdate='getIdentity().setAddress2(getAddress2TextField().getText())'
-          onRemoveUpdate='getIdentity().setAddress2(getAddress2TextField().getText())'/>
+        <JTextField id="address2TextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.zipCode"/>
+        <JLabel id="zipCodeLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="zipCodeTextField" text="{getIdentity().getZipCode()}"/>
-        <javax.swing.text.Document
-          javaBean="getZipCodeTextField().getDocument()"
-          onInsertUpdate='getIdentity().setZipCode(getZipCodeTextField().getText())'
-          onRemoveUpdate='getIdentity().setZipCode(getZipCodeTextField().getText())'/>
+        <JTextField id="zipCodeTextField"/>
       </cell>
     </row>
     <row>
@@ -108,82 +82,57 @@
         <JLabel text="lima.identity.city"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="cityTextField" text="{getIdentity().getCity()}"/>
-        <javax.swing.text.Document javaBean="getCityTextField().getDocument()"
-                                   onInsertUpdate='getIdentity().setCity(getCityTextField().getText())'
-                                   onRemoveUpdate='getIdentity().setCity(getCityTextField().getText())'/>
+        <JTextField id="cityTextField" />
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.businessNumber"/>
+        <JLabel id="businessNumberLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="businessNumberTextField"
-                    text="{getIdentity().getBusinessNumber()}"/>
-        <javax.swing.text.Document
-          javaBean="getBusinessNumberTextField().getDocument()"
-          onInsertUpdate='getIdentity().setBusinessNumber(getBusinessNumberTextField().getText())'
-          onRemoveUpdate='getIdentity().setBusinessNumber(getBusinessNumberTextField().getText())'/>
+        <JTextField id="businessNumberTextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.vatNumber"/>
+        <JLabel id="vatNumberLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="vatNumberTextField"
-                    text="{getIdentity().getVatNumber()}"/>
-        <javax.swing.text.Document
-          javaBean="getVatNumberTextField().getDocument()"
-          onInsertUpdate='getIdentity().setVatNumber(getVatNumberTextField().getText())'
-          onRemoveUpdate='getIdentity().setVatNumber(getVatNumberTextField().getText())'/>
+        <JTextField id="vatNumberTextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.classificationCode"/>
+        <JLabel id="classificationCodeLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="classificationCodeTextField"
-                    text="{getIdentity().getClassificationCode()}"/>
-        <javax.swing.text.Document
-          javaBean="getClassificationCodeTextField().getDocument()"
-          onInsertUpdate='getIdentity().setClassificationCode(getClassificationCodeTextField().getText())'
-          onRemoveUpdate='getIdentity().setClassificationCode(getClassificationCodeTextField().getText())'/>
+        <JTextField id="classificationCodeTextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.phoneNumber"/>
+        <JLabel id="phoneNumberLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="phoneNumberTextField"
-                    text="{getIdentity().getPhoneNumber()}"/>
-        <javax.swing.text.Document
-          javaBean="getPhoneNumberTextField().getDocument()"
-          onInsertUpdate='getIdentity().setPhoneNumber(getPhoneNumberTextField().getText())'
-          onRemoveUpdate='getIdentity().setPhoneNumber(getPhoneNumberTextField().getText())'/>
+        <JTextField id="phoneNumberTextField"/>
       </cell>
     </row>
     <row>
       <cell fill="horizontal">
-        <JLabel text="lima.identity.email"/>
+        <JLabel id="emailLabel"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="emailTextField" text="{getIdentity().getEmail()}"/>
-        <javax.swing.text.Document javaBean="getEmailTextField().getDocument()"
-                                   onInsertUpdate='getIdentity().setEmail(getEmailTextField().getText())'
-                                   onRemoveUpdate='getIdentity().setEmail(getEmailTextField().getText())'/>
+        <JTextField id="emailTextField" />
       </cell>
     </row>
     <row>
       <cell fill="none">
-        <JButton text="lima.common.cancel" onActionPerformed="performCancel()"/>
+        <JButton id="cancel"
+                 onActionPerformed="dispose();"/>
       </cell>
       <cell fill="none">
-        <JButton id="ok" text="lima.common.ok" onActionPerformed="handler.updateIdentity(getIdentity());
-                dispose()"/>
+        <JButton id="ok"
+                 onActionPerformed="handler.updateIdentity(); dispose();" />
       </cell>
     </row>
   </Table>

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java	2014-07-31 12:01:23 UTC (rev 3880)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityHandler.java	2014-07-31 13:05:12 UTC (rev 3881)
@@ -36,10 +36,13 @@
 
     protected IdentityService identityService;
 
+    protected IdentityForm view;
+
     private static final Log log = LogFactory.getLog(IdentityHandler.class);
 
 
-    public IdentityHandler() {
+    public IdentityHandler(IdentityForm view) {
+        this.view = view;
         identityService =
                 LimaServiceFactory.getService(
                         IdentityService.class);
@@ -53,7 +56,21 @@
         return identity;
     }
 
-    public void updateIdentity(Identity identity) {
+    public void updateIdentity(){
+        Identity identity = getIdentity();
+
+        identity.setName(view.getNameTextField().getText());
+        identity.setDescription(view.getDescriptionTextField().getText());
+        identity.setAddress(view.getAddressTextField().getText());
+        identity.setAddress2(view.getAddress2TextField().getText());
+        identity.setZipCode(view.getZipCodeTextField().getText());
+        identity.setCity(view.getCityTextField().getText());
+        identity.setBusinessNumber(view.getBusinessNumberTextField().getText());
+        identity.setVatNumber(view.getVatNumberTextField().getText());
+        identity.setClassificationCode(view.getClassificationCodeTextField().getText());
+        identity.setPhoneNumber(view.getPhoneNumberTextField().getText());
+        identity.setEmail(view.getEmailTextField().getText());
+
         identityService.updateIdentity(identity);
     }
 }

    

r3881 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/identity

sbavencoff＠users.chorem.org

tags

participants (1)