diff options
Diffstat (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java')
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java | 215 |
1 files changed, 215 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java new file mode 100644 index 0000000000..3d3a9a9135 --- /dev/null +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java @@ -0,0 +1,215 @@ +/******************************************************************************* + * Copyright (C) 2011, Jens Baumgart <jens.baumgart@sap.com> + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + *******************************************************************************/ +package org.eclipse.egit.core.internal.indexdiff; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jgit.lib.IndexDiff; + +/** + * This immutable class is used to store the data of an {@link IndexDiff} + * object. + * + */ +public class IndexDiffData { + + private static final String NEW_LINE = "\n"; //$NON-NLS-1$ + + private final Set<String> added; + + private final Set<String> changed; + + private final Set<String> removed; + + private final Set<String> missing; + + private final Set<String> modified; + + private final Set<String> untracked; + + private final Set<String> conflicts; + + private final Collection<IFile> changedFileResources; + + /** + * @param indexDiff + */ + public IndexDiffData(IndexDiff indexDiff) { + added = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getAdded())); + changed = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getChanged())); + removed = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getRemoved())); + missing = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getMissing())); + modified = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getModified())); + untracked = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getUntracked())); + conflicts = Collections.unmodifiableSet(new HashSet<String>(indexDiff + .getConflicting())); + changedFileResources = null; + } + + /** + * This constructor merges the existing IndexDiffData object baseDiff with a + * new IndexDiffData object that was calculated for a subset of files + * (changedFiles). + * + * @param baseDiff + * @param changedFiles + * @param changedFileResources + * @param diffForChangedFiles + */ + public IndexDiffData(IndexDiffData baseDiff, + Collection<String> changedFiles, + Collection<IFile> changedFileResources, + IndexDiff diffForChangedFiles) { + this.changedFileResources = Collections + .unmodifiableCollection(new HashSet<IFile>(changedFileResources)); + Set<String> added2 = new HashSet<String>(baseDiff.getAdded()); + Set<String> changed2 = new HashSet<String>(baseDiff.getChanged()); + Set<String> removed2 = new HashSet<String>(baseDiff.getRemoved()); + Set<String> missing2 = new HashSet<String>(baseDiff.getMissing()); + Set<String> modified2 = new HashSet<String>(baseDiff.getModified()); + Set<String> untracked2 = new HashSet<String>(baseDiff.getUntracked()); + Set<String> conflicts2 = new HashSet<String>(baseDiff.getConflicting()); + + mergeList(added2, changedFiles, diffForChangedFiles.getAdded()); + mergeList(changed2, changedFiles, diffForChangedFiles.getChanged()); + mergeList(removed2, changedFiles, diffForChangedFiles.getRemoved()); + mergeList(missing2, changedFiles, diffForChangedFiles.getMissing()); + mergeList(modified2, changedFiles, diffForChangedFiles.getModified()); + mergeList(untracked2, changedFiles, diffForChangedFiles.getUntracked()); + mergeList(conflicts2, changedFiles, + diffForChangedFiles.getConflicting()); + + added = Collections.unmodifiableSet(added2); + changed = Collections.unmodifiableSet(changed2); + removed = Collections.unmodifiableSet(removed2); + missing = Collections.unmodifiableSet(missing2); + modified = Collections.unmodifiableSet(modified2); + untracked = Collections.unmodifiableSet(untracked2); + conflicts = Collections.unmodifiableSet(conflicts2); + } + + private void mergeList(Set<String> baseList, + Collection<String> changedFiles, Set<String> listForChangedFiles) { + for (String file : changedFiles) { + if (baseList.contains(file)) { + if (!listForChangedFiles.contains(file)) + baseList.remove(file); + } else { + if (listForChangedFiles.contains(file)) + baseList.add(file); + } + } + } + + /** + * @return list of files added to the index, not in the tree + */ + public Set<String> getAdded() { + return Collections.unmodifiableSet(added); + } + + /** + * @return list of files changed from tree to index + */ + public Set<String> getChanged() { + return changed; + } + + /** + * @return list of files removed from index, but in tree + */ + public Set<String> getRemoved() { + return removed; + } + + /** + * @return list of files in index, but not filesystem + */ + public Set<String> getMissing() { + return missing; + } + + /** + * @return list of files modified on disk relative to the index + */ + public Set<String> getModified() { + return modified; + } + + /** + * @return list of files that are not ignored, and not in the index. + */ + public Set<String> getUntracked() { + return untracked; + } + + /** + * @return list of files that are in conflict + */ + public Set<String> getConflicting() { + return conflicts; + } + + /** + * @return the changed files + */ + public Collection<IFile> getChangedFileResources() { + return changedFileResources; + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + dumpList(builder, "added", added); //$NON-NLS-1$ + dumpList(builder, "changed", changed); //$NON-NLS-1$ + dumpList(builder, "removed", removed); //$NON-NLS-1$ + dumpList(builder, "missing", missing); //$NON-NLS-1$ + dumpList(builder, "modified", modified); //$NON-NLS-1$ + dumpList(builder, "untracked", untracked); //$NON-NLS-1$ + dumpList(builder, "conflicts", conflicts); //$NON-NLS-1$ + dumpFileResourceList(builder, + "changedFileResources", changedFileResources); //$NON-NLS-1$ + return builder.toString(); + } + + private void dumpList(StringBuilder builder, String listName, + Set<String> list) { + builder.append(listName); + builder.append(NEW_LINE); + for (String entry : list) { + builder.append(entry); + builder.append(NEW_LINE); + } + builder.append(NEW_LINE); + } + + private void dumpFileResourceList(StringBuilder builder, String listName, + Collection<IFile> list) { + if (list == null) + return; + builder.append(listName); + builder.append(NEW_LINE); + for (IFile file : list) { + builder.append(file.getFullPath().toOSString()); + builder.append(NEW_LINE); + } + builder.append(NEW_LINE); + } + +} |