Skip to content

Commit

Permalink
Amazingly complex refactoring, tabs -> spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieu-pousse committed Dec 11, 2014
1 parent d94bb52 commit cecb6f3
Show file tree
Hide file tree
Showing 10 changed files with 380 additions and 380 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,69 +12,69 @@
*/
public class Artifact implements Serializable {

private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;

private final String groupId;
private final String artifactId;
private final String classifier;
private final String version;
private final String extension;
private final String targetFileName;
private final String groupId;
private final String artifactId;
private final String classifier;
private final String version;
private final String extension;
private final String targetFileName;

@DataBoundConstructor
public Artifact(String groupId, String artifactId, String classifier, String version, String extension, String targetFileName) {
this.groupId = groupId;
this.artifactId = artifactId;
this.classifier = classifier == null ? "" : classifier;
this.extension = extension == null ? "jar" : extension;
this.version = version;
this.targetFileName = targetFileName;
}
@DataBoundConstructor
public Artifact(String groupId, String artifactId, String classifier, String version, String extension, String targetFileName) {
this.groupId = groupId;
this.artifactId = artifactId;
this.classifier = classifier == null ? "" : classifier;
this.extension = extension == null ? "jar" : extension;
this.version = version;
this.targetFileName = targetFileName;
}

/**
* @return the groupId
*/
public String getGroupId() {
return groupId;
}
/**
* @return the groupId
*/
public String getGroupId() {
return groupId;
}

/**
* @return the artifactId
*/
public String getArtifactId() {
return artifactId;
}
/**
* @return the artifactId
*/
public String getArtifactId() {
return artifactId;
}

/**
* @return the version
*/
public String getVersion() {
return version;
}
/**
* @return the version
*/
public String getVersion() {
return version;
}

/**
* @return the extension
*/
public String getExtension() {
return extension;
}
/**
* @return the extension
*/
public String getExtension() {
return extension;
}

/**
* @return the classifier
*/
public String getClassifier() {
return classifier;
}
/**
* @return the classifier
*/
public String getClassifier() {
return classifier;
}

/**
* @return the targetFileName
*/
public String getTargetFileName() {
return targetFileName;
}
/**
* @return the targetFileName
*/
public String getTargetFileName() {
return targetFileName;
}

@Override
public String toString() {
return "[Artifact " + groupId + ":" + artifactId + ":" + extension + ":" + classifier + ":" + version + "]";
}
@Override
public String toString() {
return "[Artifact " + groupId + ":" + artifactId + ":" + extension + ":" + classifier + ":" + version + "]";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private boolean download(AbstractBuild<?, ?> build, BuildListener listener, fina
String fileName = StringUtils.isBlank(targetFileName) ? file.getName() : targetFileName;
FilePath source = new FilePath(file);
String targetDir = StringUtils.isNotBlank(getTargetDirectory()) ? getTargetDirectory() + "/" : "";
FilePath target = new FilePath(build.getWorkspace(), targetDir + fileName);
FilePath target = new FilePath(build.getWorkspace(), targetDir + fileName);
boolean wasDeleted = target.delete();
if (wasDeleted) {
logger.println("deleted " + target.toURI());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,119 +15,119 @@
*/
public class Repository implements Serializable, Comparable {

private static final long serialVersionUID = 1L;

final private String url;
final private String type;
final private String id;
final private String user;
final private String password;
final private boolean isRepositoryManager;

@DataBoundConstructor
public Repository(String id, String type, String url, String user, String password, boolean repositoryManager) {
this.id = id == null ? "central" : id;
this.type = type == null ? "default" : type;
this.url = url;
this.user = user;
this.password = password;
this.isRepositoryManager = repositoryManager;
}

/**
* @return the url
*/
public String getUrl() {
return url;
}

/**
* @return the type
*/
public String getType() {
return type;
}

/**
* @return the id
*/
public String getId() {
return id;
}

@Override
public String toString() {
return "[Repository id=" + id + ", type=" + type + ", url=" + url + ", isRepositoryManager=" + isRepositoryManager + "]";
}

/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}

/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (!(obj instanceof Repository)) {
return false;
}
Repository other = (Repository) obj;
if (id == null) {
if (other.id != null) {
return false;
}
} else if (!id.equals(other.id)) {
return false;
}
if (type == null) {
if (other.type != null) {
return false;
}
} else if (!type.equals(other.type)) {
return false;
}
return true;
}

/**
* @return the user
*/
public String getUser() {
return user;
}

/**
* @return the password
*/
public String getPassword() {
return password;
}

/**
* @return the isRepositoryManager
*/
public boolean isRepositoryManager() {
return isRepositoryManager;
}
private static final long serialVersionUID = 1L;

final private String url;
final private String type;
final private String id;
final private String user;
final private String password;
final private boolean isRepositoryManager;

@DataBoundConstructor
public Repository(String id, String type, String url, String user, String password, boolean repositoryManager) {
this.id = id == null ? "central" : id;
this.type = type == null ? "default" : type;
this.url = url;
this.user = user;
this.password = password;
this.isRepositoryManager = repositoryManager;
}

/**
* @return the url
*/
public String getUrl() {
return url;
}

/**
* @return the type
*/
public String getType() {
return type;
}

/**
* @return the id
*/
public String getId() {
return id;
}

@Override
public String toString() {
return "[Repository id=" + id + ", type=" + type + ", url=" + url + ", isRepositoryManager=" + isRepositoryManager + "]";
}

/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}

/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (!(obj instanceof Repository)) {
return false;
}
Repository other = (Repository) obj;
if (id == null) {
if (other.id != null) {
return false;
}
} else if (!id.equals(other.id)) {
return false;
}
if (type == null) {
if (other.type != null) {
return false;
}
} else if (!type.equals(other.type)) {
return false;
}
return true;
}

/**
* @return the user
*/
public String getUser() {
return user;
}

/**
* @return the password
*/
public String getPassword() {
return password;
}

/**
* @return the isRepositoryManager
*/
public boolean isRepositoryManager() {
return isRepositoryManager;
}

public int compareTo(Object o) {
return id.compareTo(((Repository)o).getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
import org.kohsuke.stapler.DataBoundConstructor;

public class UserPwd {
public final String user;
public final String password;
public final String user;
public final String password;

@DataBoundConstructor
public UserPwd(String user, String password) {
this.user = user;
this.password = password;
}
@DataBoundConstructor
public UserPwd(String user, String password) {
this.user = user;
this.password = password;
}

@Override
public String toString() {
return "[UserPwd: " + user + "]";
}
@Override
public String toString() {
return "[UserPwd: " + user + "]";
}
}
Loading

0 comments on commit cecb6f3

Please sign in to comment.