Author: adietish Date: 2010-08-18 13:07:30 -0400 (Wed, 18 Aug 2010) New Revision: 24267 Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java Log: [JBIDE-6376] * eclipse instance id now stays constant (changed on each restart before) Modified: trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 17:00:27 UTC (rev 24266) +++ trunk/usage/plugins/org.jboss.tools.usage/JBoss Usage Reporter.launch 2010-08-18 17:07:30 UTC (rev 24267) @@ -6,8 +6,8 @@ <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> +<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/JBoss Usage Reporter"/> <booleanAttribute key="default" value="true"/> Modified: trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java =================================================================== --- trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-08-18 17:00:27 UTC (rev 24266) +++ trunk/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/reporting/EclipseEnvironment.java 2010-08-18 17:07:30 UTC (rev 24267) @@ -179,27 +179,19 @@ } public String getUserId() { - if (PreferencesUtils.getStore().contains(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID)) { - return PreferencesUtils.getStore().getString(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID); - } else { - String userId = createIdentifier(); - PreferencesUtils.getStore().putValue(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); - return userId; + IEclipsePreferences preferences = PreferencesUtils.getPreferences(); + String userId = preferences.get(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, null); + try { + if (userId == null) { + userId = createIdentifier(); + preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); + preferences.flush(); + } + } catch (BackingStoreException e) { + StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not retrieve {0} from preferences.", + e, IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID); } -// IEclipsePreferences preferences = Preferences.getConfigurationPreferences(); -// String userId = createIdentifier(); -// try { -// if (!preferences.nodeExists(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID)) { -// preferences.put(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); -// preferences.flush(); -// } else { -// userId = preferences.get(IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID, userId); -// } -// } catch (BackingStoreException e) { -// StatusUtils.getErrorStatus(JBossToolsUsageActivator.PLUGIN_ID, "Could not retrieve {0} from preferences.", -// e, IUsageReportPreferenceConstants.ECLIPSE_INSTANCE_ID); -// } -// return userId; + return userId; } /**