svn commit: r523767 - in /ofbiz/trunk/framework: datafile/src/org/ofbiz/datafile/ webtools/webapp/webtools/WEB-INF/actions/datafile/ webtools/webapp/webtools/datafile/

[jacopoc]

Author: jacopoc
Date: Thu Mar 29 09:52:55 2007
New Revision: 523767

URL: http://svn.apache.org/viewvc?view=rev&rev=523767
Log:
Misc fixes to make the datafile tool screen work with after recent migration to the widgets.

Modified:
    ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java
    ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelField.java
    ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelRecord.java
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh
    ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl

Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java?view=diff&rev=523767&r1=523766&r2=523767
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelDataFile.java Thu Mar 29 09:52:55 2007
@@ -69,4 +69,76 @@
         }
         return null;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode;
+    }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public int getRecordLength() {
+        return recordLength;
+    }
+
+    public void setRecordLength(int recordLength) {
+        this.recordLength = recordLength;
+    }
+
+    public char getDelimiter() {
+        return delimiter;
+    }
+
+    public void setDelimiter(char delimiter) {
+        this.delimiter = delimiter;
+    }
+
+    public String getSeparatorStyle() {
+        return separatorStyle;
+    }
+
+    public void setSeparatorStyle(String separatorStyle) {
+        this.separatorStyle = separatorStyle;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List getRecords() {
+        return records;
+    }
+
+    public void setRecords(List records) {
+        this.records = records;
+    }
 }

Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelField.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelField.java?view=diff&rev=523767&r1=523766&r2=523767
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelField.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelField.java Thu Mar 29 09:52:55 2007
@@ -59,4 +59,12 @@
     
     /** Referenced field */
     public String refField = null;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }

Modified: ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelRecord.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelRecord.java?view=diff&rev=523767&r1=523766&r2=523767
==============================================================================
--- ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelRecord.java (original)
+++ ofbiz/trunk/framework/datafile/src/org/ofbiz/datafile/ModelRecord.java Thu Mar 29 09:52:55 2007
@@ -80,5 +80,37 @@
         }
         return null;
     }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getParentName() {
+        return parentName;
+    }
+
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public List getFields() {
+        return fields;
+    }
+
+    public void setFields(List fields) {
+        this.fields = fields;
+    }
 }
 

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh?view=diff&rev=523767&r1=523766&r2=523767
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/datafile/viewdatafile.bsh Thu Mar 29 09:52:55 2007
@@ -58,7 +58,8 @@
         definitionNames = ((Collection)reader.getDataFileNames()).iterator();
     }
 }
-  
+context.put("definitionNames", definitionNames);
+
 DataFile dataFile = null;
 if (dataFileUrl != null && definitionUrl != null && definitionName != null && definitionName.length() > 0) {
     try {

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?view=diff&rev=523767&r1=523766&r2=523767
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Thu Mar 29 09:52:55 2007
@@ -26,7 +26,7 @@
     <table class="basic-table form-widget-table">
       <tr>
         <td class="label">Definition Filename or URL</td>
-        <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${definitionLoc?if_exists}"></td>
+        <td><input name="DEFINITION_LOCATION" type="text" size="60" value="${parameters.DEFINITION_LOCATION?if_exists}"></td>
         <td><span class="label">Is URL?</span><input type="checkbox" name="DEFINITION_IS_URL"<#if parameters.DEFINITION_IS_URL?has_content> checked="checked"</#if>></td>
       </tr>
       <tr>
@@ -37,7 +37,7 @@
               <option value=""></option>
               <#list definitionNames as oneDefinitionName>
                 boolean isSelected = definitionName != null && definitionName.equals(oneDefinitionName);
-                %><option value="<%=oneDefinitionName%>" <%=(isSelected? "selected": "")%>><%=oneDefinitionName%></option><%
+                <option value="${oneDefinitionName}" <#if parameters.DEFINITION_NAME?exists && parameters.DEFINITION_NAME == oneDefinitionName> selected </#if>>${oneDefinitionName}</option>
               </#list>
             </select>
           <#else>
@@ -48,17 +48,17 @@
       </tr>
       <tr>
         <td class="label">Data Filename or URL</td>
-        <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${dataFileLoc?if_exists}"></td>
-        <td><span class="label">Is URL?</span><input type="checkbox" name="DATAFILE_IS_URL"<#if DATAFILE_IS_URL?has_content> checked="checked"</#if>></td>
+        <td><input name="DATAFILE_LOCATION" type="text" size="60" value="${parameters.DATAFILE_LOCATION?if_exists}"></td>
+        <td><span class="label">Is URL?</span><input type="checkbox" name="DATAFILE_IS_URL"<#if parameters.DATAFILE_IS_URL?has_content> checked="checked"</#if>></td>
       </tr>
       <tr>
         <td class="label">Save to file</td>
-        <td><input name="DATAFILE_SAVE" type="text" size="60" value="${dataFileSave?if_exists}"/></td>
+        <td><input name="DATAFILE_SAVE" type="text" size="60" value="${parameters.DATAFILE_SAVE?if_exists}"/></td>
         <td>&nbsp;</td>
       </tr>
       <tr>
         <td class="label">Save to entity xml file</td>
-        <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${entityXmlFileSave?if_exists}"></td>
+        <td><input name="ENTITYXML_FILE_SAVE" type="text" size="60" value="${parameters.ENTITYXML_FILE_SAVE?if_exists}"></td>
         <td>&nbsp;</td>
       </tr>
       <tr>
@@ -116,7 +116,7 @@
           </#if>
         </#list>
       </tr>
-      <#if record.getChildRecords() != null && record.getChildRecords().size() > 0>
+      <#if record.getChildRecords() != null && (record.getChildRecords().size() > 0)>
         <@displayrecords records = record.getChildRecords()/>
       </#if>
     </#list>