You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2014/11/03 17:29:41 UTC
svn commit: r1636383 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Author: adrianc
Date: Mon Nov 3 16:29:40 2014
New Revision: 1636383
URL: http://svn.apache.org/r1636383
Log:
Remove unused methods from ModelForm.java.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1636383&r1=1636382&r2=1636383&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Nov 3 16:29:40 2014
@@ -1365,8 +1365,8 @@ public class ModelForm extends ModelWidg
}
if (getPaginate(context)) {
- viewIndex = this.getPaginateIndex(context);
- viewSize = this.getPaginateSize(context);
+ viewIndex = this.getViewIndex(context);
+ viewSize = this.getViewSize(context);
lowIndex = viewIndex * viewSize;
highIndex = (viewIndex + 1) * viewSize;
} else {
@@ -1487,43 +1487,6 @@ public class ModelForm extends ModelWidg
return DEFAULT_PAG_FIRST_STYLE;
}
- public int getPaginateIndex(Map<String, Object> context) {
- String field = this.getMultiPaginateIndexField(context);
-
- int viewIndex = 0;
- try {
- Object value = context.get(field);
-
- if (value == null) {
- // try parameters.VIEW_INDEX as that is an old OFBiz convention
- Map<String, Object> parameters = UtilGenerics.cast(context.get("parameters"));
- if (parameters != null) {
- value = parameters.get("VIEW_INDEX" + "_" + WidgetWorker.getPaginatorNumber(context));
-
- if (value == null) {
- value = parameters.get(field);
- }
- }
- }
-
- // try paginate index field without paginator number
- if (value == null) {
- field = this.getPaginateIndexField(context);
- value = context.get(field);
- }
-
- if (value instanceof Integer) {
- viewIndex = ((Integer) value).intValue();
- } else if (value instanceof String) {
- viewIndex = Integer.parseInt((String) value);
- }
- } catch (Exception e) {
- Debug.logWarning(e, "Error getting paginate view index: " + e.toString(), module);
- }
-
- return viewIndex;
- }
-
public String getPaginateIndexField() {
return paginateIndexField.getOriginal();
}
@@ -1587,43 +1550,6 @@ public class ModelForm extends ModelWidg
return DEFAULT_PAG_PREV_STYLE;
}
- public int getPaginateSize(Map<String, Object> context) {
- String field = this.getMultiPaginateSizeField(context);
-
- int viewSize = this.defaultViewSize;
- try {
- Object value = context.get(field);
-
- if (value == null) {
- // try parameters.VIEW_SIZE as that is an old OFBiz convention
- Map<String, Object> parameters = UtilGenerics.cast(context.get("parameters"));
- if (parameters != null) {
- value = parameters.get("VIEW_SIZE" + "_" + WidgetWorker.getPaginatorNumber(context));
-
- if (value == null) {
- value = parameters.get(field);
- }
- }
- }
-
- // try the page size field without paginator number
- if (value == null) {
- field = this.getPaginateSizeField(context);
- value = context.get(field);
- }
-
- if (value instanceof Integer) {
- viewSize = ((Integer) value).intValue();
- } else if (value instanceof String && UtilValidate.isNotEmpty(value)) {
- viewSize = Integer.parseInt((String) value);
- }
- } catch (Exception e) {
- Debug.logWarning(e, "Error getting paginate view size: " + e.toString(), module);
- }
-
- return viewSize;
- }
-
public String getPaginateSizeField() {
return paginateSizeField.getOriginal();
}
@@ -1874,11 +1800,67 @@ public class ModelForm extends ModelWidg
}
public int getViewIndex(Map<String, Object> context) {
- return getPaginateIndex(context);
+ String field = this.getMultiPaginateIndexField(context);
+ int viewIndex = 0;
+ try {
+ Object value = context.get(field);
+ if (value == null) {
+ // try parameters.VIEW_INDEX as that is an old OFBiz convention
+ Map<String, Object> parameters = UtilGenerics.cast(context.get("parameters"));
+ if (parameters != null) {
+ value = parameters.get("VIEW_INDEX" + "_" + WidgetWorker.getPaginatorNumber(context));
+
+ if (value == null) {
+ value = parameters.get(field);
+ }
+ }
+ }
+ // try paginate index field without paginator number
+ if (value == null) {
+ field = this.getPaginateIndexField(context);
+ value = context.get(field);
+ }
+ if (value instanceof Integer) {
+ viewIndex = ((Integer) value).intValue();
+ } else if (value instanceof String) {
+ viewIndex = Integer.parseInt((String) value);
+ }
+ } catch (Exception e) {
+ Debug.logWarning(e, "Error getting paginate view index: " + e.toString(), module);
+ }
+ return viewIndex;
}
public int getViewSize(Map<String, Object> context) {
- return getPaginateSize(context);
+ String field = this.getMultiPaginateSizeField(context);
+ int viewSize = this.defaultViewSize;
+ try {
+ Object value = context.get(field);
+ if (value == null) {
+ // try parameters.VIEW_SIZE as that is an old OFBiz convention
+ Map<String, Object> parameters = UtilGenerics.cast(context.get("parameters"));
+ if (parameters != null) {
+ value = parameters.get("VIEW_SIZE" + "_" + WidgetWorker.getPaginatorNumber(context));
+
+ if (value == null) {
+ value = parameters.get(field);
+ }
+ }
+ }
+ // try the page size field without paginator number
+ if (value == null) {
+ field = this.getPaginateSizeField(context);
+ value = context.get(field);
+ }
+ if (value instanceof Integer) {
+ viewSize = ((Integer) value).intValue();
+ } else if (value instanceof String && UtilValidate.isNotEmpty(value)) {
+ viewSize = Integer.parseInt((String) value);
+ }
+ } catch (Exception e) {
+ Debug.logWarning(e, "Error getting paginate view size: " + e.toString(), module);
+ }
+ return viewSize;
}
public boolean getGroupColumns() {