Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public void jump_should_stop_at_first_done_result()

assertEquals(JumpResult.done(), result);
verify(jumper1).jump(context);
verify(jumper2).jump(context);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ private boolean conditionsAreMet(IConfigurationElement[] conditionElements)

for (IConfigurationElement condition : conditionElements)
{
if(! DEPENDENCY_COND_TYPE.equals(condition.getAttribute(TYPE_ATTR)) || ! isDependencyPresent(condition.getAttribute(VALUE_ATTR)))
if(DEPENDENCY_COND_TYPE.equals(condition.getAttribute(TYPE_ATTR)) && ! isDependencyPresent(condition.getAttribute(VALUE_ATTR)))
{
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,21 @@ public boolean isDone()
{
return done;
}

@Override
public int hashCode()
{
return Boolean.hashCode(done);
}

@Override
public boolean equals(Object obj)
{
if(this == obj)
return true;
if(obj == null || getClass() != obj.getClass())
return false;
JumpResult other = (JumpResult) obj;
return done == other.done;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
*/
public class RenameDialogRunnable implements Runnable
{
ClassTypeFacade javaFile;
IMethod renamedMethod;
String newMethodName;
TestMethodDivinerFactory testMethodDivinerFactory;
TestMethodDiviner testMethodDiviner;
public ClassTypeFacade javaFile;
public IMethod renamedMethod;
public String newMethodName;
public TestMethodDivinerFactory testMethodDivinerFactory;
public TestMethodDiviner testMethodDiviner;

public RenameDialogRunnable(ClassTypeFacade javaFile, IMethod renamedMethod, String newMethodName)
{
Expand Down
Loading