fixes for warnings: committed for JL
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
index 718d7b4..b43f8ec 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteHelper.java
@@ -109,7 +109,7 @@
* Returns a TestSuite to run
*/
private Test getTest(String testName) {
- int firstIndex = testName.indexOf(".");
+ int firstIndex = testName.indexOf("."); //$NON-NLS-1$
String suiteName = testName.substring(0, firstIndex);
String subTestName = testName.substring(firstIndex + 1);
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
index 4f7b7c7..3bab38e 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/SuiteTestRunner.java
@@ -38,7 +38,7 @@
}
public void start() {
- String name = "dynamic test";
+ String name = "dynamic test"; //$NON-NLS-1$
fFrame = createUI(name);
fFrame.pack();
fFrame.setVisible(true);
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
index cffd76a..2b2bd28 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorActionDelegate.java
@@ -37,7 +37,7 @@
Shell shell = new Shell();
GridLayout gridLayout = new GridLayout();
shell.setLayout(gridLayout);
- shell.setText("Test Collector");
+ shell.setText("Test Collector"); //$NON-NLS-1$
TestCollectorGUI testCollectorGUI = new TestCollectorGUI(shell, SWT.NULL);
GridData gridData = new GridData(GridData.FILL_BOTH);
gridData.horizontalSpan = 1;
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
index 8a09a9a..606252f 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
@@ -34,10 +34,10 @@
*/
public class TestCollectorGUI extends Composite implements ModifyListener {
- private static final String PLUGIN_ID = "org.eclipse.wst.common.tests.collector";
- private static final String SUITES_EXT_PT = "suites";
- private static final String NAME = "name";
- private static final String CLASS = "class";
+ private static final String PLUGIN_ID = "org.eclipse.wst.common.tests.collector"; //$NON-NLS-1$
+ private static final String SUITES_EXT_PT = "suites"; //$NON-NLS-1$
+// private static final String NAME = "name"; //$NON-NLS-1$
+// private static final String CLASS = "class"; //$NON-NLS-1$
private Composite innerPanes = null;
private Combo combo = null;
@@ -66,7 +66,7 @@
for (int j = 0; j < tests.length; j++) {
try {
IConfigurationElement element = tests[j];
- String suiteName = element.getAttribute("name");
+ String suiteName = element.getAttribute("name"); //$NON-NLS-1$
testSuites.put(suiteName, element);
} catch (Exception e) {
e.printStackTrace();
@@ -119,7 +119,7 @@
try {
String testName = combo.getText();
IConfigurationElement element = (IConfigurationElement) testSuites.get(testName);
- TestSuite suite = (TestSuite) element.createExecutableExtension("class");
+ TestSuite suite = (TestSuite) element.createExecutableExtension("class"); //$NON-NLS-1$
innerPanes = new TestCollectorInnerPanes(this, SWT.NULL, new SuiteHelper(suite));
} catch (Exception ex) {
innerPanes = new Composite(this, SWT.NULL);
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
index a51bae5..f62d96b 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorInnerPanes.java
@@ -79,7 +79,7 @@
gridData = new GridData();
gridData.horizontalAlignment = GridData.CENTER;
label2.setLayoutData(gridData);
- label2.setText("Test Suites");
+ label2.setText("Test Suites"); //$NON-NLS-1$
Composite rightComposite = new Composite(splitView, SWT.NONE);
GridLayout rightLayout = new GridLayout();
@@ -89,7 +89,7 @@
gridData = new GridData();
gridData.horizontalAlignment = GridData.CENTER;
label3.setLayoutData(gridData);
- label3.setText("Tests");
+ label3.setText("Tests"); //$NON-NLS-1$
testClassTable = new Table(leftComposite, SWT.CHECK);
testClassTable.setBackground(getBackground());
@@ -117,7 +117,7 @@
final Button selectAllCheckbox = new Button(leftComposite, SWT.CHECK);
selectAllCheckbox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- selectAllCheckbox.setText("Select All");
+ selectAllCheckbox.setText("Select All"); //$NON-NLS-1$
selectAllCheckbox.addSelectionListener(new SelectionAdapter(){
public void widgetSelected(SelectionEvent e) {
boolean checked = selectAllCheckbox.getSelection();
@@ -138,7 +138,7 @@
gridData.horizontalAlignment = GridData.CENTER;
gridData.horizontalSpan = 2;
launchTestButton.setLayoutData(gridData);
- launchTestButton.setText("Run Tests");
+ launchTestButton.setText("Run Tests"); //$NON-NLS-1$
launchTestButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
SuiteTestRunner runner = new SuiteTestRunner(buildSuite());
@@ -168,7 +168,7 @@
fullToShortHashtable.clear();
for (int i = 0; null != methodArray && i < methodArray.length; i++) {
- String partialTestName = testName + "." + methodArray[i];
+ String partialTestName = testName + "." + methodArray[i]; //$NON-NLS-1$
int endIndex = methodArray[i].indexOf('(');
String methodName = endIndex > 0 ? methodArray[i].substring(0, endIndex) : methodArray[i];
shortToFullHashtable.put(methodName, partialTestName);
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.properties b/tests/org.eclipse.wst.common.tests.collector/plugin.properties
new file mode 100644
index 0000000..144de79
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.collector/plugin.properties
@@ -0,0 +1,6 @@
+org.eclipse.wst.common.tests.collector=org.eclipse.wst.common.tests.collector
+suites=suites
+Test_Collector=Test Collector
+WTP_Tests=WTP Tests
+Open=Open
+Test_Collector=Test Collector
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.xml b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
index e63c881..fe80b94 100644
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.xml
+++ b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.0"?>
<plugin
id="org.eclipse.wst.common.tests.collector"
- name="org.eclipse.wst.common.tests.collector"
+ name="%org.eclipse.wst.common.tests.collector"
version="0.7.0">
<runtime>
@@ -13,18 +13,18 @@
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.core.runtime.compatibility"/>
</requires>
- <extension-point id="suites" name="suites" schema="schema/suites.exsd"/>
+ <extension-point id="suites" name="%suites" schema="schema/suites.exsd"/>
<extension
point="org.eclipse.ui.actionSets">
<actionSet
- label="Test Collector"
+ label="%Test_Collector"
visible="true"
id="testCollector">
<menu
- label="WTP Tests"
+ label="%WTP_Tests"
path="additions"
id="org.eclipse.wst.common.tests.collector.testsMenu">
<separator
@@ -32,8 +32,8 @@
</separator>
</menu>
<action
- label="Open"
- tooltip="Test Collector"
+ label="%Open"
+ tooltip="%Test_Collector"
class="org.eclipse.wst.common.tests.collector.TestCollectorActionDelegate"
menubarPath="org.eclipse.wst.common.tests.collector.testsMenu/group1"
id="org.eclipse.wst.common.tests.collector.testsAction">
diff --git a/tests/org.eclipse.wst.common.tests.ui/build.properties b/tests/org.eclipse.wst.common.tests.ui/build.properties
index cebaaea..cb204fd 100644
--- a/tests/org.eclipse.wst.common.tests.ui/build.properties
+++ b/tests/org.eclipse.wst.common.tests.ui/build.properties
@@ -2,4 +2,5 @@
output.ui.jar = bin/
bin.includes = plugin.xml,\
ui.jar,\
- about.html
+ about.html,\
+ plugin.properties
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.properties b/tests/org.eclipse.wst.common.tests.ui/plugin.properties
new file mode 100644
index 0000000..43069c8
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/plugin.properties
@@ -0,0 +1,2 @@
+Ui_Plug-in=Test Ui Plug-in
+Eclipse=Eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.xml b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
index 45bbab7..fe85948 100644
--- a/tests/org.eclipse.wst.common.tests.ui/plugin.xml
+++ b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
@@ -2,9 +2,9 @@
<?eclipse version="3.0"?>
<plugin
id="org.eclipse.wst.common.tests.ui"
- name="Ui Plug-in"
+ name="%Ui_Plug-in"
version="0.7.0"
- provider-name=""
+ provider-name="%Eclipse"
class="org.eclipse.wst.common.tests.ui.UiPlugin">
<runtime>
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
index a724d9a..5f2d281 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
@@ -22,9 +22,9 @@
public class DataModelUIFactoryTest extends TestCase {
public void testValidExtensionID() {
- IDataModel dataModel = DataModelFactory.createDataModel("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel");
+ IDataModel dataModel = DataModelFactory.createDataModel("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
assertTrue(dataModel.isProperty(ITestDataModel.FOO));
- DataModelWizard wizard = DataModelWizardFactory.createWizard("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel");
+ DataModelWizard wizard = DataModelWizardFactory.createWizard("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"); //$NON-NLS-1$
assertNotNull(wizard);
assertNotNull(wizard.getDataModel());
}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
index 6724e83..976fc6e 100644
--- a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
@@ -66,7 +66,7 @@
public ResourceBundle getResourceBundle() {
try {
if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.tests.ui.UiPluginResources");
+ resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.tests.ui.UiPluginResources"); //$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
@@ -81,6 +81,6 @@
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.common.tests.ui", path);
+ return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.common.tests.ui", path); //$NON-NLS-1$
}
}