Author: rfelden
Date: Fri Jul 27 10:26:31 2007
New Revision: 10
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D10&repname=3D=
fix_apply
Log:
xml merger update (not functionnal yet)
Modified:
trunk/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java
Modified: trunk/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/utils/src/main/=
java/org/jahia/utils/merge/XMLMerger.java&rev=3D10&repname=3Dfix_apply
=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
--- trunk/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java (origina=
l)
+++ trunk/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java Fri Jul =
27 10:26:31 2007
@@ -180,15 +180,15 @@
=
// check att names
boolean result =3D true ;
- for (int i =3D 0; i < oneAttList.size() && result; i++) {
+ for (int i =3D 0; i < oneAttList.size(); i++) {
Attribute oneAtt =3D (Attribute)oneAttList.get(i) ;
- result =3D two.getAttribute(oneAtt.getName()) !=3D null;
+ result &=3D two.getAttribute(oneAtt.getName()) !=3D null;
}
=
// check att values
- for (int i =3D 0; i < oneAttList.size() && result; i++) {
+ for (int i =3D 0; i < oneAttList.size(); i++) {
Attribute oneAtt =3D (Attribute)oneAttList.get(i) ;
- result =3D two.getAttributeValue(oneAtt.getName()).equals(oneA=
tt.getValue());
+ result &=3D two.getAttributeValue(oneAtt.getName()).equals(one=
Att.getValue());
}
=
// they do have the same structure
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
