Skip to content

Commit

Permalink
minor bugfix for resume option
Browse files Browse the repository at this point in the history
  • Loading branch information
PoslavskySV committed Aug 30, 2018
1 parent e5680a1 commit c4dc64e
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/main/java/com/milaboratory/mixcr/cli/ActionAssemble.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,14 @@ public AssembleParameters params() {

public static class AssembleConfiguration implements ActionConfiguration {
public final CloneAssemblerParameters assemblerParameters;
public final boolean clna;

@JsonCreator
public AssembleConfiguration(@JsonProperty("assemblerParameters") CloneAssemblerParameters assemblerParameters) {
public AssembleConfiguration(
@JsonProperty("assemblerParameters") CloneAssemblerParameters assemblerParameters,
@JsonProperty("clna") boolean clna) {
this.assemblerParameters = assemblerParameters;
this.clna = clna;
}

@Override
Expand All @@ -187,12 +191,14 @@ public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AssembleConfiguration that = (AssembleConfiguration) o;
return Objects.equals(assemblerParameters, that.assemblerParameters);
return clna == that.clna &&
Objects.equals(assemblerParameters, that.assemblerParameters);
}

@Override
public int hashCode() {
return Objects.hash(assemblerParameters);

return Objects.hash(assemblerParameters, clna);
}
}

Expand Down Expand Up @@ -266,7 +272,7 @@ public List<String> getInputFiles() {

@Override
public ActionConfiguration getConfiguration() {
return new AssembleConfiguration(getCloneAssemblerParameters());
return new AssembleConfiguration(getCloneAssemblerParameters(), clna);
}


Expand Down

0 comments on commit c4dc64e

Please sign in to comment.