| Chunk |
|---|
| Conflicting content |
|---|
file = input.getFile();
IProject project = file.getProject();
IJavaProject javaProject = JavaCore.create(project);
<<<<<<< HEAD
TypeChecker tc = getProjectTypeChecker(project);
if (tc!=null) {
try {
for (IPackageFragmentRoot pfr: javaProject.getPackageFragmentRoots()) {
if (pfr.getPath().isPrefixOf(file.getFullPath())) {
IPath relPath = file.getFullPath().makeRelativeTo(pfr.getPath());
model = tc.getPhasedUnitFromRelativePath(relPath.toString())
.getCompilationUnit();
=======
try {
for (IPackageFragmentRoot pfr: javaProject.getPackageFragmentRoots()) {
if (pfr.getPath().isPrefixOf(file.getFullPath())) {
IPath relPath = file.getFullPath().makeRelativeTo(pfr.getPath());
TypeChecker projectTypeChecker = getProjectTypeChecker(project);
if (projectTypeChecker != null) {
model = projectTypeChecker
.getPhasedUnitFromRelativePath(relPath.toString())
.getCompilationUnit();
>>>>>>> 500132ac9f1c83871d5655488e7471357f1777df
}
}
} |
| Solution content |
|---|
file = input.getFile();
IProject project = file.getProject();
IJavaProject javaProject = JavaCore.create(project);
TypeChecker tc = getProjectTypeChecker(project);
if (tc!=null) {
try {
for (IPackageFragmentRoot pfr: javaProject.getPackageFragmentRoots()) {
if (pfr.getPath().isPrefixOf(file.getFullPath())) {
IPath relPath = file.getFullPath().makeRelativeTo(pfr.getPath());
model = tc.getPhasedUnitFromRelativePath(relPath.toString())
.getCompilationUnit();
}
}
} |
| File |
|---|
| CeylonQuickFixController.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| For statement |
| If statement |
| Method invocation |
| Try statement |
| Variable |