You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/11/17 10:11:35 UTC
svn commit: r1640111 [2/4] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/script/org/ofbiz/accounting/admin/
applications/content/src/org/ofbiz/content/
applications/content/src/org/ofbiz/content/content/ app...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/FoFormRenderer.java Mon Nov 17 09:11:33 2014
@@ -29,6 +29,7 @@ import org.ofbiz.base.util.UtilFormatOut
import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.widget.ModelWidget;
import org.ofbiz.widget.WidgetWorker;
+import org.ofbiz.widget.form.FieldInfo;
import org.ofbiz.widget.form.FormStringRenderer;
import org.ofbiz.widget.form.ModelForm;
import org.ofbiz.widget.form.ModelFormField;
@@ -38,6 +39,7 @@ import org.ofbiz.widget.form.ModelFormFi
import org.ofbiz.widget.form.ModelFormField.DateTimeField;
import org.ofbiz.widget.form.ModelFormField.DisplayField;
import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
import org.ofbiz.widget.form.ModelFormField.FileField;
import org.ofbiz.widget.form.ModelFormField.HiddenField;
import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -124,7 +126,7 @@ public class FoFormRenderer extends Html
if (UtilValidate.isNotEmpty(explicitDescription)) {
this.makeBlockString(writer, modelFormField.getWidgetStyle(), explicitDescription);
} else {
- this.makeBlockString(writer, modelFormField.getWidgetStyle(), ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
+ this.makeBlockString(writer, modelFormField.getWidgetStyle(), FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
}
} else {
boolean optionSelected = false;
@@ -196,7 +198,7 @@ public class FoFormRenderer extends Html
List<ModelFormField> childFieldList = modelForm.getFieldList();
for (ModelFormField childField : childFieldList) {
int childFieldType = childField.getFieldInfo().getFieldType();
- if (childFieldType == ModelFormField.FieldInfo.HIDDEN || childFieldType == ModelFormField.FieldInfo.IGNORED) {
+ if (childFieldType == FieldInfo.HIDDEN || childFieldType == FieldInfo.IGNORED) {
continue;
}
writer.append("<fo:table-column");
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/FormRenderer.java Mon Nov 17 09:11:33 2014
@@ -122,12 +122,12 @@ public class FormRenderer {
if (position != -1 && modelFormField.getPosition() != position) {
continue;
}
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// render hidden/ignored field widget
switch (fieldInfo.getFieldType()) {
- case ModelFormField.FieldInfo.HIDDEN:
- case ModelFormField.FieldInfo.IGNORED:
+ case FieldInfo.HIDDEN:
+ case FieldInfo.IGNORED:
if (modelFormField.shouldUse(context)) {
hiddenIgnoredFieldList.add(modelFormField);
if (alreadyRendered != null)
@@ -135,8 +135,8 @@ public class FormRenderer {
}
break;
- case ModelFormField.FieldInfo.DISPLAY:
- case ModelFormField.FieldInfo.DISPLAY_ENTITY:
+ case FieldInfo.DISPLAY:
+ case FieldInfo.DISPLAY_ENTITY:
ModelFormField.DisplayField displayField = (ModelFormField.DisplayField) fieldInfo;
if (displayField.getAlsoHidden() && modelFormField.shouldUse(context)) {
hiddenIgnoredFieldList.add(modelFormField);
@@ -144,7 +144,7 @@ public class FormRenderer {
}
break;
- case ModelFormField.FieldInfo.HYPERLINK:
+ case FieldInfo.HYPERLINK:
ModelFormField.HyperlinkField hyperlinkField = (ModelFormField.HyperlinkField) fieldInfo;
if (hyperlinkField.getAlsoHidden() && modelFormField.shouldUse(context)) {
hiddenIgnoredFieldList.add(modelFormField);
@@ -236,7 +236,7 @@ public class FormRenderer {
if (curPos > positions) {
positions = curPos;
}
- ModelFormField.FieldInfo currentFieldInfo = modelFormField.getFieldInfo();
+ FieldInfo currentFieldInfo = modelFormField.getFieldInfo();
if (currentFieldInfo != null) {
ModelFormField fieldInfoFormField = currentFieldInfo.getModelFormField();
if (fieldInfoFormField != null) {
@@ -317,7 +317,7 @@ public class FormRenderer {
// will be rendered as columns after it
boolean inputFieldFound = false;
for (ModelFormField modelFormField : mainFieldList) {
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// if the field's title is explicitly set to "" (title="") then
// the header is not created for it; this is useful for position list
@@ -328,14 +328,14 @@ public class FormRenderer {
continue;
}
// don't do any header for hidden or ignored fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
- if (fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY_ENTITY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.HYPERLINK) {
+ if (fieldInfo.getFieldType() != FieldInfo.DISPLAY
+ && fieldInfo.getFieldType() != FieldInfo.DISPLAY_ENTITY
+ && fieldInfo.getFieldType() != FieldInfo.HYPERLINK) {
inputFieldFound = true;
continue;
}
@@ -351,18 +351,18 @@ public class FormRenderer {
// prepare the combined title for the column that will contain the form/input fields
for (ModelFormField modelFormField : mainFieldList) {
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// don't do any header for hidden or ignored fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
// skip all of the display/hyperlink fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.DISPLAY
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.DISPLAY_ENTITY
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.HYPERLINK) {
+ if (fieldInfo.getFieldType() == FieldInfo.DISPLAY
+ || fieldInfo.getFieldType() == FieldInfo.DISPLAY_ENTITY
+ || fieldInfo.getFieldType() == FieldInfo.HYPERLINK) {
continue;
}
@@ -461,9 +461,9 @@ public class FormRenderer {
ModelFormField modelFormField = mainFieldListIter.next();
// don't do any header for hidden or ignored fields
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
@@ -489,18 +489,18 @@ public class FormRenderer {
private void renderHiddenIgnoredFields(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer,
List<ModelFormField> fieldList) throws IOException {
for (ModelFormField modelFormField : fieldList) {
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// render hidden/ignored field widget
switch (fieldInfo.getFieldType()) {
- case ModelFormField.FieldInfo.HIDDEN:
- case ModelFormField.FieldInfo.IGNORED:
+ case FieldInfo.HIDDEN:
+ case FieldInfo.IGNORED:
modelFormField.renderFieldString(writer, context, formStringRenderer);
break;
- case ModelFormField.FieldInfo.DISPLAY:
- case ModelFormField.FieldInfo.DISPLAY_ENTITY:
- case ModelFormField.FieldInfo.HYPERLINK:
+ case FieldInfo.DISPLAY:
+ case FieldInfo.DISPLAY_ENTITY:
+ case FieldInfo.HYPERLINK:
formStringRenderer.renderHiddenField(writer, context, modelFormField, modelFormField.getEntry(context));
break;
}
@@ -631,9 +631,9 @@ public class FormRenderer {
ModelFormField modelFormField = mainFieldIter.next();
// don't do any header for hidden or ignored fields inside this loop
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
@@ -795,17 +795,17 @@ public class FormRenderer {
int currentPosition = 1;
while (innerDisplayHyperlinkFieldIter.hasNext()) {
ModelFormField modelFormField = innerDisplayHyperlinkFieldIter.next();
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// don't do any header for hidden or ignored fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
- if (fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY_ENTITY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.HYPERLINK) {
+ if (fieldInfo.getFieldType() != FieldInfo.DISPLAY
+ && fieldInfo.getFieldType() != FieldInfo.DISPLAY_ENTITY
+ && fieldInfo.getFieldType() != FieldInfo.HYPERLINK) {
// okay, now do the form cell
break;
}
@@ -821,18 +821,18 @@ public class FormRenderer {
Iterator<ModelFormField> innerFormFieldIter = fieldListByPosition.iterator();
while (innerFormFieldIter.hasNext()) {
ModelFormField modelFormField = innerFormFieldIter.next();
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// don't do any header for hidden or ignored fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
// skip all of the display/hyperlink fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.DISPLAY
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.DISPLAY_ENTITY
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.HYPERLINK) {
+ if (fieldInfo.getFieldType() == FieldInfo.DISPLAY
+ || fieldInfo.getFieldType() == FieldInfo.DISPLAY_ENTITY
+ || fieldInfo.getFieldType() == FieldInfo.HYPERLINK) {
continue;
}
@@ -846,18 +846,18 @@ public class FormRenderer {
}
while (innerDisplayHyperlinkFieldIter.hasNext()) {
ModelFormField modelFormField = innerDisplayHyperlinkFieldIter.next();
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
// don't do any header for hidden or ignored fields
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
// skip all non-display and non-hyperlink fields
- if (fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.DISPLAY_ENTITY
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.HYPERLINK) {
+ if (fieldInfo.getFieldType() != FieldInfo.DISPLAY
+ && fieldInfo.getFieldType() != FieldInfo.DISPLAY_ENTITY
+ && fieldInfo.getFieldType() != FieldInfo.HYPERLINK) {
continue;
}
@@ -1087,9 +1087,9 @@ public class FormRenderer {
}
}
- ModelFormField.FieldInfo fieldInfo = currentFormField.getFieldInfo();
- if (fieldInfo.getFieldType() == ModelFormField.FieldInfo.HIDDEN
- || fieldInfo.getFieldType() == ModelFormField.FieldInfo.IGNORED) {
+ FieldInfo fieldInfo = currentFormField.getFieldInfo();
+ if (fieldInfo.getFieldType() == FieldInfo.HIDDEN
+ || fieldInfo.getFieldType() == FieldInfo.IGNORED) {
continue;
}
if (alreadyRendered.contains(currentFormField.getName())) {
@@ -1158,8 +1158,8 @@ public class FormRenderer {
formStringRenderer.renderFormatFieldRowTitleCellOpen(writer, context, currentFormField);
// render title (unless this is a submit or a reset field)
- if (fieldInfo.getFieldType() != ModelFormField.FieldInfo.SUBMIT
- && fieldInfo.getFieldType() != ModelFormField.FieldInfo.RESET) {
+ if (fieldInfo.getFieldType() != FieldInfo.SUBMIT
+ && fieldInfo.getFieldType() != FieldInfo.RESET) {
formStringRenderer.renderFieldTitle(writer, context, currentFormField);
} else {
formStringRenderer.renderFormatEmptySpace(writer, context, modelForm);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Nov 17 09:11:33 2014
@@ -60,6 +60,7 @@ import org.ofbiz.widget.form.ModelFormFi
import org.ofbiz.widget.form.ModelFormField.DisplayEntityField;
import org.ofbiz.widget.form.ModelFormField.DisplayField;
import org.ofbiz.widget.form.ModelFormField.DropDownField;
+import org.ofbiz.widget.form.ModelFormField.FieldInfoWithOptions;
import org.ofbiz.widget.form.ModelFormField.FileField;
import org.ofbiz.widget.form.ModelFormField.HiddenField;
import org.ofbiz.widget.form.ModelFormField.HyperlinkField;
@@ -779,7 +780,7 @@ public final class MacroFormRenderer imp
}
explicitDescription = (currentDescription != null ? currentDescription : dropDownField.getCurrentDescription(context));
if (UtilValidate.isEmpty(explicitDescription)) {
- explicitDescription = (ModelFormField.FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
+ explicitDescription = (FieldInfoWithOptions.getDescriptionForOptionKey(currentValue, allOptionValues));
}
if (textSize > 0 && UtilValidate.isNotEmpty(explicitDescription) && explicitDescription.length() > textSize) {
explicitDescription = explicitDescription.substring(0, textSize - 8) + "..." + explicitDescription.substring(explicitDescription.length() - 5);
@@ -1418,7 +1419,7 @@ public final class MacroFormRenderer imp
List<String> fieldNameList = new LinkedList<String>();
for (ModelFormField childField : childFieldList) {
int childFieldType = childField.getFieldInfo().getFieldType();
- if (childFieldType == ModelFormField.FieldInfo.HIDDEN || childFieldType == ModelFormField.FieldInfo.IGNORED) {
+ if (childFieldType == FieldInfo.HIDDEN || childFieldType == FieldInfo.IGNORED) {
continue;
}
String areaStyle = childField.getTitleAreaStyle();
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1640111&r1=1640110&r2=1640111&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Nov 17 09:11:33 2014
@@ -749,7 +749,7 @@ public class ModelForm extends ModelWidg
String thisType = this.getType();
for (Element fieldElement : UtilXml.childElementList(formElement, "field")) {
ModelFormField modelFormField = new ModelFormField(fieldElement, this, entityModelReader, dispatchContext);
- ModelFormField.FieldInfo fieldInfo = modelFormField.getFieldInfo();
+ FieldInfo fieldInfo = modelFormField.getFieldInfo();
if (thisType.equals("multi") && fieldInfo instanceof ModelFormField.SubmitField) {
multiSubmitFields.add(modelFormField);
} else {
@@ -861,7 +861,7 @@ public class ModelForm extends ModelWidg
}
@Override
- public void accept(ModelWidgetVisitor visitor) {
+ public void accept(ModelWidgetVisitor visitor) throws Exception {
visitor.visit(this);
}