Author: tdraier
Date: Mon Sep 17 20:25:53 2007
New Revision: 18524
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18524&repname=
=3Djahia
Log:
fixed issue with patches that share the same name
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Patch.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Patc=
h.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/version/Patch.java&rev=3D18524&repname=3Dja=
hia
=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/version/Patch.java=
(original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/version/Patch.java=
Mon Sep 17 20:25:53 2007
@@ -49,10 +49,7 @@
Patch other =3D (Patch)o;
int diff =3D getNumber() - other.getNumber();
if (diff =3D=3D 0) {
- diff =3D getName().compareTo(other.getName());
- }
- if (diff =3D=3D 0) {
- diff =3D 1;
+ diff =3D file.compareTo(other.getFile());
}
return diff;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
