Cleanup code and Eclipse compile errors in new gitrepo API
Commit d3348e introduced few errors in Eclipse. This commit cleans up the new API: - fixes API error in RepoCommand after moving IncludedFileReader type - fixes unused imports in RepoCommand & RepoCommandTest - fix javadoc errors in ManifestParser & RepoProject - makes three (implicitly final) fields in ManifestParser final. Change-Id: I4185f451d97039d155391f62815bb9d3afe39fa6 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
This commit is contained in:
parent
a990cce776
commit
1773002a34
|
@ -49,8 +49,6 @@
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.eclipse.jgit.api.Git;
|
import org.eclipse.jgit.api.Git;
|
||||||
import org.eclipse.jgit.junit.JGitTestUtil;
|
import org.eclipse.jgit.junit.JGitTestUtil;
|
||||||
|
|
|
@ -83,11 +83,12 @@ public class ManifestParser extends DefaultHandler {
|
||||||
private final Map<String, String> remotes;
|
private final Map<String, String> remotes;
|
||||||
private final Set<String> plusGroups;
|
private final Set<String> plusGroups;
|
||||||
private final Set<String> minusGroups;
|
private final Set<String> minusGroups;
|
||||||
private List<RepoProject> projects;
|
private final List<RepoProject> projects;
|
||||||
private List<RepoProject> filteredProjects;
|
private final List<RepoProject> filteredProjects;
|
||||||
|
private final IncludedFileReader includedReader;
|
||||||
|
|
||||||
private String defaultRemote;
|
private String defaultRemote;
|
||||||
private String defaultRevision;
|
private String defaultRevision;
|
||||||
private IncludedFileReader includedReader;
|
|
||||||
private int xmlInRead;
|
private int xmlInRead;
|
||||||
private RepoProject currentProject;
|
private RepoProject currentProject;
|
||||||
|
|
||||||
|
@ -154,6 +155,7 @@ public ManifestParser(IncludedFileReader includedReader, String filename,
|
||||||
* Read the xml file.
|
* Read the xml file.
|
||||||
*
|
*
|
||||||
* @param inputStream
|
* @param inputStream
|
||||||
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
public void read(InputStream inputStream) throws IOException {
|
public void read(InputStream inputStream) throws IOException {
|
||||||
xmlInRead++;
|
xmlInRead++;
|
||||||
|
@ -295,6 +297,8 @@ public void endDocument() throws SAXException {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Getter for projects.
|
* Getter for projects.
|
||||||
|
*
|
||||||
|
* @return projects list reference, never null
|
||||||
*/
|
*/
|
||||||
public List<RepoProject> getProjects() {
|
public List<RepoProject> getProjects() {
|
||||||
return projects;
|
return projects;
|
||||||
|
@ -302,6 +306,8 @@ public List<RepoProject> getProjects() {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Getter for filterdProjects.
|
* Getter for filterdProjects.
|
||||||
|
*
|
||||||
|
* @return filtered projects list reference, never null
|
||||||
*/
|
*/
|
||||||
public List<RepoProject> getFilteredProjects() {
|
public List<RepoProject> getFilteredProjects() {
|
||||||
return filteredProjects;
|
return filteredProjects;
|
||||||
|
|
|
@ -46,7 +46,6 @@
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.net.URI;
|
|
||||||
import java.text.MessageFormat;
|
import java.text.MessageFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -340,7 +339,7 @@ public RepoCommand setRemoteReader(final RemoteReader callback) {
|
||||||
*
|
*
|
||||||
* @param reader
|
* @param reader
|
||||||
* @return this command
|
* @return this command
|
||||||
* @since 3.5
|
* @since 4.0
|
||||||
*/
|
*/
|
||||||
public RepoCommand setIncludedFileReader(IncludedFileReader reader) {
|
public RepoCommand setIncludedFileReader(IncludedFileReader reader) {
|
||||||
this.includedReader = reader;
|
this.includedReader = reader;
|
||||||
|
|
|
@ -96,6 +96,8 @@ public CopyFile(Repository repo, String path, String src, String dest) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Do the copy file action.
|
* Do the copy file action.
|
||||||
|
*
|
||||||
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
public void copy() throws IOException {
|
public void copy() throws IOException {
|
||||||
File srcFile = new File(repo.getWorkTree(),
|
File srcFile = new File(repo.getWorkTree(),
|
||||||
|
@ -186,7 +188,11 @@ String getPathWithSlash() {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if this sub repo is the ancestor of another sub repo.
|
* Check if this sub repo is the ancestor of given sub repo.
|
||||||
|
*
|
||||||
|
* @param that
|
||||||
|
* non null
|
||||||
|
* @return true if this sub repo is the ancestor of given sub repo.
|
||||||
*/
|
*/
|
||||||
public boolean isAncestorOf(RepoProject that) {
|
public boolean isAncestorOf(RepoProject that) {
|
||||||
return that.getPathWithSlash().startsWith(this.getPathWithSlash());
|
return that.getPathWithSlash().startsWith(this.getPathWithSlash());
|
||||||
|
|
Loading…
Reference in New Issue