Changeset 17816

Timestamp:

08/01/08 16:03:29 (2 months ago)

Author:

vivana

Message:

fixed form export/import - refactor code for form list and
field properites

Files:

• trunk/core/src/net/project/form/soa/FormServiceImpl.java (modified) (7 diffs)
• trunk/core/src/net/project/form/soa/binding/FieldPropertyValue.java (added)
• trunk/core/src/net/project/form/soa/binding/FieldPropertyValues.java (added)
• trunk/core/src/net/project/form/soa/binding/FormField.java (modified) (7 diffs)
• trunk/core/src/net/project/form/soa/binding/ObjectFactory.java (modified) (17 diffs)
• trunk/core/src/net/project/soa/forms/FormExportServiceImpl.java (modified) (2 diffs)

trunk/core/src/net/project/form/soa/FormServiceImpl.java

@@ -1 +1 @@
-package net.project.form.soa;
-
+import java.math.BigInteger;
-import java.sql.SQLException;
+import java.util.HashMap;
-
-import org.apache.log4j.Logger;
@@ -10 +12 @@
-import net.project.database.ObjectManager;
-import net.project.form.soa.binding.DomainValue;
+import net.project.form.soa.binding.FieldFilter;
+import net.project.form.soa.binding.FieldPropertyValue;
-import net.project.form.soa.binding.FormDef;
-import net.project.form.soa.binding.FormField;
+import net.project.form.soa.binding.FormList;
+import net.project.form.soa.binding.ListField;
-import net.project.persistence.PersistenceException;
-import net.project.util.Conversion;
@@ -47 +53 @@
-                        String spaceId) throws PersistenceException {
-
+                HashMap<BigInteger, String> fieldIds = new HashMap<BigInteger, String>();
+                
-                java.sql.Timestamp newCrc = new java.sql.Timestamp(new java.util.Date()
-                                .getTime());
@@ -83 +91 @@
-                                                        + "values ("+ spaceId +  ", " +  classId + ", " + Conversion.booleanToInt(true) + ") ");
-                        db.release();
-
+
+
+
-                        for (FormField field : formDef.getFormFields().getFormField()) {
-                                String domainId = null;
-String sql;
+
-                                if (field.getDomainValues() != null) {
-                                        domainId = ObjectManager.dbCreateObjectWithPermissions(ObjectType.FORM_DOMAIN, "A", spaceId, userId);
@@ -108 +118 @@
-                                java.sql.Timestamp newFieldCrc = new java.sql.Timestamp(new java.util.Date().getTime());
-                                String fieldId = ObjectManager.dbCreateObjectWithPermissions(ObjectType.FORM_FIELD, "A", spaceId, userId);
+                                fieldIds.put(field.getId(), fieldId);
-                                
-                    sql  = "insert into pn_class_field (class_id, field_id, space_id, element_id, field_label, " +
@@ -120 +131 @@
-                    sql  += " , crc, record_status, max_value, min_value, default_value) " +
-                        "values (" + classId + "," + fieldId + "," + spaceId + ", " + field.getElementId().toString() +  "," 
-Element
+
-                          field.getDataColumnSize()  + "," + field.getDataColumnScale() + "," + 
-                         DBFormat.bool(field.getDatatype() != null) + ", " + field.getRowNum().toString() + "," + field.getRowSpan().toString() +
@@ -134 +145 @@
-                                db.release();                           
-                                
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                } catch (SQLException sqle) {
+                        sqle.printStackTrace();
-                        Logger.getLogger(FormServiceImpl.class).error(
-                                        "FormServiceImpl.storeImportedDesign threw an SQL Exception: "

trunk/core/src/net/project/form/soa/binding/FormField.java

@@ +1 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2008.07.31 at 09:10:26 PM CEST 
+//
+
+
-package net.project.form.soa.binding;
-
@@ -42 +50 @@
- *         &lt;element ref="{}data_column_scale"/>
- *         &lt;element ref="{}DomainValues" minOccurs="0"/>
+ *         &lt;element ref="{}FieldPropertyValues" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
@@ -74 +83 @@
-    "dataColumnSize",
-    "dataColumnScale",
-
+
+
-})
-@XmlRootElement(name = "FormField")
@@ -113 +123 @@
-    @XmlElement(name = "default_value", required = true)
-    protected String defaultValue;
-    
+
-    @XmlElement(name = "use_default")
-    protected boolean useDefault;
-    @XmlElement(name = "multiselect")
-    protected boolean multiselect;
-
+, required = true
-    protected String dataColumnSize;
-
-      
+, required = true
+
-    @XmlElement(name = "DomainValues")
-    protected DomainValues domainValues;
-
+
+
+
-    /**
-     * Gets the value of the id property.
@@ -454 +465 @@
-     * @param value
-     *     allowed object is
-
+Big
-     *     
-     */
@@ -548 +559 @@
-        this.required = value;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     * Gets the value of the domainValues property.
-     * 
@@ -630 +664 @@
-    }
-
+    /**
+     * Gets the value of the fieldPropertyValues property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link FieldPropertyValues }
+     *     
+     */
+    public FieldPropertyValues getFieldPropertyValues() {
+        return fieldPropertyValues;
+    }
+
+    /**
+     * Sets the value of the fieldPropertyValues property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link FieldPropertyValues }
+     *     
+     */
+    public void setFieldPropertyValues(FieldPropertyValues value) {
+        this.fieldPropertyValues = value;
+    }    
-}

trunk/core/src/net/project/form/soa/binding/ObjectFactory.java

@@ +1 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-558 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2008.07.31 at 09:10:26 PM CEST 
+//
+
+
-package net.project.form.soa.binding;
-
@@ -6 +14 @@
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-
@@ -28 +35 @@
-    private final static QName _RowSpan_QNAME = new QName("", "row_span");
-    private final static QName _ElementLabel_QNAME = new QName("", "element_label");
+    private final static QName _Abbreviation_QNAME = new QName("", "abbreviation");
-    private final static QName _FieldGroup_QNAME = new QName("", "field_group");
-Abbreviation_QNAME = new QName("", "abbreviation
+UseDefault_QNAME = new QName("", "use_default
-    private final static QName _WrapMode_QNAME = new QName("", "wrap_mode");
-    private final static QName _ClassTypeId_QNAME = new QName("", "class_type_id");
@@ -39 +47 @@
-    private final static QName _IsShared_QNAME = new QName("", "is_shared");
-    private final static QName _SortAscending_QNAME = new QName("", "sort_ascending");
+    private final static QName _MaxColumn_QNAME = new QName("", "max_column");
-    private final static QName _ColumnName_QNAME = new QName("", "column_name");
-Column_QNAME = new QName("", "max_column
+Row_QNAME = new QName("", "max_row
-    private final static QName _ElementId_QNAME = new QName("", "element_id");
-    private final static QName _MaxRow_QNAME = new QName("", "max_row");
-    private final static QName _Name_QNAME = new QName("", "name");
-    private final static QName _ColumnId_QNAME = new QName("", "column_id");
+    private final static QName _Multiselect_QNAME = new QName("", "multiselect");
-    private final static QName _SortOrder_QNAME = new QName("", "sort_order");
-    private final static QName _Required_QNAME = new QName("", "required");
+    private final static QName _DataColumnScale_QNAME = new QName("", "data_column_scale");
-    private final static QName _MinValue_QNAME = new QName("", "min_value");
-    private final static QName _ColumnNum_QNAME = new QName("", "column_num");
@@ -54 +64 @@
-    private final static QName _FieldOrder_QNAME = new QName("", "field_order");
-    private final static QName _FilterValue_QNAME = new QName("", "filter_value");
+    private final static QName _DataColumnSize_QNAME = new QName("", "data_column_size");
-    private final static QName _Label_QNAME = new QName("", "label");
-    private final static QName _ElementName_QNAME = new QName("", "element_name");
@@ -65 +76 @@
-    private final static QName _IsSortField_QNAME = new QName("", "is_sort_field");
-    private final static QName _ColumnSpan_QNAME = new QName("", "column_span");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: net.project.form.soa.binding
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link FormList }
+     * 
+     */
+    public FormList createFormList() {
+        return new FormList();
+    }
+
+    /**
+     * Create an instance of {@link FormField }
+     * 
+     */
+    public FormField createFormField() {
+        return new FormField();
+    }
+
+    /**
+     * Create an instance of {@link FormFields }
+     * 
+     */
+    public FormFields createFormFields() {
+        return new FormFields();
+    }
+
+    /**
+     * Create an instance of {@link DomainValue }
+     * 
+     */
+    public DomainValue createDomainValue() {
+        return new DomainValue();
+    }
-    
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /**
@@ -87 +142 @@
-
-    /**
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -116 +163 @@
-    public FormLists createFormLists() {
-        return new FormLists();
-    }
-
-    /**
-     * Create an instance of {@link FieldFilter }
-     * 
-     */
-    public FieldFilter createFieldFilter() {
-        return new FieldFilter();
-    }
-
-    /**
-     * Create an instance of {@link DomainValues }
-     * 
-     */
-    public DomainValues createDomainValues() {
-        return new DomainValues();
-    }
-
-    /**
-     * Create an instance of {@link FormFields }
-     * 
-     */
-    public FormFields createFormFields() {
-        return new FormFields();
-    }
-
@@ -172 +195 @@
-     * 
-     */
+    @XmlElementDecl(namespace = "", name = "abbreviation")
+    public JAXBElement<String> createAbbreviation(String value) {
+        return new JAXBElement<String>(_Abbreviation_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
-    @XmlElementDecl(namespace = "", name = "field_group")
-    public JAXBElement<String> createFieldGroup(String value) {
@@ -178 +210 @@
-
-    /**
-String
-
-
-abbreviation
-String> createAbbreviation(String
-String>(_Abbreviation_QNAME, String
+Boolean
+
+
+use_default
+Boolean> createUseDefault(Boolean
+Boolean>(_UseDefault_QNAME, Boolean
-    }
-
@@ -268 +300 @@
-
-    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "", name = "max_column")
+    public JAXBElement<Integer> createMaxColumn(Integer value) {
+        return new JAXBElement<Integer>(_MaxColumn_QNAME, Integer.class, null, value);
+    }
+
+    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
@@ -280 +321 @@
-     * 
-     */
-column
-Column
-Column
+row
+Row
+Row
-    }
-
@@ -295 +336 @@
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "max_row")
-    public JAXBElement<Integer> createMaxRow(Integer value) {
-        return new JAXBElement<Integer>(_MaxRow_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
@@ -317 +349 @@
-     */
-    @XmlElementDecl(namespace = "", name = "column_id")
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-     * 
-     */
@@ -343 +384 @@
-     * 
-     */
+    @XmlElementDecl(namespace = "", name = "data_column_scale")
+    public JAXBElement<String> createDataColumnScale(String value) {
+        return new JAXBElement<String>(_DataColumnScale_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
-    @XmlElementDecl(namespace = "", name = "min_value")
-    public JAXBElement<String> createMinValue(String value) {
@@ -406 +456 @@
-     * 
-     */
+    @XmlElementDecl(namespace = "", name = "data_column_size")
+    public JAXBElement<String> createDataColumnSize(String value) {
+        return new JAXBElement<String>(_DataColumnSize_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
-    @XmlElementDecl(namespace = "", name = "label")
-    public JAXBElement<String> createLabel(String value) {
@@ -500 +559 @@
-        return new JAXBElement<Integer>(_ColumnSpan_QNAME, Integer.class, null, value);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}

trunk/core/src/net/project/soa/forms/FormExportServiceImpl.java

@@ -18 +18 @@
-import com.sun.istack.ByteArrayDataSource;
-
+import net.project.form.FieldDomain;
+import net.project.form.FieldDomainValue;
-import net.project.form.FieldFilter;
-import net.project.form.FieldFilterConstraint;
-import net.project.form.FormDesigner;
-import net.project.form.FormField;
+import net.project.form.FormFieldProperty;
-import net.project.form.FormList;
-import net.project.form.ListFieldProperties;
-
+import net.project.form.soa.binding.DomainValue;
+import net.project.form.soa.binding.FieldPropertyValue;
+import net.project.form.soa.binding.FieldPropertyValues;
-import net.project.form.soa.binding.FormDef;
-import net.project.form.soa.binding.FormFields;
@@ -93 +99 @@
-                                field.setDataColumnScale(designerField.getDataColumnScale());
-                                
+                                if (designerField.getDomain() != null){
+                                        FieldDomain designerDomain = designerField.getDomain();
+                                        if (designerDomain.getValues() != null && designerDomain.getValues().size() > 0){
+                                                net.project.form.soa.binding.DomainValues domainValues = factory.createDomainValues();
+                                        
+                                                for (Iterator it = designerDomain.getValues().iterator(); it.hasNext();) {
+                                                        FieldDomainValue designerDomainValue = (FieldDomainValue) it.next();                            
+                                                        DomainValue domainValue = factory.createDomainValue();                          
+                                                        domainValue.setId(new BigInteger(designerDomainValue.getID()));
+                                                        domainValue.setContent(designerDomainValue.getName());                          
+                                                        domainValues.getDomainValue().add(domainValue);
+                                                }                                       
+                                                field.setDomainValues(domainValues);
+                                        }                               
+                                }
+                                
+                                if (designerField.getProperties() != null && designerField.getProperties().size() > 0){
+                                        FieldPropertyValues fieldPropertyValues = factory.createFieldPropertyValues();
+                                        List<FormFieldProperty> designerFieldProperties = designerField.getProperties();
+                                        for (FormFieldProperty designerFieldProperty : designerFieldProperties){
+                                                FieldPropertyValue fieldPropertyValue = factory.createFieldPropertyValue(); 
+                                                
+                                                fieldPropertyValue.setClientTypeId(designerField.getClientTypeID());
+                                                fieldPropertyValue.setPropertyName(designerFieldProperty.getName());
+                                                fieldPropertyValue.setPropertyType(designerFieldProperty.getType());
+                                                fieldPropertyValue.setPropertyValue(designerFieldProperty.getValue());
+                                                                                                
+                                                fieldPropertyValues.getFieldPropertyValue().add(fieldPropertyValue);
+                                        }
+                                                                                
+                                        field.setFieldPropertyValues(fieldPropertyValues);
+                                }
+                                
-                                formFields.getFormField().add(field);
+                                
-                        }
-                        form.setFormFields(formFields);