diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java index 17abe4de7..e855d0647 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/DateHistoryCategory.java @@ -49,41 +49,38 @@ public class DateHistoryCategory extends AbstractHistoryCategory { ArrayList<IFileRevision> pertinentRevisions = new ArrayList<>(); ArrayList<IFileRevision> nonPertinentRevisions = new ArrayList<>(); - for (int i = 0; i < fileRevisions.length; i++) { + for (IFileRevision fileRevision : fileRevisions) { //get the current file revision's date Calendar fileRevDate = Calendar.getInstance(); - fileRevDate.setTimeInMillis(fileRevisions[i].getTimestamp()); - + fileRevDate.setTimeInMillis(fileRevision.getTimestamp()); int fileRevDay = fileRevDate.get(Calendar.DAY_OF_YEAR); int fileRevYear = fileRevDate.get(Calendar.YEAR); - - if (fromDate == null){ + if (fromDate == null) { //check to see if this revision is within the toDate range if (((fileRevDay<toDate.get(Calendar.DAY_OF_YEAR)) && (fileRevYear == toDate.get(Calendar.YEAR))) || - (fileRevYear < toDate.get(Calendar.YEAR))){ - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear < toDate.get(Calendar.YEAR))) { + pertinentRevisions.add(fileRevision); } else { //revision is equal or later then the to date, add to rejects list - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } - } else if (toDate == null){ + } else if (toDate == null) { //check to see if this revision falls on the same day as the fromDate if ((fileRevDay == fromDate.get(Calendar.DAY_OF_YEAR)) && - (fileRevYear == fromDate.get(Calendar.YEAR))){ - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear == fromDate.get(Calendar.YEAR))) { + pertinentRevisions.add(fileRevision); } else { - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } } else { //check the range if ((fileRevYear >= fromDate.get(Calendar.YEAR)) && - (fileRevYear <= toDate.get(Calendar.YEAR)) && - (fileRevDay >= fromDate.get(Calendar.DAY_OF_YEAR)) && - (fileRevDay < toDate.get(Calendar.DAY_OF_YEAR)) - ) { - pertinentRevisions.add(fileRevisions[i]); + (fileRevYear <= toDate.get(Calendar.YEAR)) && + (fileRevDay >= fromDate.get(Calendar.DAY_OF_YEAR)) && + (fileRevDay < toDate.get(Calendar.DAY_OF_YEAR))) { + pertinentRevisions.add(fileRevision); } else { - nonPertinentRevisions.add(fileRevisions[i]); + nonPertinentRevisions.add(fileRevision); } } } |