-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#20: Refactor code to re-use same operation diff
- Loading branch information
Showing
13 changed files
with
430 additions
and
31 deletions.
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 was deleted.
Oops, something went wrong.
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
112 changes: 112 additions & 0 deletions
112
src/io/jsrminer/refactorings/AddParameterRefactoring.java
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,112 @@ | ||
| package io.jsrminer.refactorings; | ||
|
|
||
| import io.jsrminer.sourcetree.FunctionDeclaration; | ||
| import io.jsrminer.uml.UMLParameter; | ||
|
|
||
| public class AddParameterRefactoring extends Refactoring { | ||
| private UMLParameter parameter; | ||
| private FunctionDeclaration operationBefore; | ||
| private FunctionDeclaration operationAfter; | ||
|
|
||
| public AddParameterRefactoring(UMLParameter parameter, FunctionDeclaration operationBefore, FunctionDeclaration operationAfter) { | ||
| super(RefactoringType.ADD_PARAMETER); | ||
| this.parameter = parameter; | ||
| this.operationBefore = operationBefore; | ||
| this.operationAfter = operationAfter; | ||
| } | ||
|
|
||
| public UMLParameter getParameter() { | ||
| return parameter; | ||
| } | ||
|
|
||
| public FunctionDeclaration getOperationBefore() { | ||
| return operationBefore; | ||
| } | ||
|
|
||
| public FunctionDeclaration getOperationAfter() { | ||
| return operationAfter; | ||
| } | ||
|
|
||
| // @Override | ||
| // public List<CodeRange> leftSide() { | ||
| // List<CodeRange> ranges = new ArrayList<CodeRange>(); | ||
| // ranges.add(operationBefore.codeRange() | ||
| // .setDescription("original method declaration") | ||
| // .setCodeElement(operationBefore.toString())); | ||
| // return ranges; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public List<CodeRange> rightSide() { | ||
| // List<CodeRange> ranges = new ArrayList<CodeRange>(); | ||
| // ranges.add(parameter.getVariableDeclaration().codeRange() | ||
| // .setDescription("added parameter") | ||
| // .setCodeElement(parameter.getVariableDeclaration().toString())); | ||
| // ranges.add(operationAfter.codeRange() | ||
| // .setDescription("method declaration with added parameter") | ||
| // .setCodeElement(operationAfter.toString())); | ||
| // return ranges; | ||
| // } | ||
|
|
||
| // @Override | ||
| // public Set<ImmutablePair<String, String>> getInvolvedClassesBeforeRefactoring() { | ||
| // Set<ImmutablePair<String, String>> pairs = new LinkedHashSet<ImmutablePair<String, String>>(); | ||
| // pairs.add(new ImmutablePair<String, String>(getOperationBefore().getLocationInfo().getFilePath(), getOperationBefore().getClassName())); | ||
| // return pairs; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public Set<ImmutablePair<String, String>> getInvolvedClassesAfterRefactoring() { | ||
| // Set<ImmutablePair<String, String>> pairs = new LinkedHashSet<ImmutablePair<String, String>>(); | ||
| // pairs.add(new ImmutablePair<String, String>(getOperationAfter().getLocationInfo().getFilePath(), getOperationAfter().getClassName())); | ||
| // return pairs; | ||
| // } | ||
|
|
||
| // public String toString() { | ||
| // StringBuilder sb = new StringBuilder(); | ||
| // sb.append(getName()).append("\t"); | ||
| // sb.append(parameter.getVariableDeclaration()); | ||
| // sb.append(" in method "); | ||
| // sb.append(operationAfter); | ||
| // sb.append(" from class "); | ||
| // sb.append(operationAfter.getClassName()); | ||
| // return sb.toString(); | ||
| // } | ||
| // | ||
| // @Override | ||
| // public int hashCode() { | ||
| // final int prime = 31; | ||
| // int result = 1; | ||
| // result = prime * result + ((parameter.getVariableDeclaration() == null) ? 0 : parameter.getVariableDeclaration().hashCode()); | ||
| // result = prime * result + ((operationAfter == null) ? 0 : operationAfter.hashCode()); | ||
| // result = prime * result + ((operationBefore == null) ? 0 : operationBefore.hashCode()); | ||
| // return result; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public boolean equals(Object obj) { | ||
| // if (this == obj) | ||
| // return true; | ||
| // if (obj == null) | ||
| // return false; | ||
| // if (getClass() != obj.getClass()) | ||
| // return false; | ||
| // AddParameterRefactoring other = (AddParameterRefactoring) obj; | ||
| // if (parameter == null) { | ||
| // if (other.parameter != null) | ||
| // return false; | ||
| // } else if (!parameter.getVariableDeclaration().equals(other.parameter.getVariableDeclaration())) | ||
| // return false; | ||
| // if (operationAfter == null) { | ||
| // if (other.operationAfter != null) | ||
| // return false; | ||
| // } else if (!operationAfter.equals(other.operationAfter)) | ||
| // return false; | ||
| // if (operationBefore == null) { | ||
| // if (other.operationBefore != null) | ||
| // return false; | ||
| // } else if (!operationBefore.equals(other.operationBefore)) | ||
| // return false; | ||
| // return true; | ||
| // } | ||
| } |
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,7 @@ | ||
| package io.jsrminer.refactorings; | ||
|
|
||
| public interface IRefactoring { | ||
| public String getName(); | ||
|
|
||
| public RefactoringType getRefactoringType(); | ||
| } |
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,27 @@ | ||
| package io.jsrminer.refactorings; | ||
|
|
||
| import org.eclipse.jgit.annotations.NonNull; | ||
|
|
||
| public class Refactoring implements IRefactoring { | ||
|
|
||
| protected RefactoringType refactoringType; | ||
|
|
||
| public Refactoring(@NonNull RefactoringType refactoringType) { | ||
| this.refactoringType = refactoringType; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return this.refactoringType.getTitle(); | ||
| } | ||
|
|
||
| @Override | ||
| public RefactoringType getRefactoringType() { | ||
| return refactoringType; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return refactoringType.toString(); | ||
| } | ||
| } |
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,24 @@ | ||
| package io.jsrminer.refactorings; | ||
|
|
||
| public enum RefactoringType { | ||
|
|
||
| ADD_PARAMETER("Add Parameter", "Add Parameter (.+) in method (.+) from class (.+)"), | ||
| REMOVE_PARAMETER("Remove Parameter", "Remove Parameter (.+) in method (.+) from class (.+)"); | ||
|
|
||
| private String title; | ||
| private String description; | ||
|
|
||
| RefactoringType(String title, String description) { | ||
| this.title = title; | ||
| this.description = description; | ||
| } | ||
|
|
||
| public String getTitle() { | ||
| return this.title; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return title + " " + description; | ||
| } | ||
| } |
114 changes: 114 additions & 0 deletions
114
src/io/jsrminer/refactorings/RemoveParameterRefactoring.java
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,114 @@ | ||
| package io.jsrminer.refactorings; | ||
|
|
||
| import io.jsrminer.sourcetree.FunctionDeclaration; | ||
| import io.jsrminer.uml.UMLParameter; | ||
|
|
||
| public class RemoveParameterRefactoring extends Refactoring { | ||
| private UMLParameter parameter; | ||
| private FunctionDeclaration operationBefore; | ||
| private FunctionDeclaration operationAfter; | ||
|
|
||
| public RemoveParameterRefactoring(UMLParameter parameter, FunctionDeclaration operationBefore, | ||
| FunctionDeclaration operationAfter) { | ||
| super(RefactoringType.REMOVE_PARAMETER); | ||
| this.parameter = parameter; | ||
| this.operationBefore = operationBefore; | ||
| this.operationAfter = operationAfter; | ||
| } | ||
|
|
||
| public UMLParameter getParameter() { | ||
| return parameter; | ||
| } | ||
|
|
||
| public FunctionDeclaration getOperationBefore() { | ||
| return operationBefore; | ||
| } | ||
|
|
||
| public FunctionDeclaration getOperationAfter() { | ||
| return operationAfter; | ||
| } | ||
|
|
||
| // @Override | ||
| // public List<CodeRange> leftSide() { | ||
| // List<CodeRange> ranges = new ArrayList<CodeRange>(); | ||
| // ranges.add(parameter.getVariableDeclaration().codeRange() | ||
| // .setDescription("removed parameter") | ||
| // .setCodeElement(parameter.getVariableDeclaration().toString())); | ||
| // ranges.add(operationBefore.codeRange() | ||
| // .setDescription("original method declaration") | ||
| // .setCodeElement(operationBefore.toString())); | ||
| // return ranges; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public List<CodeRange> rightSide() { | ||
| // List<CodeRange> ranges = new ArrayList<CodeRange>(); | ||
| // ranges.add(operationAfter.codeRange() | ||
| // .setDescription("method declaration with removed parameter") | ||
| // .setCodeElement(operationAfter.toString())); | ||
| // return ranges; | ||
| // } | ||
|
|
||
|
|
||
| // @Override | ||
| // public Set<ImmutablePair<String, String>> getInvolvedClassesBeforeRefactoring() { | ||
| // Set<ImmutablePair<String, String>> pairs = new LinkedHashSet<ImmutablePair<String, String>>(); | ||
| // pairs.add(new ImmutablePair<String, String>(getOperationBefore().getLocationInfo().getFilePath(), getOperationBefore().getClassName())); | ||
| // return pairs; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public Set<ImmutablePair<String, String>> getInvolvedClassesAfterRefactoring() { | ||
| // Set<ImmutablePair<String, String>> pairs = new LinkedHashSet<ImmutablePair<String, String>>(); | ||
| // pairs.add(new ImmutablePair<String, String>(getOperationAfter().getLocationInfo().getFilePath(), getOperationAfter().getClassName())); | ||
| // return pairs; | ||
| // } | ||
| // | ||
| // public String toString() { | ||
| // StringBuilder sb = new StringBuilder(); | ||
| // sb.append(getName()).append("\t"); | ||
| // sb.append(parameter.getVariableDeclaration()); | ||
| // sb.append(" in method "); | ||
| // sb.append(operationBefore); | ||
| // sb.append(" from class "); | ||
| // sb.append(operationBefore.getClassName()); | ||
| // return sb.toString(); | ||
| // } | ||
| // | ||
| // @Override | ||
| // public int hashCode() { | ||
| // final int prime = 31; | ||
| // int result = 1; | ||
| // result = prime * result + ((parameter.getVariableDeclaration() == null) ? 0 : parameter.getVariableDeclaration().hashCode()); | ||
| // result = prime * result + ((operationAfter == null) ? 0 : operationAfter.hashCode()); | ||
| // result = prime * result + ((operationBefore == null) ? 0 : operationBefore.hashCode()); | ||
| // return result; | ||
| // } | ||
| // | ||
| // @Override | ||
| // public boolean equals(Object obj) { | ||
| // if (this == obj) | ||
| // return true; | ||
| // if (obj == null) | ||
| // return false; | ||
| // if (getClass() != obj.getClass()) | ||
| // return false; | ||
| // RemoveParameterRefactoring other = (RemoveParameterRefactoring) obj; | ||
| // if (parameter == null) { | ||
| // if (other.parameter != null) | ||
| // return false; | ||
| // } else if (!parameter.getVariableDeclaration().equals(other.parameter.getVariableDeclaration())) | ||
| // return false; | ||
| // if (operationAfter == null) { | ||
| // if (other.operationAfter != null) | ||
| // return false; | ||
| // } else if (!operationAfter.equals(other.operationAfter)) | ||
| // return false; | ||
| // if (operationBefore == null) { | ||
| // if (other.operationBefore != null) | ||
| // return false; | ||
| // } else if (!operationBefore.equals(other.operationBefore)) | ||
| // return false; | ||
| // return true; | ||
| // } | ||
| } |
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
Oops, something went wrong.