NEW - bug 254196: Localization - ICU4J
https://bugs.eclipse.org/bugs/show_bug.cgi?id=254196
diff --git a/plugins/org.eclipse.epp.usagedata.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.epp.usagedata.ui/META-INF/MANIFEST.MF
index 2c5ed6f..da8d588 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.epp.usagedata.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@
org.eclipse.epp.usagedata.gathering;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
org.eclipse.ui.intro,
- org.eclipse.ui.intro.universal
+ org.eclipse.ui.intro.universal,
+ com.ibm.icu;bundle-version="[3.8.1,5.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.epp.usagedata.internal.ui;x-internal:=true,
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/Messages.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/Messages.java
index 310bd52..0ca4cd6 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/Messages.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/Messages.java
@@ -1,22 +1,41 @@
-package org.eclipse.epp.usagedata.internal.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.preferences.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+/*******************************************************************************
+* Copyright (c) 2005 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
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* IBM - initial API and implementation
+*******************************************************************************/
+
+package org.eclipse.epp.usagedata.internal.ui.preferences;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.preferences.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String UsageDataCapturePreferencesPage_0;
+ public static String UsageDataCapturePreferencesPage_1;
+ public static String UsageDataUploadingPreferencesPage_0;
+ public static String UsageDataUploadingPreferencesPage_1;
+ public static String UsageDataUploadingPreferencesPage_2;
+ public static String UsageDataUploadingPreferencesPage_3;
+ public static String UsageDataUploadingPreferencesPage_4;
+ public static String UsageDataUploadingPreferencesPage_5;
+ public static String UsageDataUploadingPreferencesPage_6;
+ public static String UsageDataUploadingPreferencesPage_7;
+ public static String UsageDataUploadingPreferencesPage_8;
+ public static String UsageDataUploadingTermsOfUsePage_0;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataCapturePreferencesPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataCapturePreferencesPage.java
index 9df9ac8..2a90269 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataCapturePreferencesPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataCapturePreferencesPage.java
@@ -44,7 +44,7 @@
};
public UsageDataCapturePreferencesPage() {
- setDescription(Messages.getString("UsageDataCapturePreferencesPage.0")); //$NON-NLS-1$
+ setDescription(Messages.UsageDataCapturePreferencesPage_0);
setPreferenceStore(UsageDataCaptureActivator.getDefault().getPreferenceStore());
}
@@ -103,7 +103,7 @@
composite.setLayout(new GridLayout());
captureEnabledCheckbox = new Button(composite, SWT.CHECK | SWT.LEFT);
- captureEnabledCheckbox.setText(Messages.getString("UsageDataCapturePreferencesPage.1")); //$NON-NLS-1$
+ captureEnabledCheckbox.setText(Messages.UsageDataCapturePreferencesPage_1);
}
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingPreferencesPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingPreferencesPage.java
index 9de20af..4134d93 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingPreferencesPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingPreferencesPage.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.epp.usagedata.internal.ui.preferences;
-import java.text.MessageFormat;
import java.util.Date;
import org.eclipse.epp.usagedata.internal.gathering.UsageDataCaptureActivator;
@@ -45,6 +44,8 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
+import com.ibm.icu.text.MessageFormat;
+
public class UsageDataUploadingPreferencesPage extends PreferencePage
implements IWorkbenchPreferencePage {
@@ -102,7 +103,7 @@
};
public UsageDataUploadingPreferencesPage() {
- setDescription(Messages.getString("UsageDataUploadingPreferencesPage.0")); //$NON-NLS-1$
+ setDescription(Messages.UsageDataUploadingPreferencesPage_0);
setPreferenceStore(UsageDataRecordingActivator.getDefault().getPreferenceStore());
}
@@ -230,7 +231,7 @@
composite.setLayout(new GridLayout());
askBeforeUploadingCheckbox = new Button(composite, SWT.CHECK | SWT.LEFT);
- askBeforeUploadingCheckbox.setText(Messages.getString("UsageDataUploadingPreferencesPage.1")); //$NON-NLS-1$
+ askBeforeUploadingCheckbox.setText(Messages.UsageDataUploadingPreferencesPage_1);
}
@@ -239,7 +240,7 @@
*/
private void createUploadingArea(Composite parent) {
Group group = new Group(parent, SWT.NONE);
- group.setText(Messages.getString("UsageDataUploadingPreferencesPage.2")); //$NON-NLS-1$
+ group.setText(Messages.UsageDataUploadingPreferencesPage_2);
group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
group.setLayout(new GridLayout(3, false));
@@ -257,7 +258,7 @@
*/
private void createUploadPeriodField(Group composite) {
Label label = new Label(composite, SWT.NONE);
- label.setText(Messages.getString("UsageDataUploadingPreferencesPage.3")); //$NON-NLS-1$
+ label.setText(Messages.UsageDataUploadingPreferencesPage_3);
uploadPeriodText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.RIGHT);
uploadPeriodText.setTextLimit(2);
@@ -270,10 +271,10 @@
gc.dispose();
uploadPeriodText.setLayoutData(gridData);
- new Label(composite, SWT.NONE).setText(Messages.getString("UsageDataUploadingPreferencesPage.4")); //$NON-NLS-1$
+ new Label(composite, SWT.NONE).setText(Messages.UsageDataUploadingPreferencesPage_4);
final ControlDecoration rangeErrorDecoration = new ControlDecoration(uploadPeriodText, SWT.LEFT | SWT.TOP);
- rangeErrorDecoration.setDescriptionText(MessageFormat.format(Messages.getString("UsageDataUploadingPreferencesPage.5"), MINIMUM_PERIOD_IN_DAYS, MAXIMUM_PERIOD_IN_DAYS)); //$NON-NLS-1$
+ rangeErrorDecoration.setDescriptionText(MessageFormat.format(Messages.UsageDataUploadingPreferencesPage_5, new Object[] {MINIMUM_PERIOD_IN_DAYS, MAXIMUM_PERIOD_IN_DAYS}));
rangeErrorDecoration.setImage(getErrorImage());
rangeErrorDecoration.hide();
@@ -316,7 +317,7 @@
*/
private void createLastUploadField(Group composite) {
label = new Label(composite, SWT.NONE);
- label.setText(Messages.getString("UsageDataUploadingPreferencesPage.6")); //$NON-NLS-1$
+ label.setText(Messages.UsageDataUploadingPreferencesPage_6);
lastUploadText = new Text(composite, SWT.SINGLE | SWT.BORDER);
lastUploadText.setEnabled(false);
@@ -356,7 +357,7 @@
*/
private void createUploadNowButton(Composite composite) {
uploadNowButton = new Button(composite, SWT.PUSH);
- uploadNowButton.setText(Messages.getString("UsageDataUploadingPreferencesPage.7")); //$NON-NLS-1$
+ uploadNowButton.setText(Messages.UsageDataUploadingPreferencesPage_7);
uploadNowButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -372,7 +373,7 @@
FieldDecoration decoration = FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
ControlDecoration warning = new ControlDecoration(control, SWT.BOTTOM | SWT.LEFT);
warning.setImage(decoration.getImage());
- warning.setDescriptionText(Messages.getString("UsageDataUploadingPreferencesPage.8")); //$NON-NLS-1$
+ warning.setDescriptionText(Messages.UsageDataUploadingPreferencesPage_8);
}
private String getLastUploadDateAsString() {
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingTermsOfUsePage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingTermsOfUsePage.java
index ff80a25..53de36f 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingTermsOfUsePage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/UsageDataUploadingTermsOfUsePage.java
@@ -54,7 +54,7 @@
browser.setUrl(getTermsOfUseUrl());
acceptTermsButton = new Button(composite, SWT.CHECK);
- acceptTermsButton.setText(Messages.getString("UsageDataUploadingTermsOfUsePage.0")); //$NON-NLS-1$
+ acceptTermsButton.setText(Messages.UsageDataUploadingTermsOfUsePage_0);
GridData gridData = new GridData(SWT.BEGINNING, SWT.FILL, true, false);
acceptTermsButton.setLayoutData(gridData);
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/messages.properties b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/messages.properties
index 4774792..ae16fc9 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/messages.properties
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preferences/messages.properties
@@ -1,12 +1,12 @@
-UsageDataCapturePreferencesPage.0=The Usage Data Collector collects information about how individuals are using the Eclipse platform. The intent is to use this data to help committers and organizations better understand how developers are using Eclipse.
-UsageDataCapturePreferencesPage.1=Enable capture
-UsageDataUploadingPreferencesPage.0=Information gathered by the Usage Data Collector is periodically uploaded to servers hosted by The Eclipse Foundation.
-UsageDataUploadingPreferencesPage.1=Ask before uploading
-UsageDataUploadingPreferencesPage.2=Uploading
-UsageDataUploadingPreferencesPage.3=Upload Period:
-UsageDataUploadingPreferencesPage.4=days
-UsageDataUploadingPreferencesPage.5=Enter a period between {0} and {1} days.
-UsageDataUploadingPreferencesPage.6=Last Upload:
-UsageDataUploadingPreferencesPage.7=Upload Now
-UsageDataUploadingPreferencesPage.8=This value is being overridden by a System property.
-UsageDataUploadingTermsOfUsePage.0=I accept the Terms of Use
+UsageDataCapturePreferencesPage_0=The Usage Data Collector collects information about how individuals are using the Eclipse platform. The intent is to use this data to help committers and organizations better understand how developers are using Eclipse.
+UsageDataCapturePreferencesPage_1=Enable capture
+UsageDataUploadingPreferencesPage_0=Information gathered by the Usage Data Collector is periodically uploaded to servers hosted by The Eclipse Foundation.
+UsageDataUploadingPreferencesPage_1=Ask before uploading
+UsageDataUploadingPreferencesPage_2=Uploading
+UsageDataUploadingPreferencesPage_3=Upload Period:
+UsageDataUploadingPreferencesPage_4=days
+UsageDataUploadingPreferencesPage_5=Enter a period between {0} and {1} days.
+UsageDataUploadingPreferencesPage_6=Last Upload:
+UsageDataUploadingPreferencesPage_7=Upload Now
+UsageDataUploadingPreferencesPage_8=This value is being overridden by a System property.
+UsageDataUploadingTermsOfUsePage_0=I accept the Terms of Use
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/AddFilterDialog.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/AddFilterDialog.java
index a75ba9e..d6c814a 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/AddFilterDialog.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/AddFilterDialog.java
@@ -25,7 +25,7 @@
}
public void prompt(Shell shell, String suggestion) {
- InputDialog dialog = new InputDialog(shell, Messages.getString("AddFilterDialog.0"), Messages.getString("AddFilterDialog.1"),suggestion, getValidator()); //$NON-NLS-1$ //$NON-NLS-2$
+ InputDialog dialog = new InputDialog(shell, Messages.AddFilterDialog_0, Messages.AddFilterDialog_1,suggestion, getValidator());
dialog.open();
if (dialog.getReturnCode() != InputDialog.OK) return;
@@ -38,8 +38,8 @@
if (pattern == null) return null;
pattern = pattern.trim();
if (pattern.length() == 0) return null;
- if (alreadyHasPattern(pattern)) return Messages.getString("AddFilterDialog.2"); //$NON-NLS-1$
- if (!FilterUtils.isValidBundleIdPattern(pattern)) return Messages.getString("AddFilterDialog.3"); //$NON-NLS-1$
+ if (alreadyHasPattern(pattern)) return Messages.AddFilterDialog_2;
+ if (!FilterUtils.isValidBundleIdPattern(pattern)) return Messages.AddFilterDialog_3;
return null;
}
};
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/Messages.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/Messages.java
index e53e906..f034ba9 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/Messages.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/Messages.java
@@ -1,22 +1,45 @@
-package org.eclipse.epp.usagedata.internal.ui.preview;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.preview.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+/*******************************************************************************
+* Copyright (c) 2005 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
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* IBM - initial API and implementation
+*******************************************************************************/
+
+package org.eclipse.epp.usagedata.internal.ui.preview;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.preview.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String AddFilterDialog_0;
+ public static String AddFilterDialog_1;
+ public static String AddFilterDialog_2;
+ public static String AddFilterDialog_3;
+ public static String RemoveFilterDialog_0;
+ public static String RemoveFilterDialog_1;
+ public static String UploadPreview_10;
+ public static String UploadPreview_11;
+ public static String UploadPreview_2;
+ public static String UploadPreview_3;
+ public static String UploadPreview_4;
+ public static String UploadPreview_5;
+ public static String UploadPreview_6;
+ public static String UploadPreview_7;
+ public static String UploadPreview_8;
+ public static String UploadPreview_9;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/RemoveFilterDialog.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/RemoveFilterDialog.java
index d8974eb..93dc418 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/RemoveFilterDialog.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/RemoveFilterDialog.java
@@ -25,8 +25,8 @@
return super.getTableStyle() - SWT.SINGLE + SWT.MULTI;
}
};
- dialog.setTitle(Messages.getString("RemoveFilterDialog.0")); //$NON-NLS-1$
- dialog.setMessage(Messages.getString("RemoveFilterDialog.1")); //$NON-NLS-1$
+ dialog.setTitle(Messages.RemoveFilterDialog_0);
+ dialog.setMessage(Messages.RemoveFilterDialog_1);
dialog.setAddCancelButton(true);
dialog.setLabelProvider(new LabelProvider() {
@Override
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/UploadPreview.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/UploadPreview.java
index 372d9f6..6d4c554 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/UploadPreview.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/UploadPreview.java
@@ -12,7 +12,6 @@
import java.io.File;
import java.io.IOException;
-import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -61,6 +60,8 @@
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.forms.widgets.FormText;
+import com.ibm.icu.text.DateFormat;
+
public class UploadPreview {
private final UploadParameters parameters;
@@ -150,7 +151,7 @@
private void createDescriptionText(Composite parent) {
FormText text = new FormText(parent, SWT.NONE);
text.setImage("x", xImage); //$NON-NLS-1$
- text.setText(Messages.getString("UploadPreview.2"), true, false); //$NON-NLS-1$
+ text.setText(Messages.UploadPreview_2, true, false);
GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false);
layoutData.widthHint = 500;
text.setLayoutData(layoutData);
@@ -228,7 +229,7 @@
private void createWhatColumn() {
whatColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- whatColumn.setText(Messages.getString("UploadPreview.3")); //$NON-NLS-1$
+ whatColumn.setText(Messages.UploadPreview_3);
whatColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -239,7 +240,7 @@
private void createKindColumn() {
kindColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- kindColumn.setText(Messages.getString("UploadPreview.4")); //$NON-NLS-1$
+ kindColumn.setText(Messages.UploadPreview_4);
kindColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -250,7 +251,7 @@
private void createDescriptionColumn() {
descriptionColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- descriptionColumn.setText(Messages.getString("UploadPreview.5")); //$NON-NLS-1$
+ descriptionColumn.setText(Messages.UploadPreview_5);
descriptionColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -261,7 +262,7 @@
private void createBundleIdColumn() {
bundleIdColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- bundleIdColumn.setText(Messages.getString("UploadPreview.6")); //$NON-NLS-1$
+ bundleIdColumn.setText(Messages.UploadPreview_6);
bundleIdColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -272,7 +273,7 @@
private void createBundleVersionColumn() {
bundleVersionColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- bundleVersionColumn.setText(Messages.getString("UploadPreview.7")); //$NON-NLS-1$
+ bundleVersionColumn.setText(Messages.UploadPreview_7);
bundleVersionColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -283,7 +284,7 @@
private void createTimestampColumn() {
timestampColumn = new UsageDataTableViewerColumn(SWT.LEFT);
- timestampColumn.setText(Messages.getString("UploadPreview.8")); //$NON-NLS-1$
+ timestampColumn.setText(Messages.UploadPreview_8);
timestampColumn.setLabelProvider(new UsageDataColumnProvider() {
@Override
public String getText(UsageDataEventWrapper event) {
@@ -322,7 +323,7 @@
private void createEclipseOnlyButton(Composite buttons) {
eclipseOnlyButton = new Button(buttons, SWT.CHECK);
- eclipseOnlyButton.setText(Messages.getString("UploadPreview.9")); //$NON-NLS-1$
+ eclipseOnlyButton.setText(Messages.UploadPreview_9);
eclipseOnlyButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -349,7 +350,7 @@
private void createAddFilterButton(Composite parent) {
if (parameters.getFilter() instanceof PreferencesBasedFilter) {
addFilterButton = new Button(parent, SWT.PUSH);
- addFilterButton.setText(Messages.getString("UploadPreview.10")); //$NON-NLS-1$
+ addFilterButton.setText(Messages.UploadPreview_10);
addFilterButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -362,7 +363,7 @@
private void createRemoveFilterButton(Composite parent) {
if (parameters.getFilter() instanceof PreferencesBasedFilter) {
removeFilterButton = new Button(parent, SWT.PUSH);
- removeFilterButton.setText(Messages.getString("UploadPreview.11")); //$NON-NLS-1$
+ removeFilterButton.setText(Messages.UploadPreview_11);
removeFilterButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/messages.properties b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/messages.properties
index 1489ed8..340267e 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/messages.properties
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/preview/messages.properties
@@ -1,16 +1,16 @@
-AddFilterDialog.0=New filter
-AddFilterDialog.1=Provide a bundle name pattern. Bundles ids that match this pattern will not be uploaded.
-AddFilterDialog.2=You are already filtering this pattern.
-AddFilterDialog.3=The pattern is not valid.
-RemoveFilterDialog.0=Remove Filter
-RemoveFilterDialog.1=Select one or more filters to remove.
-UploadPreview.10=Add filter...
-UploadPreview.11=Remove filter...
-UploadPreview.2=<form><p>The following events have been captured by the Usage Data Collector. Those events marked with an <img href="x"/> will not be uploaded. You can control what is uploaded by adding filters.</p></form>
-UploadPreview.3=What
-UploadPreview.4=Kind
-UploadPreview.5=Description
-UploadPreview.6=Bundle Id
-UploadPreview.7=Version
-UploadPreview.8=When
-UploadPreview.9=Only upload events from "org.eclipse" bundles
+AddFilterDialog_0=New filter
+AddFilterDialog_1=Provide a bundle name pattern. Bundles ids that match this pattern will not be uploaded.
+AddFilterDialog_2=You are already filtering this pattern.
+AddFilterDialog_3=The pattern is not valid.
+RemoveFilterDialog_0=Remove Filter
+RemoveFilterDialog_1=Select one or more filters to remove.
+UploadPreview_10=Add filter...
+UploadPreview_11=Remove filter...
+UploadPreview_2=<form><p>The following events have been captured by the Usage Data Collector. Those events marked with an <img href="x"/> will not be uploaded. You can control what is uploaded by adding filters.</p></form>
+UploadPreview_3=What
+UploadPreview_4=Kind
+UploadPreview_5=Description
+UploadPreview_6=Bundle Id
+UploadPreview_7=Version
+UploadPreview_8=When
+UploadPreview_9=Only upload events from "org.eclipse" bundles
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/Messages.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/Messages.java
index 15252db..438ccaf 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/Messages.java
@@ -1,22 +1,45 @@
-package org.eclipse.epp.usagedata.internal.ui.wizards;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.wizards.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
+/*******************************************************************************
+* Copyright (c) 2005 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
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+* IBM - initial API and implementation
+*******************************************************************************/
+
+package org.eclipse.epp.usagedata.internal.ui.wizards;
+
+import org.eclipse.osgi.util.NLS;
+
+public final class Messages extends NLS {
+
+ private static final String BUNDLE_NAME = "org.eclipse.epp.usagedata.internal.ui.wizards.messages";//$NON-NLS-1$
+
+ private Messages() {
+ // Do not instantiate
+ }
+
+ public static String SelectActionWizardPage_10;
+ public static String SelectActionWizardPage_11;
+ public static String SelectActionWizardPage_12;
+ public static String SelectActionWizardPage_13;
+ public static String SelectActionWizardPage_14;
+ public static String SelectActionWizardPage_15;
+ public static String SelectActionWizardPage_16;
+ public static String SelectActionWizardPage_17;
+ public static String SelectActionWizardPage_3;
+ public static String SelectActionWizardPage_4;
+ public static String SelectActionWizardPage_5;
+ public static String SelectActionWizardPage_9;
+ public static String TermsOfUseWizardPage_1;
+ public static String TermsOfUseWizardPage_2;
+ public static String UploadPreviewPage_1;
+ public static String UploadPreviewPage_2;
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
index 1cc0be3..1902eb1 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/SelectActionWizardPage.java
@@ -47,8 +47,8 @@
public SelectActionWizardPage(AskUserUploader uploader) {
super("wizardPage"); //$NON-NLS-1$
this.uploader = uploader;
- setTitle(Messages.getString("SelectActionWizardPage.3")); //$NON-NLS-1$
- setDescription(Messages.getString("SelectActionWizardPage.4")); //$NON-NLS-1$
+ setTitle(Messages.SelectActionWizardPage_3);
+ setDescription(Messages.SelectActionWizardPage_4);
}
/**
@@ -58,7 +58,7 @@
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
- FormText greeting = createFormText(composite, Messages.getString("SelectActionWizardPage.5")); //$NON-NLS-1$
+ FormText greeting = createFormText(composite, Messages.SelectActionWizardPage_5);
greeting.addHyperlinkListener(new HyperlinkAdapter() {
@Override
public void linkActivated(HyperlinkEvent event) {
@@ -97,7 +97,7 @@
}
private String getTermsText() {
- return Messages.getString("SelectActionWizardPage.9"); //$NON-NLS-1$
+ return Messages.SelectActionWizardPage_9;
}
private void createSpacer(Composite parent) {
@@ -108,23 +108,23 @@
}
private void createUploadNowRadio(Composite parent) {
- uploadNowRadio = createRadio(parent, Messages.getString("SelectActionWizardPage.10"), AskUserUploader.UPLOAD_NOW); //$NON-NLS-1$
- createDescriptionText(parent, Messages.getString("SelectActionWizardPage.11")); //$NON-NLS-1$
+ uploadNowRadio = createRadio(parent, Messages.SelectActionWizardPage_10, AskUserUploader.UPLOAD_NOW);
+ createDescriptionText(parent, Messages.SelectActionWizardPage_11);
}
private void createUploadAlwaysRadio(Composite parent) {
- uploadAlwaysRadio = createRadio(parent, Messages.getString("SelectActionWizardPage.12"), AskUserUploader.UPLOAD_ALWAYS); //$NON-NLS-1$
- createDescriptionText(parent, Messages.getString("SelectActionWizardPage.13")); //$NON-NLS-1$
+ uploadAlwaysRadio = createRadio(parent, Messages.SelectActionWizardPage_12, AskUserUploader.UPLOAD_ALWAYS);
+ createDescriptionText(parent, Messages.SelectActionWizardPage_13);
}
private void createDontUploadRadio(Composite parent) {
- dontUploadRadio = createRadio(parent, Messages.getString("SelectActionWizardPage.14"), AskUserUploader.DONT_UPLOAD); //$NON-NLS-1$
- createDescriptionText(parent, Messages.getString("SelectActionWizardPage.15")); //$NON-NLS-1$
+ dontUploadRadio = createRadio(parent, Messages.SelectActionWizardPage_14, AskUserUploader.DONT_UPLOAD);
+ createDescriptionText(parent, Messages.SelectActionWizardPage_15);
}
private void createNeverUploadRadio(Composite parent) {
- neverUploadRadio = createRadio(parent, Messages.getString("SelectActionWizardPage.16"),AskUserUploader.NEVER_UPLOAD); //$NON-NLS-1$
- createDescriptionText(parent, Messages.getString("SelectActionWizardPage.17")); //$NON-NLS-1$
+ neverUploadRadio = createRadio(parent, Messages.SelectActionWizardPage_16,AskUserUploader.NEVER_UPLOAD);
+ createDescriptionText(parent, Messages.SelectActionWizardPage_17);
}
private Button createRadio(Composite parent, String label, final int action) {
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/TermsOfUseWizardPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/TermsOfUseWizardPage.java
index d251a2d..a8a0887 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/TermsOfUseWizardPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/TermsOfUseWizardPage.java
@@ -35,7 +35,7 @@
public TermsOfUseWizardPage(AskUserUploader uploader) {
super("wizardPage"); //$NON-NLS-1$
this.uploader = uploader;
- setTitle(Messages.getString("TermsOfUseWizardPage.1")); //$NON-NLS-1$
+ setTitle(Messages.TermsOfUseWizardPage_1);
//setDescription("This wizard uploads captured usage data. Clearly a better description is required.");
}
@@ -51,7 +51,7 @@
browser.setUrl(getTermsOfUseUrl());
final Button acceptTermsButton = new Button(container, SWT.CHECK);
- acceptTermsButton.setText(Messages.getString("TermsOfUseWizardPage.2")); //$NON-NLS-1$
+ acceptTermsButton.setText(Messages.TermsOfUseWizardPage_2);
GridData gridData = new GridData(SWT.BEGINNING, SWT.FILL, true, false);
acceptTermsButton.setLayoutData(gridData);
acceptTermsButton.setSelection(uploader.hasUserAcceptedTermsOfUse());
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/UploadPreviewPage.java b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/UploadPreviewPage.java
index 7c3f38f..54f07f5 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/UploadPreviewPage.java
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/UploadPreviewPage.java
@@ -26,8 +26,8 @@
public UploadPreviewPage(AskUserUploader uploader) {
super("wizardPage"); //$NON-NLS-1$
this.uploader = uploader;
- setTitle(Messages.getString("UploadPreviewPage.1")); //$NON-NLS-1$
- setDescription(Messages.getString("UploadPreviewPage.2")); //$NON-NLS-1$
+ setTitle(Messages.UploadPreviewPage_1);
+ setDescription(Messages.UploadPreviewPage_2);
}
public void createControl(Composite parent) {
diff --git a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/messages.properties b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/messages.properties
index 138b9e8..f85f7a4 100644
--- a/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.epp.usagedata.ui/src/org/eclipse/epp/usagedata/internal/ui/wizards/messages.properties
@@ -1,16 +1,16 @@
-SelectActionWizardPage.10=Upload now
-SelectActionWizardPage.11=Upload the usage data now. Ask before uploading again.
-SelectActionWizardPage.12=Upload always
-SelectActionWizardPage.13=Upload the usage data now. Don't ask next time; just do the upload in the background. Note that you can change this setting in the preferences.
-SelectActionWizardPage.14=Don't upload now
-SelectActionWizardPage.15=Do not upload usage data at this time. You will be asked to do the upload later.
-SelectActionWizardPage.16=Turn UDC feature off
-SelectActionWizardPage.17=Stop collecting data. The UDC will be turned off and data will never be uploaded.
-SelectActionWizardPage.3=Usage Data Upload
-SelectActionWizardPage.4=It's time to upload your usage data.
-SelectActionWizardPage.5=<form><p>The Eclipse <a href="udc">Usage Data Collector</a> (UDC) has been collecting data on how you have been using the workbench. It would now like to upload the data to a server at the Eclipse Foundation.</p><p>You can preview the data before it is uploaded on the <a href="preview">Preview page</a>.</p><p>Questions about the UDC? Check out our <a href="faq">Frequently Asked Questions</a>.</p></form>
-SelectActionWizardPage.9=<form><p>You agree to provide this data under the Usage Data Collector <a href="terms">Terms of Use</a>.</p></form>
-TermsOfUseWizardPage.1=Terms of Use
-TermsOfUseWizardPage.2=I accept the Terms of Use
-UploadPreviewPage.1=Upload Preview
-UploadPreviewPage.2=The following data will be uploaded.
+SelectActionWizardPage_10=Upload now
+SelectActionWizardPage_11=Upload the usage data now. Ask before uploading again.
+SelectActionWizardPage_12=Upload always
+SelectActionWizardPage_13=Upload the usage data now. Don't ask next time; just do the upload in the background. Note that you can change this setting in the preferences.
+SelectActionWizardPage_14=Don't upload now
+SelectActionWizardPage_15=Do not upload usage data at this time. You will be asked to do the upload later.
+SelectActionWizardPage_16=Turn UDC feature off
+SelectActionWizardPage_17=Stop collecting data. The UDC will be turned off and data will never be uploaded.
+SelectActionWizardPage_3=Usage Data Upload
+SelectActionWizardPage_4=It's time to upload your usage data.
+SelectActionWizardPage_5=<form><p>The Eclipse <a href="udc">Usage Data Collector</a> (UDC) has been collecting data on how you have been using the workbench. It would now like to upload the data to a server at the Eclipse Foundation.</p><p>You can preview the data before it is uploaded on the <a href="preview">Preview page</a>.</p><p>Questions about the UDC? Check out our <a href="faq">Frequently Asked Questions</a>.</p></form>
+SelectActionWizardPage_9=<form><p>You agree to provide this data under the Usage Data Collector <a href="terms">Terms of Use</a>.</p></form>
+TermsOfUseWizardPage_1=Terms of Use
+TermsOfUseWizardPage_2=I accept the Terms of Use
+UploadPreviewPage_1=Upload Preview
+UploadPreviewPage_2=The following data will be uploaded.
