Author: rfelden
Date: Fri Jul 27 10:26:44 2007
New Revision: 11
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D11&repname=3D=
fix_apply
Log:
xml merger update (not functionnal yet)
Modified:
branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java
Modified: branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerge=
r.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/jahia/utils/=
src/main/java/org/jahia/utils/merge/XMLMerger.java&rev=3D11&repname=3Dfix_a=
pply
=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/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java=
(original)
+++ branches/jahia/utils/src/main/java/org/jahia/utils/merge/XMLMerger.java=
Fri Jul 27 10:26:44 2007
@@ -18,6 +18,14 @@
*/
public class XMLMerger {
=
+ /**
+ *
+ * @param controller
+ * @param update this is the update file, into which the target form w=
ill be written before overwriting the existing
+ * @param old
+ * @param existing
+ * @return
+ */
public static boolean merge(MergeItf controller, final File update, fi=
nal File old, final File existing) {
=
// check the files first
@@ -186,15 +194,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
