Author: bpapez
Date: Wed Jun 6 17:49:27 2007
New Revision: 17498
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17498&repname=
=3Djahia
Log:
small refactoring for fieldDefName: Use a fieldDefName variable instead of =
multiple times field.getDefinition().getName()
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/contain=
ers/JahiaContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainer.java&rev=3D1=
7498&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java Wed Jun 6 17:49:27 2007
@@ -27,7 +27,6 @@
import org.jahia.params.ProcessingContext;
import org.jahia.registries.JahiaContainerDefinitionsRegistry;
import org.jahia.registries.ServicesRegistry;
-import org.jahia.services.acl.ACLNotFoundException;
import org.jahia.services.acl.ACLResourceInterface;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.containers.ContainerFactoryProxy;
@@ -650,14 +649,14 @@
JahiaField field =3D null;
for (int i =3D 0; i < fields.size(); i++) {
field =3D (JahiaField) fields.get(i);
- int fieldPos =3D fieldOrder.indexOf(field.getDefinition().=
getName());
+ String fieldDefName =3D field.getDefinition().getName();
+ int fieldPos =3D fieldOrder.indexOf(fieldDefName);
if (fieldPos !=3D -1) {
logger.debug("JahiaContainer.fieldsStructureCheck : Fi=
eld " +
- field.getDefinition().getName() +
- " has pos : " + fieldPos);
+ fieldDefName + " has pos : " + fieldPos);
orderedFields.setElementAt(field, fieldPos);
- children.put(field.getDefinition().getName(), field);
- fieldDefs.remove(field.getDefinition().getName());
+ children.put(fieldDefName, field);
+ fieldDefs.remove(fieldDefName);
} else {
// seems that we encountered a field for which the def=
inition has benn removed from the container declaration
// so we ignore this field
@@ -693,14 +692,14 @@
locales,
true);
field =3D fFacade.getField(loadRequest,true);
- int fieldPos =3D fieldOrder.indexOf(field.getDefi=
nition().getName());
+ String fieldDefName =3D field.getDefinition().get=
Name(); =
+ int fieldPos =3D fieldOrder.indexOf(fieldDefName);
if (fieldPos !=3D -1) {
logger.debug("JahiaContainer.fieldsStructureC=
heck : Field " +
- field.getDefinition().getName() +
- " has pos : " + fieldPos);
+ fieldDefName + " has pos : " + fieldP=
os);
orderedFields.setElementAt(field, fieldPos);
- children.put(field.getDefinition().getName(),=
field);
- fieldDefs.remove(field.getDefinition().getNam=
e());
+ children.put(fieldDefName, field);
+ fieldDefs.remove(fieldDefName);
}
}
}
@@ -743,10 +742,10 @@
=
int fieldPos =3D fieldOrder.indexOf(fieldDef.getName()=
);
logger.debug("JahiaContainer.fieldsStructureCheck : Fi=
eld " +
- field.getDefinition().getName() +
+ fieldDef.getName() +
" has pos : " + fieldPos);
orderedFields.setElementAt(field, fieldPos);
- children.put(field.getDefinition().getName(), field);
+ children.put(fieldDef.getName(), field);
}
}
this.fields =3D orderedFields;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
