diff options
author | Tor Norbye <tnorbye@google.com> | 2011-01-04 15:59:49 -0800 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2011-01-04 15:59:49 -0800 |
commit | 23da069e4f407df1b06e7db2324e3247496abe3d (patch) | |
tree | 0e11dbf1433c406f86e38519a32452f7b010052b /ddms/app | |
parent | caef2f66bf77fd473b704aaa7f81ddf3405d754a (diff) | |
download | sdk-23da069e4f407df1b06e7db2324e3247496abe3d.zip sdk-23da069e4f407df1b06e7db2324e3247496abe3d.tar.gz sdk-23da069e4f407df1b06e7db2324e3247496abe3d.tar.bz2 |
Fix NON-NLS tokens
There were a number of // $NON-NLS-1$ references in the codebase.
Eclipse's "Externalize Strings" functionality will not handle these
correctly; there must not be a space between the "//" and the "$NON"
tokens.
(I left AndroidXmlEditor.xml alone; it is the file I discovered
the problem in but I fixed those references as part of another
pending checkin.)
Change-Id: If185c88a667273af614f0bee5959fd2618756c05
Diffstat (limited to 'ddms/app')
-rw-r--r-- | ddms/app/src/com/android/ddms/AboutDialog.java | 4 | ||||
-rw-r--r-- | ddms/app/src/com/android/ddms/StaticPortEditDialog.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ddms/app/src/com/android/ddms/AboutDialog.java b/ddms/app/src/com/android/ddms/AboutDialog.java index d33c2dc..d9387c9 100644 --- a/ddms/app/src/com/android/ddms/AboutDialog.java +++ b/ddms/app/src/com/android/ddms/AboutDialog.java @@ -64,7 +64,7 @@ public class AboutDialog extends Dialog { Shell shell = new Shell(parent, getStyle()); shell.setText("About..."); - logoImage = loadImage(shell, "ddms-logo.png"); // $NON-NLS-1$ + logoImage = loadImage(shell, "ddms-logo.png"); //$NON-NLS-1$ createContents(shell); shell.pack(); @@ -86,7 +86,7 @@ public class AboutDialog extends Dialog { */ private Image loadImage(Shell shell, String fileName) { InputStream imageStream; - String pathName = "/images/" + fileName; // $NON-NLS-1$ + String pathName = "/images/" + fileName; //$NON-NLS-1$ imageStream = this.getClass().getResourceAsStream(pathName); if (imageStream == null) { diff --git a/ddms/app/src/com/android/ddms/StaticPortEditDialog.java b/ddms/app/src/com/android/ddms/StaticPortEditDialog.java index b224967..9191d9f 100644 --- a/ddms/app/src/com/android/ddms/StaticPortEditDialog.java +++ b/ddms/app/src/com/android/ddms/StaticPortEditDialog.java @@ -249,7 +249,7 @@ public class StaticPortEditDialog extends Dialog { private void validate() { // first we reset the warning dialog. This allows us to latter // display warnings. - mWarning.setText(""); // $NON-NLS-1$ + mWarning.setText(""); //$NON-NLS-1$ // check the device name field is not empty if (mDeviceSn == null || mDeviceSn.length() == 0) { @@ -269,9 +269,9 @@ public class StaticPortEditDialog extends Dialog { // validate the package name as well. It must be a fully qualified // java package. - String[] packageSegments = mAppName.split("\\."); // $NON-NLS-1$ + String[] packageSegments = mAppName.split("\\."); //$NON-NLS-1$ for (String p : packageSegments) { - if (p.matches("^[a-zA-Z][a-zA-Z0-9]*") == false) { // $NON-NLS-1$ + if (p.matches("^[a-zA-Z][a-zA-Z0-9]*") == false) { //$NON-NLS-1$ mWarning.setText(packageError); mOkButton.setEnabled(false); return; @@ -279,7 +279,7 @@ public class StaticPortEditDialog extends Dialog { // lets also display a warning if the package contains upper case // letters. - if (p.matches("^[a-z][a-z0-9]*") == false) { // $NON-NLS-1$ + if (p.matches("^[a-z][a-z0-9]*") == false) { //$NON-NLS-1$ mWarning.setText("Lower case is recommended for Java packages."); } } @@ -300,7 +300,7 @@ public class StaticPortEditDialog extends Dialog { } // then we check it only contains digits. - if (mPortNumber.matches("[0-9]*") == false) { // $NON-NLS-1$ + if (mPortNumber.matches("[0-9]*") == false) { //$NON-NLS-1$ mWarning.setText("Port Number invalid."); mOkButton.setEnabled(false); return; |