Add ability to switch between files in Git Diff widget #5965
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2012-2017 Red Hat, Inc. | ||
| * 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 | ||
| * | ||
| * Contributors: | ||
| * Red Hat, Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.che.ide.ext.git.client.compare; | ||
|
|
||
| import org.eclipse.che.ide.api.resources.Project; | ||
| import org.eclipse.che.ide.ext.git.client.compare.FileStatus.Status; | ||
| import org.eclipse.che.ide.util.loging.Log; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import static com.google.common.base.Strings.isNullOrEmpty; | ||
| import static org.eclipse.che.ide.ext.git.client.compare.FileStatus.defineStatus; | ||
|
|
||
| /** | ||
| * Describes changed in any way files in git comparison process. | ||
| * | ||
| * @author Mykola Morhun | ||
| */ | ||
| public class AlteredFiles { | ||
|
There was a problem hiding this comment. I would like to see some tests. There was a problem hiding this comment. Well, I think the current name is better because this class also parses raw diff. |
||
|
|
||
| private final Project project; | ||
| private final LinkedHashMap<String, Status> alteredFilesStatuses; | ||
| private final List<String> alteredFilesList; | ||
|
|
||
| /** | ||
| * Parses raw git diff string and creates advanced representation. | ||
| * | ||
| * @param project | ||
| * the project under diff operation | ||
| * @param diff | ||
| * plain result of git diff operation | ||
| */ | ||
| public AlteredFiles(Project project, String diff) { | ||
| this.project = project; | ||
|
|
||
| alteredFilesStatuses = new LinkedHashMap<>(); | ||
| if (!isNullOrEmpty(diff)) { | ||
| for (String item : diff.split("\n")) { | ||
| if (item.length() < 3 || item.charAt(1) != '\t') { | ||
| throw new IllegalArgumentException("Invalid git diff format. Invalid record: " + item); | ||
| } | ||
| alteredFilesStatuses.put(item.substring(2, item.length()), defineStatus(item.substring(0, 1))); | ||
|
There was a problem hiding this comment. Validate the length of the item. There was a problem hiding this comment. Ok, but usually we obtain raw diff from git, so it should be valid. |
||
| } | ||
| } | ||
|
|
||
| alteredFilesList = new ArrayList<>(alteredFilesStatuses.keySet()); | ||
| } | ||
|
|
||
| /** | ||
| * Returns project in which git repository is located. | ||
| */ | ||
| public Project getProject() { | ||
|
|
||
| return project; | ||
| } | ||
|
|
||
| /** | ||
| * Returns number of files in the diff. | ||
| */ | ||
| public int getFilesQuantity() { | ||
| return alteredFilesList.size(); | ||
| } | ||
|
|
||
| public boolean isEmpty() { | ||
|
There was a problem hiding this comment. Do we need javadoc for obviously methods? There was a problem hiding this comment. Why not? if you added a javadoc for one method why don't you add it for others |
||
| return 0 == alteredFilesList.size(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns this diff in map representation: altered file to its git status. | ||
| */ | ||
| public Map<String, Status> getChangedFilesMap() { | ||
|
|
||
| return alteredFilesStatuses; | ||
| } | ||
|
|
||
| /** | ||
| * Returns list of altered files in this git diff. | ||
| */ | ||
| public List<String> getAlteredFilesList() { | ||
| return alteredFilesList; | ||
| } | ||
|
|
||
| public Status getStatusByFilePath(String relativePathToChangedFile) { | ||
| return alteredFilesStatuses.get(relativePathToChangedFile); | ||
| } | ||
|
|
||
| public Status getStatusByIndex(int index) { | ||
|
There was a problem hiding this comment. I think that it is already clear form the method name. |
||
| return alteredFilesStatuses.get(alteredFilesList.get(index)); | ||
| } | ||
|
|
||
| public String getFileByIndex(int index) { | ||
| return alteredFilesList.get(index); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| AlteredFiles that = (AlteredFiles)o; | ||
| return Objects.equals(project, that.project) && | ||
| Objects.equals(alteredFilesStatuses, that.alteredFilesStatuses) && | ||
| Objects.equals(alteredFilesList, that.alteredFilesList); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(project, alteredFilesStatuses, alteredFilesList); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please explain why we're changing a set for a list? We need to store same files several times?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, we needn't, but git returns modified files in some order, so I just do not want to loose it. Also it is needed to navigate through this list.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
May be
private AlteredFiles alteredFiles;?