NEW - bug 188191: [new uex] clean up default perspective settings
https://bugs.eclipse.org/bugs/show_bug.cgi?id=188191
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
index fb6e2f4..ff13013 100644
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
+++ b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/MylarUserStudyExamplePlugin.java
@@ -4,7 +4,7 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.mylar.context.core.ContextCorePlugin;
import org.eclipse.mylar.internal.monitor.usage.MylarUsageMonitorPlugin;
-import org.eclipse.mylar.monitor.ui.MylarMonitorUiPlugin;
+import org.eclipse.mylar.monitor.ui.MonitorUiPlugin;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.ui.IStartup;
import org.eclipse.ui.IWorkbench;
@@ -36,7 +36,7 @@
workbench.getDisplay().asyncExec(new Runnable() {
public void run() {
selectionMonitor = new SelectionMonitor();
- MylarMonitorUiPlugin.getDefault().getSelectionMonitors().add(selectionMonitor);
+ MonitorUiPlugin.getDefault().getSelectionMonitors().add(selectionMonitor);
MylarUsageMonitorPlugin.getDefault().addMonitoredPreferences(
WorkbenchPlugin.getDefault().getPluginPreferences());
@@ -58,7 +58,7 @@
super.stop(context);
plugin = null;
- MylarMonitorUiPlugin.getDefault().getSelectionMonitors().remove(selectionMonitor);
+ MonitorUiPlugin.getDefault().getSelectionMonitors().remove(selectionMonitor);
MylarUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
WorkbenchPlugin.getDefault().getPluginPreferences());
MylarUsageMonitorPlugin.getDefault().removeMonitoredPreferences(
diff --git a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
index 5c980c4..cf2a740 100644
--- a/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
+++ b/org.eclipse.mylyn.examples.monitor.study/src/org/eclipse/mylyn/examples/monitor/study/SelectionMonitor.java
@@ -28,7 +28,7 @@
import org.eclipse.mylar.internal.context.core.ContextManager;
import org.eclipse.mylar.monitor.core.InteractionEvent;
import org.eclipse.mylar.monitor.ui.AbstractUserInteractionMonitor;
-import org.eclipse.mylar.monitor.ui.MylarMonitorUiPlugin;
+import org.eclipse.mylar.monitor.ui.MonitorUiPlugin;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IPathEditorInput;
import org.eclipse.ui.IWorkbenchPart;
@@ -145,7 +145,7 @@
InteractionEvent event = new InteractionEvent(interactionKind, structureKind, elementHandle, part.getSite()
.getId(), "null", delta, 0);
- MylarMonitorUiPlugin.getDefault().notifyInteractionObserved(event);
+ MonitorUiPlugin.getDefault().notifyInteractionObserved(event);
}
// private String obfuscateJavaElementHandle(IJavaElement javaElement) {
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
index 13a6aa7..453ceb3 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/InteractionEventLogger.java
@@ -60,7 +60,7 @@
}
public synchronized void interactionObserved(InteractionEvent event) {
- // System.err.println("> " + event);
+// System.err.println("> " + event);
if (MylarUsageMonitorPlugin.getDefault().isObfuscationEnabled()) {
String obfuscatedHandle = handleObfuscator.obfuscateHandle(event.getStructureKind(), event
.getStructureHandle());
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarMonitorPreferenceConstants.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorPreferenceConstants.java
similarity index 97%
rename from org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarMonitorPreferenceConstants.java
rename to org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorPreferenceConstants.java
index 6e127e1..3dca7f2 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarMonitorPreferenceConstants.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MonitorPreferenceConstants.java
@@ -14,7 +14,7 @@
/**
* @author Mik Kersten
*/
-public class MylarMonitorPreferenceConstants {
+public class MonitorPreferenceConstants {
public static final String PREF_PREVIOUS_TRANSMIT_DATE = "org.eclipse.mylar.monitor.ui.upload.previousTransmit";
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarUsageMonitorPlugin.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarUsageMonitorPlugin.java
index 2400ab9..030fca2 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarUsageMonitorPlugin.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/MylarUsageMonitorPlugin.java
@@ -44,7 +44,7 @@
import org.eclipse.mylar.monitor.ui.AbstractCommandMonitor;
import org.eclipse.mylar.monitor.ui.IActionExecutionListener;
import org.eclipse.mylar.monitor.ui.IMylarMonitorLifecycleListener;
-import org.eclipse.mylar.monitor.ui.MylarMonitorUiPlugin;
+import org.eclipse.mylar.monitor.ui.MonitorUiPlugin;
import org.eclipse.mylar.monitor.ui.workbench.ActionExecutionMonitor;
import org.eclipse.mylar.monitor.ui.workbench.ActivityChangeMonitor;
import org.eclipse.mylar.monitor.ui.workbench.KeybindingCommandMonitor;
@@ -178,7 +178,7 @@
public void shellDeactivated(ShellEvent arg0) {
if (!isPerformingUpload() && ContextCorePlugin.getDefault() != null) {
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.stopMonitoring();
}
}
@@ -189,7 +189,7 @@
checkForStatisticsUpload();
}
if (!isPerformingUpload() && ContextCorePlugin.getDefault() != null) {
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.startMonitoring();
}
}
@@ -208,10 +208,10 @@
public void contextStoreMoved() {
if (!isPerformingUpload()) {
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.stopMonitoring();
interactionLogger.moveOutputFile(getMonitorLogFile().getAbsolutePath());
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.startMonitoring();
}
}
@@ -223,22 +223,22 @@
}
private void initDefaultPrefs() {
- getPreferenceStore().setDefault(MylarMonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE, true);
+ getPreferenceStore().setDefault(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE, true);
- if (!getPreferenceStore().contains(MylarMonitorPreferenceConstants.PREF_MONITORING_INITIALLY_ENABLED)) {
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_INITIALLY_ENABLED, true);
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED, true);
+ if (!getPreferenceStore().contains(MonitorPreferenceConstants.PREF_MONITORING_INITIALLY_ENABLED)) {
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_INITIALLY_ENABLED, true);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_ENABLED, true);
}
if (!getPreferenceStore().contains(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION_INITITALLY_ENABLED)) {
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION_INITITALLY_ENABLED)) {
getPreferenceStore().setValue(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION_INITITALLY_ENABLED, true);
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION, true);
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION_INITITALLY_ENABLED, true);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION, true);
}
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_STARTED, false);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_STARTED, false);
}
@@ -267,19 +267,19 @@
public void run() {
try {
- if (getPreferenceStore().getBoolean(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED)) {
+ if (getPreferenceStore().getBoolean(MonitorPreferenceConstants.PREF_MONITORING_ENABLED)) {
startMonitoring();
}
if (plugin.getPreferenceStore().contains(
- MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE)) {
+ MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE)) {
lastTransmit = new Date(plugin.getPreferenceStore().getLong(
- MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE));
+ MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE));
} else {
lastTransmit = new Date();
plugin.getPreferenceStore()
- .setValue(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
+ .setValue(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
lastTransmit.getTime());
}
} catch (Throwable t) {
@@ -306,14 +306,14 @@
}
public void startMonitoring() {
- if (getPreferenceStore().contains(MylarMonitorPreferenceConstants.PREF_MONITORING_STARTED))
+ if (getPreferenceStore().contains(MonitorPreferenceConstants.PREF_MONITORING_STARTED))
return;
interactionLogger.startMonitoring();
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.startMonitoring();
IWorkbench workbench = PlatformUI.getWorkbench();
- MylarMonitorUiPlugin.getDefault().addInteractionListener(interactionLogger);
+ MonitorUiPlugin.getDefault().addInteractionListener(interactionLogger);
getCommandMonitors().add(keybindingCommandMonitor);
getActionExecutionListeners().add(new ActionExecutionMonitor());
@@ -324,7 +324,7 @@
}
}
ContextCorePlugin.getDefault().getContextStore().addListener(DATA_DIR_MOVE_LISTENER);
- MylarMonitorUiPlugin.getDefault().addWindowPerspectiveListener(perspectiveMonitor);
+ MonitorUiPlugin.getDefault().addWindowPerspectiveListener(perspectiveMonitor);
workbench.getActivitySupport().getActivityManager().addActivityManagerListener(activityMonitor);
workbench.getDisplay().addFilter(SWT.Selection, menuMonitor);
workbench.addWindowListener(windowMonitor);
@@ -338,7 +338,7 @@
if (!ContextCorePlugin.getDefault().suppressWizardsOnStartup()) {
checkForFirstMonitorUse();
}
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_STARTED, true);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_STARTED, true);
}
public void addMonitoredPreferences(Preferences preferences) {
@@ -350,22 +350,22 @@
}
public boolean isObfuscationEnabled() {
- return MylarUsageMonitorPlugin.getPrefs().getBoolean(MylarMonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE);
+ return MylarUsageMonitorPlugin.getPrefs().getBoolean(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE);
}
public void stopMonitoring() {
- if (!getPreferenceStore().contains(MylarMonitorPreferenceConstants.PREF_MONITORING_STARTED))
+ if (!getPreferenceStore().contains(MonitorPreferenceConstants.PREF_MONITORING_STARTED))
return;
for (Object listener : lifecycleListeners.getListeners()) {
((IMylarMonitorLifecycleListener) listener).stopMonitoring();
}
- for (IInteractionEventListener listener : MylarMonitorUiPlugin.getDefault().getInteractionListeners())
+ for (IInteractionEventListener listener : MonitorUiPlugin.getDefault().getInteractionListeners())
listener.stopMonitoring();
IWorkbench workbench = PlatformUI.getWorkbench();
- MylarMonitorUiPlugin.getDefault().removeInteractionListener(interactionLogger);
+ MonitorUiPlugin.getDefault().removeInteractionListener(interactionLogger);
getCommandMonitors().remove(keybindingCommandMonitor);
getActionExecutionListeners().remove(new ActionExecutionMonitor());
@@ -379,7 +379,7 @@
ContextCorePlugin.getDefault().getContextStore().removeListener(DATA_DIR_MOVE_LISTENER);
// ContextCorePlugin.getDefault().getPluginPreferences().removePropertyChangeListener(DATA_DIR_MOVE_LISTENER);
- MylarMonitorUiPlugin.getDefault().removeWindowPerspectiveListener(perspectiveMonitor);
+ MonitorUiPlugin.getDefault().removeWindowPerspectiveListener(perspectiveMonitor);
workbench.getActivitySupport().getActivityManager().removeActivityManagerListener(activityMonitor);
workbench.getDisplay().removeFilter(SWT.Selection, menuMonitor);
workbench.removeWindowListener(windowMonitor);
@@ -387,7 +387,7 @@
// uninstallBrowserMonitor(workbench);
interactionLogger.stopMonitoring();
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_STARTED, false);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_STARTED, false);
}
public void addMonitoringLifecycleListener(IMylarMonitorLifecycleListener listener) {
@@ -491,12 +491,12 @@
if (wait3Hours) {
lastTransmit.setTime(currentTime.getTime() + DELAY_ON_USER_REQUEST
- studyParameters.getTransmitPromptPeriod());
- plugin.getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
+ plugin.getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
lastTransmit.getTime());
} else {
long day = HOUR * 24;
lastTransmit.setTime(currentTime.getTime() + day - studyParameters.getTransmitPromptPeriod());
- plugin.getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
+ plugin.getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
lastTransmit.getTime());
}
}
@@ -555,19 +555,19 @@
if (plugin == null || plugin.getPreferenceStore() == null)
return;
- if (plugin.getPreferenceStore().contains(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE)) {
+ if (plugin.getPreferenceStore().contains(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE)) {
lastTransmit = new Date(plugin.getPreferenceStore().getLong(
- MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE));
+ MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE));
} else {
lastTransmit = new Date();
- plugin.getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
+ plugin.getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
lastTransmit.getTime());
}
Date currentTime = new Date();
if (currentTime.getTime() > lastTransmit.getTime() + studyParameters.getTransmitPromptPeriod()
- && getPreferenceStore().getBoolean(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION)) {
+ && getPreferenceStore().getBoolean(MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION)) {
String ending = getUserPromptDelay() == 1 ? "" : "s";
MessageDialog message = new MessageDialog(
@@ -582,13 +582,13 @@
// time must be stored right away into preferences, to prevent
// other threads
lastTransmit.setTime(new Date().getTime());
- plugin.getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
+ plugin.getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_PREVIOUS_TRANSMIT_DATE,
currentTime.getTime());
if (!plugin.getPreferenceStore().contains(
- MylarMonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED)
+ MonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED)
|| !plugin.getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED)) {
+ MonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED)) {
MessageDialog consentMessage = new MessageDialog(
Display.getDefault().getActiveShell(),
"Consent",
@@ -599,7 +599,7 @@
MessageDialog.INFORMATION, new String[] { IDialogConstants.OK_LABEL }, 0);
consentMessage.open();
plugin.getPreferenceStore().setValue(
- MylarMonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED, true);
+ MonitorPreferenceConstants.PREF_MONITORING_MYLAR_ECLIPSE_ORG_CONSENT_VIEWED, true);
}
NewUsageSummaryEditorWizard wizard = new NewUsageSummaryEditorWizard();
@@ -623,7 +623,7 @@
userCancelSubmitFeedback(currentTime, true);
} else {
plugin.getPreferenceStore().setValue(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION, false);
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION, false);
}
message.close();
@@ -632,9 +632,9 @@
}
public void incrementObservedEvents(int increment) {
- int numEvents = getPreferenceStore().getInt(MylarMonitorPreferenceConstants.PREF_NUM_USER_EVENTS);
+ int numEvents = getPreferenceStore().getInt(MonitorPreferenceConstants.PREF_NUM_USER_EVENTS);
numEvents += increment;
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_NUM_USER_EVENTS, numEvents);
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_NUM_USER_EVENTS, numEvents);
}
public void configureProxy(HttpClient httpClient, String uploadScript) {
@@ -822,7 +822,7 @@
}
public boolean isMonitoringEnabled() {
- return getPreferenceStore().getBoolean(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED);
+ return getPreferenceStore().getBoolean(MonitorPreferenceConstants.PREF_MONITORING_ENABLED);
}
public String getCustomizedByMessage() {
diff --git a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/preferences/UsageDataPreferencePage.java b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/preferences/UsageDataPreferencePage.java
index a197bfb..0fb90fd 100644
--- a/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/preferences/UsageDataPreferencePage.java
+++ b/org.eclipse.mylyn.monitor.usage/src/org/eclipse/mylyn/internal/monitor/usage/preferences/UsageDataPreferencePage.java
@@ -13,7 +13,7 @@
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.mylar.internal.monitor.usage.MylarMonitorPreferenceConstants;
+import org.eclipse.mylar.internal.monitor.usage.MonitorPreferenceConstants;
import org.eclipse.mylar.internal.monitor.usage.MylarUsageMonitorPlugin;
import org.eclipse.mylar.monitor.usage.InteractionEventObfuscator;
import org.eclipse.swt.SWT;
@@ -111,7 +111,7 @@
enableMonitoring = new Button(group, SWT.CHECK);
enableMonitoring.setText("Enable logging to: ");
enableMonitoring.setSelection(getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED));
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLED));
enableMonitoring.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
@@ -133,7 +133,7 @@
enableObfuscation = new Button(group, SWT.CHECK);
enableObfuscation.setText("Obfuscate elements using: ");
enableObfuscation.setSelection(getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE));
+ MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE));
Label obfuscationLablel = new Label(group, SWT.NULL);
obfuscationLablel.setText(InteractionEventObfuscator.ENCRYPTION_ALGORITHM + " message digest one-way hash");
}
@@ -154,7 +154,7 @@
Label events = new Label(group, SWT.NULL);
events.setText(" Events since upload:");
Label logged = new Label(group, SWT.NULL);
- logged.setText("" + getPreferenceStore().getInt(MylarMonitorPreferenceConstants.PREF_NUM_USER_EVENTS));
+ logged.setText("" + getPreferenceStore().getInt(MonitorPreferenceConstants.PREF_NUM_USER_EVENTS));
Composite enableSubmissionComposite = new Composite(group, SWT.NULL);
GridLayout submissionGridLayout = new GridLayout(4, false);
@@ -165,7 +165,7 @@
enableSubmission.setText("Enable submission every");
enableSubmission.setSelection(getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION));
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION));
enableSubmission.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
updateEnablement();
@@ -180,9 +180,9 @@
submissionTime.setLayoutData(gridData);
long submissionFreq = MylarUsageMonitorPlugin.DEFAULT_DELAY_BETWEEN_TRANSMITS;
if (MylarUsageMonitorPlugin.getPrefs().contains(
- MylarMonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY)) {
+ MonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY)) {
submissionFreq = MylarUsageMonitorPlugin.getPrefs().getLong(
- MylarMonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY);
+ MonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY);
}
long submissionFreqInDays = (long) ((double) submissionFreq) / DAYS_IN_MS;
submissionTime.setText("" + submissionFreqInDays);
@@ -204,7 +204,7 @@
@Override
public boolean performOk() {
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE,
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE,
enableObfuscation.getSelection());
if (enableMonitoring.getSelection()) {
MylarUsageMonitorPlugin.getDefault().startMonitoring();
@@ -212,10 +212,10 @@
MylarUsageMonitorPlugin.getDefault().stopMonitoring();
}
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION,
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_ENABLE_SUBMISSION,
enableSubmission.getSelection());
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED,
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_ENABLED,
enableMonitoring.getSelection());
long transmitFrequency = MylarUsageMonitorPlugin.DEFAULT_DELAY_BETWEEN_TRANSMITS;
@@ -229,7 +229,7 @@
// do nothing, transmitFrequency will have the default value
}
- getPreferenceStore().setValue(MylarMonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY,
+ getPreferenceStore().setValue(MonitorPreferenceConstants.PREF_MONITORING_SUBMIT_FREQUENCY,
transmitFrequency);
MylarUsageMonitorPlugin.getDefault().getStudyParameters().setTransmitPromptPeriod(transmitFrequency);
@@ -239,9 +239,9 @@
@Override
public boolean performCancel() {
enableMonitoring.setSelection(getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_ENABLED));
+ MonitorPreferenceConstants.PREF_MONITORING_ENABLED));
enableObfuscation.setSelection(getPreferenceStore().getBoolean(
- MylarMonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE));
+ MonitorPreferenceConstants.PREF_MONITORING_OBFUSCATE));
// userStudyId.setStringValue(MylarUsageMonitorPlugin.getDefault().getPreferenceStore().getInt(
// MylarUsageMonitorPlugin.PREF_USER_ID)
// + "");
