| Chunk |
|---|
| Conflicting content |
|---|
import org.springframework.ide.eclipse.boot.dash.model.BootDashElement; import org.springframework.ide.eclipse.boot.dash.model.BootDashModel; import org.springframework.ide.eclipse.boot.dash.model.BootDashModel.ElementStateListener; <<<<<<< HEAD ======= import org.springframework.ide.eclipse.boot.dash.model.BootProjectDashElement; import org.springframework.ide.eclipse.boot.dash.model.requestmappings.RequestMapping; >>>>>>> 6cc62c643b0538e15ef3e0555e7359a64dded0a0 import org.springframework.ide.eclipse.boot.dash.model.RunState; import org.springframework.ide.eclipse.boot.dash.model.UserInteractions; import org.springframework.ide.eclipse.boot.dash.model.requestmappings.RequestMapping; |
| Solution content |
|---|
import org.springframework.ide.eclipse.boot.dash.model.BootDashElement; import org.springframework.ide.eclipse.boot.dash.model.BootDashModel; import org.springframework.ide.eclipse.boot.dash.model.BootDashModel.ElementStateListener; import org.springframework.ide.eclipse.boot.dash.model.BootProjectDashElement; import org.springframework.ide.eclipse.boot.dash.model.RunState; import org.springframework.ide.eclipse.boot.dash.model.UserInteractions; import org.springframework.ide.eclipse.boot.dash.model.requestmappings.RequestMapping; |
| File |
|---|
| BootDashModelTest.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
}.waitFor(3 * 60 * 1000);
}
<<<<<<< HEAD
=======
private void testSettingTags(String[] tagsToSet, String[] expectedTags) throws Exception {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IProject project = root.getProject("fooProject");
project.create(null);
project.open(null);
BootProjectDashElement element = new BootProjectDashElement(project, model);
element.setTags(tagsToSet);
waitForJobsToComplete();
assertArrayEquals(expectedTags, element.getTags());
// Reopne the project to load tags from the resource
project.close(null);
project.open(null);
element = new BootProjectDashElement(project, model);
assertArrayEquals(expectedTags, element.getTags());
}
@Test
public void setUniqueTagsForProject() throws Exception {
testSettingTags(new String[] {"xd", "spring"}, new String[] {"xd", "spring"});
}
@Test
public void setDuplicateTagsForProject() throws Exception {
testSettingTags(new String[] {"xd", "spring", "xd", "spring", "spring"}, new String[] {"xd", "spring"});
}
@Test
public void setTagsWithWhiteSpaceCharsForProject() throws Exception {
testSettingTags(new String[] {"#xd", "\tspring", "xd ko ko", "spring!!-@", "@@@ - spring"}, new String[] {"#xd", "spring", "xd", "ko", "spring!!-@", "@@@", "-"});
}
>>>>>>> 6cc62c643b0538e15ef3e0555e7359a64dded0a0
} |
| Solution content |
|---|
}.waitFor(3 * 60 * 1000); } } |
| File |
|---|
| BootDashModelTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
private BootDashModelStateSaver modelState;
<<<<<<< HEAD
final private TagsChangedListener TAGS_LISTENER = new TagsChangedListener() {
@Override
public void tagsChanged(TaggableBootDashElement taggable, String[] added, String[] removed) {
notifyElementChanged(taggable);
}
};
=======
>>>>>>> 6cc62c643b0538e15ef3e0555e7359a64dded0a0
public class WorkspaceListener implements ProjectChangeListener, ClasspathListener {
@Override |
| Solution content |
|---|
private BootDashModelStateSaver modelState;
public class WorkspaceListener implements ProjectChangeListener, ClasspathListener {
@Override |
| File |
|---|
| BootDashModel.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public BootProjectDashElement(IProject project, BootDashModel context, IPropertyStore |
| Solution content |
|---|
public BootProjectDashElement(IProject project, BootDashModel context, IPropertyStore |
| File |
|---|
| BootProjectDashElement.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |