| Chunk |
|---|
| Conflicting content |
|---|
}
/**
<<<<<<< HEAD
* Pings the usage start server.
*/
private void pingUsageServer() {
// Report the version of the ADT plugin to the stat server
String versionString = (String) getBundle().getHeaders().get(
Constants.BUNDLE_VERSION);
Version version = new Version(versionString);
versionString = String.format("%1$d.%2$d.%3$d", version.getMajor(), //$NON-NLS-1$
version.getMinor(), version.getMicro());
SdkStatsService.ping("adt", versionString); //$NON-NLS-1$
// Report the version of Eclipse to the stat server.
// Get the version of eclipse by getting the version of one of the runtime plugins.
ResourcesPlugin resPlugin = ResourcesPlugin.getPlugin();
String eclipseVersionString = (String) resPlugin.getBundle().getHeaders().get(
Constants.BUNDLE_VERSION);
// parse the string using the Version class.
Version eclipseVersion = new Version(eclipseVersionString);
eclipseVersionString = String.format("%1$d.%2$d", //$NON-NLS-1$
eclipseVersion.getMajor(), eclipseVersion.getMinor());
SdkStatsService.ping("eclipse", eclipseVersionString); //$NON-NLS-1$
}
/**
=======
>>>>>>> d0357c27e602d6bec239897b8375d642bc590a62
* Reparses the content of the SDK and updates opened projects.
*/
public void reparseSdk() { |
| Solution content |
|---|
*/
String eclipseVersionString = (String) resPlugin.getBundle().getHeaders().get(
}
/**
* Pings the usage start server.
private void pingUsageServer() {
// Report the version of the ADT plugin to the stat server
String versionString = (String) getBundle().getHeaders().get(
Constants.BUNDLE_VERSION);
Version version = new Version(versionString);
versionString = String.format("%1$d.%2$d.%3$d", version.getMajor(), //$NON-NLS-1$
version.getMinor(), version.getMicro());
SdkStatsService.ping("adt", versionString); //$NON-NLS-1$
// Report the version of Eclipse to the stat server.
// Get the version of eclipse by getting the version of one of the runtime plugins.
ResourcesPlugin resPlugin = ResourcesPlugin.getPlugin();
Constants.BUNDLE_VERSION);
// parse the string using the Version class.
Version eclipseVersion = new Version(eclipseVersionString);
eclipseVersionString = String.format("%1$d.%2$d", //$NON-NLS-1$
eclipseVersion.getMajor(), eclipseVersion.getMinor());
SdkStatsService.ping("eclipse", eclipseVersionString); //$NON-NLS-1$
}
/**
* Reparses the content of the SDK and updates opened projects.
*/
public void reparseSdk() { |
| File |
|---|
| AdtPlugin.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method declaration |