svn commit: r912240 - in /ofbiz/trunk/framework/webtools/webapp/webtools: WEB-INF/actions/entity/FindGeneric.groovy WEB-INF/actions/entity/ViewGeneric.groovy entity/EditEntity.jsp entity/ModelInduceFromDb.jsp entity/ModelWriter.jsp

[lektran]

Author: lektran
Date: Sat Feb 20 22:52:53 2010
New Revision: 912240

URL: http://svn.apache.org/viewvc?rev=912240&view=rev
Log:
Removed all uses of deprecated method ModelEntity.getPk(int)

Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
    ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelWriter.jsp

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=912240&r1=912239&r2=912240&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Sat Feb 20 22:52:53 2010
@@ -230,8 +230,9 @@
 
         GenericValue value = (GenericValue)resultPartialIter.next();
         String findString = "entityName=" + entityName;
-        for (int pknum = 0; pknum < modelEntity.getPksSize(); pknum++) {
-            ModelField pkField = modelEntity.getPk(pknum);
+        Iterator pkIterator = modelEntity.getPksIterator();
+        while (pkIterator.hasNext()) {
+            ModelField pkField = pkIterator.next();
             ModelFieldType type = delegator.getEntityFieldType(modelEntity, pkField.getType());
             findString += "&" + pkField.getName() + "=" + value.get(pkField.getName());
         }

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy?rev=912240&r1=912239&r2=912240&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/ViewGeneric.groovy Sat Feb 20 22:52:53 2010
@@ -65,8 +65,9 @@
 boolean useValue = true;
 String curFindString = "entityName=" + entityName;
 GenericPK findByPK = delegator.makePK(entityName);
-for(int fnum = 0; fnum < entity.getPksSize(); fnum++) {
-    ModelField field = entity.getPk(fnum);
+Iterator pkIterator = entity.getPksIterator();
+while (pkIterator.hasNext()) {
+    ModelField field = pkIterator.next();
     ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
     String fval = parameters.get(field.getName());
     if (UtilValidate.isNotEmpty(fval)) {
@@ -143,10 +144,11 @@
 context.put("useValue", useValue);
 
 List newFieldPkList = FastList.newInstance();
-for (int fnum = 0; fnum < entity.getPksSize();fnum++) {
+Iterator pkIterator = entity.getPksIterator();
+while (pkIterator.hasNext()) {
     Map mapField = FastMap.newInstance();
 
-    ModelField field = entity.getPk(fnum);
+    ModelField field = pkIterator.next();
     ModelFieldType type = delegator.getEntityFieldType(entity, field.getType());
 
     String fieldValue = "";

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp?rev=912240&r1=912239&r2=912240&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EditEntity.jsp Sat Feb 20 22:52:53 2010
@@ -104,8 +104,9 @@
       relation.setMainEntity(entity);
       entity.addRelation(relation);
       if ("one".equals(type) || "one-nofk".equals(type)) {
-        for (int pk = 0; pk < relEntity.getPksSize(); pk++) {
-          ModelField pkf = relEntity.getPk(pk);
+        Iterator<ModelField> pkIterator = relEntity.getPksIterator();
+        while (pkIterator.hasNext()) {
+          ModelField pkf = pkIterator.next();
           ModelKeyMap keyMap = new ModelKeyMap();
           keyMap.setFieldName(pkf.getName());
           keyMap.setRelFieldName(pkf.getName());

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp?rev=912240&r1=912239&r2=912240&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelInduceFromDb.jsp Sat Feb 20 22:52:53 2010
@@ -122,8 +122,9 @@
       %><validate name="<%=valName%>"/><%
     }%></field><%
   }
-  for (int y = 0; y < entity.getPksSize(); y++) {
-    ModelField field = entity.getPk(y);%>
+  Iterator<ModelField> pkIterator = entity.getPksIterator();
+  while (pkIterator.hasNext()) {
+    ModelField field = pkIterator.next();%>
       <prim-key field="<%=field.getName()%>"/><%
   }
   if (entity.getRelationsSize() > 0) {

Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelWriter.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelWriter.jsp?rev=912240&r1=912239&r2=912240&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelWriter.jsp (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/ModelWriter.jsp Sat Feb 20 22:52:53 2010
@@ -217,8 +217,9 @@
       %><validate name="<%=valName%>"/><%
     }%></field><%
     }}
-  for (int y = 0; y < entity.getPksSize(); y++) {
-    ModelField field = entity.getPk(y);%>
+  Iterator<ModelField> pkIterator = entity.getPksIterator();
+  while (pkIterator.hasNext()) {
+    ModelField field = pkIterator.next();%>
       <prim-key field="<%=field.getName()%>"/><%
   }
   if (entity.getRelationsSize() > 0) {