| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationListener;
<<<<<<< HEAD
import org.hpccsystems.ws.wsworkunits.ArrayOfEspException;
import org.hpccsystems.ws.wsworkunits.WUQuery;
import org.hpccsystems.ws.wsworkunits.WUQueryResponse;
import org.hpccsystems.ws.wsworkunits.WsWorkunitsServiceSoap;
=======
>>>>>>> 5dd50717e8aba41770af9710c958cbb1857b8136
public class Data extends Observable {
private static Data singletonFactory; |
| Solution content |
|---|
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationListener;
public class Data extends Observable {
private static Data singletonFactory; |
| File |
|---|
| Data.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
}
public final Platform[] getPlatforms() {
<<<<<<< HEAD
platforms.clear();
ILaunchConfiguration[] configs;
try {
configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
for(int i = 0; i < configs.length; ++i) {
Platform p = GetPlatform(configs[i]);
if (p != null && !platforms.contains(p))
platforms.add(p);
}
} catch (CoreException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
=======
>>>>>>> 5dd50717e8aba41770af9710c958cbb1857b8136
return platforms.toArray(new Platform[0]);
}
|
| Solution content |
|---|
}
public final Platform[] getPlatforms() {
return platforms.toArray(new Platform[0]);
}
|
| File |
|---|
| Data.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |
| Variable |