| Chunk |
|---|
| Conflicting content |
|---|
}
urls.add(getTemplatesBundle().getEntry("/templates/")); //$NON-NLS-1$
<<<<<<< HEAD
=======
urls.add(Platform.getBundle("org.eclipse.gmf.graphdef.codegen").getEntry("/templates/"));
>>>>>>> 4d43380ef62e9acf50d4f91eb22a91915d4a0ad5
myLocations = urls.toArray(new URL[urls.size()]);
myResourceManager = new BundleResourceManager(myLocations);
} |
| Solution content |
|---|
}
urls.add(getTemplatesBundle().getEntry("/templates/")); //$NON-NLS-1$
myLocations = urls.toArray(new URL[urls.size()]);
myResourceManager = new BundleResourceManager(myLocations);
} |
| File |
|---|
| CodegenEmitters.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
/**
<<<<<<< HEAD
* Returns emitter for qualified class name definition in the specified template.
* Definition should be named 'qualifiedClassName'.
=======
* Returns emitter for qualified class name definition in the specified template.
* Definition should be named 'qualifiedClassName'.
>>>>>>> 4d43380ef62e9acf50d4f91eb22a91915d4a0ad5
*/
private TextEmitter getQualifiedClassNameEmitter(String templateName) throws UnexpectedBehaviourException {
String definition = templateName + PATH_SEPARATOR + "qualifiedClassName"; //$NON-NLS-1$ |
| Solution content |
|---|
}
/**
* Returns emitter for qualified class name definition in the specified template.
* Definition should be named 'qualifiedClassName'.
*/
private TextEmitter getQualifiedClassNameEmitter(String templateName) throws UnexpectedBehaviourException {
String definition = templateName + PATH_SEPARATOR + "qualifiedClassName"; //$NON-NLS-1$ |
| File |
|---|
| CodegenEmitters.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |