You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2007/08/18 22:08:48 UTC
svn commit: r567324 -
/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
Author: jmsnell
Date: Sat Aug 18 13:08:44 2007
New Revision: 567324
URL: http://svn.apache.org/viewvc?view=rev&rev=567324
Log:
method to determine if the entry has conflicts
Modified:
incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
Modified: incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java?view=diff&rev=567324&r1=567323&r2=567324
==============================================================================
--- incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java (original)
+++ incubator/abdera/java/trunk/extensions/src/main/java/org/apache/abdera/ext/sharing/SharingHelper.java Sat Aug 18 13:08:44 2007
@@ -287,9 +287,7 @@
break;
}
}
- if (ok) {
- sync.addHistory(h1);
- }
+ if (ok) sync.addHistory(h1);
}
}
}
@@ -369,5 +367,18 @@
if (updated.before(d)) d = updated;
}
return d;
+ }
+
+ public boolean hasConflicts(Entry entry) {
+ Sync sync = getSync(entry);
+ if (sync != null) {
+ Conflicts conflicts = sync.getConflicts();
+ if (conflicts != null) {
+ if (conflicts.getEntries().size() > 0) {
+ return true;
+ }
+ }
+ }
+ return false;
}
}