Bug 300438 - [ui] Small grammatical error on Automatic Updates pagev20100423

3 files changed, 52 insertions, 92 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateMessages.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateMessages.java
index 18fb531ed..17be7f356 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateMessages.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdateMessages.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -75,6 +75,7 @@ public class AutomaticUpdateMessages extends NLS {
 	public static String AutomaticUpdatesPreferencePage_searchAndNotify;
 	public static String AutomaticUpdatesPreferencePage_downloadAndNotify;
 	public static String AutomaticUpdatesPreferencePage_at;
+	public static String AutomaticUpdatesPreferencePage_GenericProductName;
 	public static String AutomaticUpdatesPreferencePage_RemindGroup;
 	public static String AutomaticUpdatesPreferencePage_RemindSchedule;
 	public static String AutomaticUpdatesPreferencePage_RemindOnce;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
index 55752f2d0..6fd107811 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/AutomaticUpdatesPreferencePage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2007, 2009 IBM Corporation and others.
+ *  Copyright (c) 2007, 2010 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -10,9 +10,12 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.sdk.scheduler;
 
+import org.eclipse.core.runtime.IProduct;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -27,8 +30,7 @@ import org.eclipse.ui.*;
  * @since 3.4
  * 
  */
-public class AutomaticUpdatesPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage {
+public class AutomaticUpdatesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
 
 	private Button enabledCheck;
 	private Button onStartupRadio, onScheduleRadio;
@@ -45,12 +47,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 	}
 
 	protected Control createContents(Composite parent) {
-		PlatformUI
-				.getWorkbench()
-				.getHelpSystem()
-				.setHelp(
-						parent,
-						IAutomaticUpdaterHelpContextIds.AUTOMATIC_UPDATES_PREFERENCE_PAGE);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IAutomaticUpdaterHelpContextIds.AUTOMATIC_UPDATES_PREFERENCE_PAGE);
 
 		Composite container = new Composite(parent, SWT.NULL);
 		GridLayout layout = new GridLayout();
@@ -58,14 +55,12 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		container.setLayout(layout);
 
 		enabledCheck = new Button(container, SWT.CHECK);
-		enabledCheck
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findUpdates);
+		enabledCheck.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findUpdates);
 
 		createSpacer(container, 1);
 
 		updateScheduleGroup = new Group(container, SWT.NONE);
-		updateScheduleGroup
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_UpdateSchedule);
+		updateScheduleGroup.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_UpdateSchedule);
 		layout = new GridLayout();
 		layout.numColumns = 3;
 		updateScheduleGroup.setLayout(layout);
@@ -73,8 +68,9 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		updateScheduleGroup.setLayoutData(gd);
 
 		onStartupRadio = new Button(updateScheduleGroup, SWT.RADIO);
-		onStartupRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnStart);
+		IProduct product = Platform.getProduct();
+		String productName = product != null && product.getName() != null ? product.getName() : AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_GenericProductName;
+		onStartupRadio.setText(NLS.bind(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnStart, productName));
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		onStartupRadio.setLayoutData(gd);
@@ -85,8 +81,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		});
 
 		onScheduleRadio = new Button(updateScheduleGroup, SWT.RADIO);
-		onScheduleRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnSchedule);
+		onScheduleRadio.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_findOnSchedule);
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		onScheduleRadio.setLayoutData(gd);
@@ -104,8 +99,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		dayCombo.setLayoutData(gd);
 
 		atLabel = new Label(updateScheduleGroup, SWT.NULL);
-		atLabel
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_at);
+		atLabel.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_at);
 
 		hourCombo = new Combo(updateScheduleGroup, SWT.READ_ONLY);
 		hourCombo.setItems(AutomaticUpdateScheduler.HOURS);
@@ -115,8 +109,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		createSpacer(container, 1);
 
 		downloadGroup = new Group(container, SWT.NONE);
-		downloadGroup
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_downloadOptions);
+		downloadGroup.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_downloadOptions);
 		layout = new GridLayout();
 		layout.numColumns = 3;
 		downloadGroup.setLayout(layout);
@@ -124,8 +117,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		downloadGroup.setLayoutData(gd);
 
 		searchOnlyRadio = new Button(downloadGroup, SWT.RADIO);
-		searchOnlyRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_searchAndNotify);
+		searchOnlyRadio.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_searchAndNotify);
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		searchOnlyRadio.setLayoutData(gd);
@@ -136,8 +128,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		});
 
 		searchAndDownloadRadio = new Button(downloadGroup, SWT.RADIO);
-		searchAndDownloadRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_downloadAndNotify);
+		searchAndDownloadRadio.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_downloadAndNotify);
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		searchAndDownloadRadio.setLayoutData(gd);
@@ -150,8 +141,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		createSpacer(container, 1);
 
 		remindGroup = new Group(container, SWT.NONE);
-		remindGroup
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindGroup);
+		remindGroup.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindGroup);
 		layout = new GridLayout();
 		layout.numColumns = 3;
 		remindGroup.setLayout(layout);
@@ -159,8 +149,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		remindGroup.setLayoutData(gd);
 
 		remindOnceRadio = new Button(remindGroup, SWT.RADIO);
-		remindOnceRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindOnce);
+		remindOnceRadio.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindOnce);
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		remindOnceRadio.setLayoutData(gd);
@@ -171,8 +160,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		});
 
 		remindScheduleRadio = new Button(remindGroup, SWT.RADIO);
-		remindScheduleRadio
-				.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindSchedule);
+		remindScheduleRadio.setText(AutomaticUpdateMessages.AutomaticUpdatesPreferencePage_RemindSchedule);
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		remindScheduleRadio.setLayoutData(gd);
@@ -210,26 +198,18 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 	}
 
 	private void initialize() {
-		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault()
-				.getPreferenceStore();
-		enabledCheck.setSelection(pref
-				.getBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED));
-		setSchedule(pref
-				.getString(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
+		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault().getPreferenceStore();
+		enabledCheck.setSelection(pref.getBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED));
+		setSchedule(pref.getString(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
 
 		dayCombo.setText(AutomaticUpdateScheduler.DAYS[getDay(pref, false)]);
 		hourCombo.setText(AutomaticUpdateScheduler.HOURS[getHour(pref, false)]);
 
-		remindScheduleRadio.setSelection(pref
-				.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindOnceRadio.setSelection(!pref
-				.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindElapseCombo.setText(pref
-				.getString(PreferenceConstants.PREF_REMIND_ELAPSED));
-		searchOnlyRadio.setSelection(!pref
-				.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
-		searchAndDownloadRadio.setSelection(pref
-				.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
+		remindScheduleRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
+		remindOnceRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
+		remindElapseCombo.setText(pref.getString(PreferenceConstants.PREF_REMIND_ELAPSED));
+		searchOnlyRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
+		searchAndDownloadRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
 
 		pageChanged();
 	}
@@ -255,38 +235,26 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		remindGroup.setEnabled(master);
 		remindScheduleRadio.setEnabled(master);
 		remindOnceRadio.setEnabled(master);
-		remindElapseCombo.setEnabled(master
-				&& remindScheduleRadio.getSelection());
+		remindElapseCombo.setEnabled(master && remindScheduleRadio.getSelection());
 	}
 
 	protected void performDefaults() {
 		super.performDefaults();
-		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault()
-				.getPreferenceStore();
-		enabledCheck
-				.setSelection(pref
-						.getDefaultBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED));
-
-		setSchedule(pref
-				.getDefaultString(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
-		onScheduleRadio
-				.setSelection(pref
-						.getDefaultBoolean(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
+		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault().getPreferenceStore();
+		enabledCheck.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED));
+
+		setSchedule(pref.getDefaultString(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
+		onScheduleRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE));
 
 		dayCombo.setText(AutomaticUpdateScheduler.DAYS[getDay(pref, true)]);
 		hourCombo.setText(AutomaticUpdateScheduler.HOURS[getHour(pref, true)]);
 
-		remindOnceRadio.setSelection(!pref
-				.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindScheduleRadio.setSelection(pref
-				.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
-		remindElapseCombo.setText(pref
-				.getDefaultString(PreferenceConstants.PREF_REMIND_ELAPSED));
-
-		searchOnlyRadio.setSelection(!pref
-				.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
-		searchAndDownloadRadio.setSelection(pref
-				.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
+		remindOnceRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
+		remindScheduleRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_REMIND_SCHEDULE));
+		remindElapseCombo.setText(pref.getDefaultString(PreferenceConstants.PREF_REMIND_ELAPSED));
+
+		searchOnlyRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
+		searchAndDownloadRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_DOWNLOAD_ONLY));
 		pageChanged();
 	}
 
@@ -294,21 +262,16 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 	 * Method declared on IPreferencePage. Subclasses should override
 	 */
 	public boolean performOk() {
-		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault()
-				.getPreferenceStore();
-		pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED,
-				enabledCheck.getSelection());
+		IPreferenceStore pref = AutomaticUpdatePlugin.getDefault().getPreferenceStore();
+		pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED, enabledCheck.getSelection());
 		if (onStartupRadio.getSelection())
-			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE,
-					PreferenceConstants.PREF_UPDATE_ON_STARTUP);
+			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_STARTUP);
 		else
-			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE,
-					PreferenceConstants.PREF_UPDATE_ON_SCHEDULE);
+			pref.setValue(PreferenceConstants.PREF_AUTO_UPDATE_SCHEDULE, PreferenceConstants.PREF_UPDATE_ON_SCHEDULE);
 
 		if (remindScheduleRadio.getSelection()) {
 			pref.setValue(PreferenceConstants.PREF_REMIND_SCHEDULE, true);
-			pref.setValue(PreferenceConstants.PREF_REMIND_ELAPSED,
-					remindElapseCombo.getText());
+			pref.setValue(PreferenceConstants.PREF_REMIND_ELAPSED, remindElapseCombo.getText());
 		} else {
 			pref.setValue(PreferenceConstants.PREF_REMIND_SCHEDULE, false);
 		}
@@ -316,8 +279,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 		pref.setValue(AutomaticUpdateScheduler.P_DAY, dayCombo.getText());
 		pref.setValue(AutomaticUpdateScheduler.P_HOUR, hourCombo.getText());
 
-		pref.setValue(PreferenceConstants.PREF_DOWNLOAD_ONLY,
-				searchAndDownloadRadio.getSelection());
+		pref.setValue(PreferenceConstants.PREF_DOWNLOAD_ONLY, searchAndDownloadRadio.getSelection());
 
 		AutomaticUpdatePlugin.getDefault().savePreferences();
 		AutomaticUpdatePlugin.getDefault().getScheduler().rescheduleUpdate();
@@ -325,9 +287,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 	}
 
 	private int getDay(IPreferenceStore pref, boolean useDefault) {
-		String day = useDefault ? pref
-				.getDefaultString(AutomaticUpdateScheduler.P_DAY) : pref
-				.getString(AutomaticUpdateScheduler.P_DAY);
+		String day = useDefault ? pref.getDefaultString(AutomaticUpdateScheduler.P_DAY) : pref.getString(AutomaticUpdateScheduler.P_DAY);
 		for (int i = 0; i < AutomaticUpdateScheduler.DAYS.length; i++)
 			if (AutomaticUpdateScheduler.DAYS[i].equals(day))
 				return i;
@@ -335,9 +295,7 @@ public class AutomaticUpdatesPreferencePage extends PreferencePage implements
 	}
 
 	private int getHour(IPreferenceStore pref, boolean useDefault) {
-		String hour = useDefault ? pref
-				.getDefaultString(AutomaticUpdateScheduler.P_HOUR) : pref
-				.getString(AutomaticUpdateScheduler.P_HOUR);
+		String hour = useDefault ? pref.getDefaultString(AutomaticUpdateScheduler.P_HOUR) : pref.getString(AutomaticUpdateScheduler.P_HOUR);
 		for (int i = 0; i < AutomaticUpdateScheduler.HOURS.length; i++)
 			if (AutomaticUpdateScheduler.HOURS[i].equals(hour))
 				return i;
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/messages.properties b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/messages.properties
index 59ea000fa..497a0e695 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/messages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
+# Copyright (c) 2007, 2010 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -55,7 +55,7 @@ AutomaticUpdater_AutomaticDownloadOperationName=Automatic updates download
 AutomaticUpdater_ClickToReviewUpdates=Updates are available.  Click here to review and install them.
 AutomaticUpdater_ClickToReviewUpdatesWithProblems=Updates are available, but there may be some compatibility problems.  Click here to review them.
 AutomaticUpdatesPreferencePage_UpdateSchedule=&Update schedule
-AutomaticUpdatesPreferencePage_findOnStart=Look for updates each time &platform is started
+AutomaticUpdatesPreferencePage_findOnStart=Look for u&pdates each time {0} is started
 AutomaticUpdatesPreferencePage_findOnSchedule=Look for updates on the following &schedule:
 AutomaticUpdatesPreferencePage_downloadOptions=&Download options
 AutomaticUpdatesPreferencePage_searchAndNotify=Search for updates and &notify me when they are available
@@ -63,6 +63,7 @@ AutomaticUpdatesPreferencePage_downloadAndNotify=Down&load new updates automatic
 AutomaticUpdatesPopup_ClickToReviewDownloaded=Software updates have been downloaded.\nClick to review and install updates.
 AutomaticUpdatesPopup_ClickToReviewNotDownloaded=Updates are available for your software.\nClick to review and install updates.
 AutomaticUpdatesPreferencePage_at=at
+AutomaticUpdatesPreferencePage_GenericProductName=the application
 AutomaticUpdatesPreferencePage_RemindGroup=&When updates are found
 AutomaticUpdatesPreferencePage_RemindSchedule=&Remind me about updates every:
 AutomaticUpdatesPreferencePage_RemindOnce=Notify me &once about updates