diff options
Diffstat (limited to 'eclipse')
12 files changed, 43 insertions, 43 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java index 6e4b278..7d62acf 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AndroidConstants.java @@ -48,7 +48,7 @@ public class AndroidConstants { * The old Editors Plugin ID. It is still used in some places for compatibility. * Please do not use for new features. */ - public static final String EDITORS_NAMESPACE = "com.android.ide.eclipse.editors"; // $NON-NLS-1$ + public static final String EDITORS_NAMESPACE = "com.android.ide.eclipse.editors"; //$NON-NLS-1$ /** Nature of default Android projects */ public final static String NATURE_DEFAULT = "com.android.ide.eclipse.adt.AndroidNature"; //$NON-NLS-1$ @@ -232,5 +232,5 @@ public class AndroidConstants { /** The base URL where to find the Android class & manifest documentation */ public static final String CODESITE_BASE_URL = "http://code.google.com/android"; //$NON-NLS-1$ - public static final String LIBRARY_TEST_RUNNER = "android.test.runner"; // $NON-NLS-1$ + public static final String LIBRARY_TEST_RUNNER = "android.test.runner"; //$NON-NLS-1$ } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidTextEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidTextEditor.java index e524826..2b11671 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidTextEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidTextEditor.java @@ -78,7 +78,7 @@ public abstract class AndroidTextEditor extends FormEditor implements IResourceC private static final String PREF_CURRENT_PAGE = "_current_page"; /** Id string used to create the Android SDK browser */ - private static String BROWSER_ID = "android"; // $NON-NLS-1$ + private static String BROWSER_ID = "android"; //$NON-NLS-1$ /** Page id of the XML source editor, used for switching tabs programmatically */ public final static String TEXT_EDITOR_ID = "editor_part"; //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/export/ExportLinksPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/export/ExportLinksPart.java index 31ea988..d772897 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/export/ExportLinksPart.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/export/ExportLinksPart.java @@ -47,7 +47,7 @@ final class ExportLinksPart extends ManifestSectionPart { final Composite table = createTableLayout(toolkit, 2 /* numColumns */); StringBuffer buf = new StringBuffer(); - buf.append("<form>"); // $NON-NLS-1$ + buf.append("<form>"); //$NON-NLS-1$ buf.append("<li style=\"image\" value=\"android_img\"><a href=\"action_dosomething\">"); buf.append("TODO Custom Action"); @@ -55,15 +55,15 @@ final class ExportLinksPart extends ManifestSectionPart { buf.append(": blah blah do something (like build/export)."); buf.append("</li>"); //$NON-NLS-1$ - buf.append(String.format("<li style=\"image\" value=\"android_img\"><a href=\"page:%1$s\">", // $NON-NLS-1$ + buf.append(String.format("<li style=\"image\" value=\"android_img\"><a href=\"page:%1$s\">", //$NON-NLS-1$ ExportEditor.TEXT_EDITOR_ID)); buf.append("XML Source"); buf.append("</a>"); //$NON-NLS-1$ buf.append(": Directly edit the AndroidManifest.xml file."); buf.append("</li>"); //$NON-NLS-1$ - buf.append("<li style=\"image\" value=\"android_img\">"); // $NON-NLS-1$ - buf.append("<a href=\"http://code.google.com/android/devel/bblocks-manifest.html\">Documentation</a>: Documentation from the Android SDK for AndroidManifest.xml."); // $NON-NLS-1$ + buf.append("<li style=\"image\" value=\"android_img\">"); //$NON-NLS-1$ + buf.append("<a href=\"http://code.google.com/android/devel/bblocks-manifest.html\">Documentation</a>: Documentation from the Android SDK for AndroidManifest.xml."); //$NON-NLS-1$ buf.append("</li>"); //$NON-NLS-1$ buf.append("</form>"); //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java index a7924c3..3656e4d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/ProjectCallback.java @@ -140,12 +140,12 @@ public final class ProjectCallback implements ILegacyCallback { private String getShortClassName(String fqcn) { // The name is typically a fully-qualified class name. Let's make it a tad shorter. - if (fqcn.startsWith("android.")) { // $NON-NLS-1$ + if (fqcn.startsWith("android.")) { //$NON-NLS-1$ // For android classes, convert android.foo.Name to android...Name int first = fqcn.indexOf('.'); int last = fqcn.lastIndexOf('.'); if (last > first) { - return fqcn.substring(0, first) + ".." + fqcn.substring(last); // $NON-NLS-1$ + return fqcn.substring(0, first) + ".." + fqcn.substring(last); //$NON-NLS-1$ } } else { // For custom non-android classes, it's best to keep the 2 first segments of @@ -154,7 +154,7 @@ public final class ProjectCallback implements ILegacyCallback { first = fqcn.indexOf('.', first + 1); int last = fqcn.lastIndexOf('.'); if (last > first) { - return fqcn.substring(0, first) + ".." + fqcn.substring(last); // $NON-NLS-1$ + return fqcn.substring(0, first) + ".." + fqcn.substring(last); //$NON-NLS-1$ } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionItem.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionItem.java index f830cb9..70a4098 100755..100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionItem.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/SelectionItem.java @@ -134,12 +134,12 @@ import java.util.List; if (name == null) { // The name is typically a fully-qualified class name. Let's make it a tad shorter. - if (fqcn.startsWith("android.")) { // $NON-NLS-1$ + if (fqcn.startsWith("android.")) { //$NON-NLS-1$ // For android classes, convert android.foo.Name to android...Name int first = fqcn.indexOf('.'); int last = fqcn.lastIndexOf('.'); if (last > first) { - name = fqcn.substring(0, first) + ".." + fqcn.substring(last); // $NON-NLS-1$ + name = fqcn.substring(0, first) + ".." + fqcn.substring(last); //$NON-NLS-1$ } } else { // For custom non-android classes, it's best to keep the 2 first segments of @@ -148,7 +148,7 @@ import java.util.List; first = fqcn.indexOf('.', first + 1); int last = fqcn.lastIndexOf('.'); if (last > first) { - name = fqcn.substring(0, first) + ".." + fqcn.substring(last); // $NON-NLS-1$ + name = fqcn.substring(0, first) + ".." + fqcn.substring(last); //$NON-NLS-1$ } } } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewLinksPart.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewLinksPart.java index daf0885..2386a8c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewLinksPart.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/manifest/pages/OverviewLinksPart.java @@ -46,36 +46,36 @@ final class OverviewLinksPart extends ManifestSectionPart { Composite table = createTableLayout(toolkit, 2 /* numColumns */); StringBuffer buf = new StringBuffer(); - buf.append(String.format("<form><li style=\"image\" value=\"app_img\"><a href=\"page:%1$s\">", // $NON-NLS-1$ + buf.append(String.format("<form><li style=\"image\" value=\"app_img\"><a href=\"page:%1$s\">", //$NON-NLS-1$ ApplicationPage.PAGE_ID)); buf.append("Application"); buf.append("</a>"); //$NON-NLS-1$ buf.append(": Activities, intent filters, providers, services and receivers."); buf.append("</li>"); //$NON-NLS-1$ - buf.append(String.format("<li style=\"image\" value=\"perm_img\"><a href=\"page:%1$s\">", // $NON-NLS-1$ + buf.append(String.format("<li style=\"image\" value=\"perm_img\"><a href=\"page:%1$s\">", //$NON-NLS-1$ PermissionPage.PAGE_ID)); buf.append("Permission"); buf.append("</a>"); //$NON-NLS-1$ buf.append(": Permissions defined and permissions used."); buf.append("</li>"); //$NON-NLS-1$ - buf.append(String.format("<li style=\"image\" value=\"inst_img\"><a href=\"page:%1$s\">", // $NON-NLS-1$ + buf.append(String.format("<li style=\"image\" value=\"inst_img\"><a href=\"page:%1$s\">", //$NON-NLS-1$ InstrumentationPage.PAGE_ID)); buf.append("Instrumentation"); buf.append("</a>"); //$NON-NLS-1$ buf.append(": Instrumentation defined."); buf.append("</li>"); //$NON-NLS-1$ - buf.append(String.format("<li style=\"image\" value=\"android_img\"><a href=\"page:%1$s\">", // $NON-NLS-1$ + buf.append(String.format("<li style=\"image\" value=\"android_img\"><a href=\"page:%1$s\">", //$NON-NLS-1$ ManifestEditor.TEXT_EDITOR_ID)); buf.append("XML Source"); buf.append("</a>"); //$NON-NLS-1$ buf.append(": Directly edit the AndroidManifest.xml file."); buf.append("</li>"); //$NON-NLS-1$ - buf.append("<li style=\"image\" value=\"android_img\">"); // $NON-NLS-1$ - buf.append("<a href=\"http://code.google.com/android/devel/bblocks-manifest.html\">Documentation</a>: Documentation from the Android SDK for AndroidManifest.xml."); // $NON-NLS-1$ + buf.append("<li style=\"image\" value=\"android_img\">"); //$NON-NLS-1$ + buf.append("<a href=\"http://code.google.com/android/devel/bblocks-manifest.html\">Documentation</a>: Documentation from the Android SDK for AndroidManifest.xml."); //$NON-NLS-1$ buf.append("</li>"); //$NON-NLS-1$ buf.append("</form>"); //$NON-NLS-1$ diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/descriptors/ResourcesDescriptors.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/descriptors/ResourcesDescriptors.java index b6ee15d..2bb7f0f 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/descriptors/ResourcesDescriptors.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/resources/descriptors/ResourcesDescriptors.java @@ -200,7 +200,7 @@ public final class ResourcesDescriptors implements IDescriptorProvider { null /* nsUri */, "The mandatory name used in referring to this theme.", nameAttrInfo), - new TextAttributeDescriptor("parent", // $NON-NLS-1$ + new TextAttributeDescriptor("parent", //$NON-NLS-1$ "Parent", null /* nsUri */, "An optional parent theme. All values from the specified theme will be inherited into this theme. Any values with identical names that you specify will override inherited values.", diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java index 4ce8d00..ef7628d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java @@ -66,7 +66,7 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL // The plug-in ID - public static final String PLUGIN_ID = "com.android.ide.eclipse.ddms"; // $NON-NLS-1$ + public static final String PLUGIN_ID = "com.android.ide.eclipse.ddms"; //$NON-NLS-1$ /** The singleton instance */ private static DdmsPlugin sPlugin; @@ -143,7 +143,7 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL //DdmUiPreferences.displayCharts(); // set the consoles. - mDdmsConsole = new MessageConsole("DDMS", null); // $NON-NLS-1$ + mDdmsConsole = new MessageConsole("DDMS", null); //$NON-NLS-1$ ConsolePlugin.getDefault().getConsoleManager().addConsoles( new IConsole[] { mDdmsConsole diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/EventLogView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/EventLogView.java index 03752c4..8e170b7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/EventLogView.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/EventLogView.java @@ -38,23 +38,23 @@ public class EventLogView extends SelectionDependentViewPart { // create the external actions CommonAction optionsAction = new CommonAction("Options..."); optionsAction.setToolTipText("Opens the options panel"); - optionsAction.setImageDescriptor(loader.loadDescriptor("edit.png")); // $NON-NLS-1$ + optionsAction.setImageDescriptor(loader.loadDescriptor("edit.png")); //$NON-NLS-1$ CommonAction clearLogAction = new CommonAction("Clear Log"); clearLogAction.setToolTipText("Clears the event log"); - clearLogAction.setImageDescriptor(loader.loadDescriptor("clear.png")); // $NON-NLS-1$ + clearLogAction.setImageDescriptor(loader.loadDescriptor("clear.png")); //$NON-NLS-1$ CommonAction saveAction = new CommonAction("Save Log"); saveAction.setToolTipText("Saves the event log"); - saveAction.setImageDescriptor(loader.loadDescriptor("save.png")); // $NON-NLS-1$ + saveAction.setImageDescriptor(loader.loadDescriptor("save.png")); //$NON-NLS-1$ CommonAction loadAction = new CommonAction("Load Log"); loadAction.setToolTipText("Loads an event log"); - loadAction.setImageDescriptor(loader.loadDescriptor("load.png")); // $NON-NLS-1$ + loadAction.setImageDescriptor(loader.loadDescriptor("load.png")); //$NON-NLS-1$ CommonAction importBugAction = new CommonAction("Import Bug Report Log"); importBugAction.setToolTipText("Imports a bug report."); - importBugAction.setImageDescriptor(loader.loadDescriptor("importBug.png")); // $NON-NLS-1$ + importBugAction.setImageDescriptor(loader.loadDescriptor("importBug.png")); //$NON-NLS-1$ placeActions(optionsAction, clearLogAction, saveAction, loadAction, importBugAction); diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java index a53a7c9..7cb9b3c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/LogCatView.java @@ -71,26 +71,26 @@ import java.util.regex.Pattern; public final class LogCatView extends SelectionDependentViewPart implements LogCatViewInterface { public static final String ID = - "com.android.ide.eclipse.ddms.views.LogCatView"; // $NON-NLS-1$ + "com.android.ide.eclipse.ddms.views.LogCatView"; //$NON-NLS-1$ private static final String PREFS_COL_TIME = - DdmsPlugin.PLUGIN_ID + ".logcat.time"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.time"; //$NON-NLS-1$ private static final String PREFS_COL_LEVEL = - DdmsPlugin.PLUGIN_ID + ".logcat.level"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.level"; //$NON-NLS-1$ private static final String PREFS_COL_PID = - DdmsPlugin.PLUGIN_ID + ".logcat.pid"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.pid"; //$NON-NLS-1$ private static final String PREFS_COL_TAG = - DdmsPlugin.PLUGIN_ID + ".logcat.tag"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.tag"; //$NON-NLS-1$ private static final String PREFS_COL_MESSAGE = - DdmsPlugin.PLUGIN_ID + ".logcat.message"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.message"; //$NON-NLS-1$ private static final String PREFS_FILTERS = - DdmsPlugin.PLUGIN_ID + ".logcat.filters"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.filters"; //$NON-NLS-1$ public static final String CHOICE_METHOD_DECLARATION = - DdmsPlugin.PLUGIN_ID + ".logcat.MethodDeclaration"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.MethodDeclaration"; //$NON-NLS-1$ public static final String CHOICE_ERROR_LINE = - DdmsPlugin.PLUGIN_ID + ".logcat.ErrorLine"; // $NON-NLS-1$ + DdmsPlugin.PLUGIN_ID + ".logcat.ErrorLine"; //$NON-NLS-1$ private static LogCatView sThis; private LogPanel mLogPanel; @@ -126,7 +126,7 @@ public final class LogCatView extends SelectionDependentViewPart implements LogC PREFS_FILTERS); // split in a string per filter - String[] filters = filterPrefs.split("\\|"); // $NON-NLS-1$ + String[] filters = filterPrefs.split("\\|"); //$NON-NLS-1$ ArrayList<LogFilter> list = new ArrayList<LogFilter>(filters.length); @@ -267,7 +267,7 @@ public final class LogCatView extends SelectionDependentViewPart implements LogC } }; mEditFilterAction.setToolTipText("Edit Filter"); - mEditFilterAction.setImageDescriptor(loader.loadDescriptor("edit.png")); // $NON-NLS-1$ + mEditFilterAction.setImageDescriptor(loader.loadDescriptor("edit.png")); //$NON-NLS-1$ mDeleteFilterAction = new CommonAction("Delete Filter") { @Override @@ -276,7 +276,7 @@ public final class LogCatView extends SelectionDependentViewPart implements LogC } }; mDeleteFilterAction.setToolTipText("Delete Filter"); - mDeleteFilterAction.setImageDescriptor(loader.loadDescriptor("delete.png")); // $NON-NLS-1$ + mDeleteFilterAction.setImageDescriptor(loader.loadDescriptor("delete.png")); //$NON-NLS-1$ mExportAction = new CommonAction("Export Selection As Text...") { @Override @@ -285,7 +285,7 @@ public final class LogCatView extends SelectionDependentViewPart implements LogC } }; mExportAction.setToolTipText("Export Selection As Text..."); - mExportAction.setImageDescriptor(loader.loadDescriptor("save.png")); // $NON-NLS-1$ + mExportAction.setImageDescriptor(loader.loadDescriptor("save.png")); //$NON-NLS-1$ mGotoMethodDeclarationAction = new CommonAction("Go to Problem (method declaration)") { @Override @@ -333,7 +333,7 @@ public final class LogCatView extends SelectionDependentViewPart implements LogC mLogPanel.clear(); } }; - mClearAction.setImageDescriptor(loader.loadDescriptor("clear.png")); // $NON-NLS-1$ + mClearAction.setImageDescriptor(loader.loadDescriptor("clear.png")); //$NON-NLS-1$ // now create the log view diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/NativeHeapView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/NativeHeapView.java index ed5aacb..91c8022 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/NativeHeapView.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/NativeHeapView.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; public class NativeHeapView extends TableView { public static final String ID = - "com.android.ide.eclipse.ddms.views.NativeHeapView"; // $NON-NLS-1$ + "com.android.ide.eclipse.ddms.views.NativeHeapView"; //$NON-NLS-1$ private NativeHeapPanel mPanel; public NativeHeapView() { diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/ThreadView.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/ThreadView.java index cd24458..9d4eeb7 100644 --- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/ThreadView.java +++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/views/ThreadView.java @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; public class ThreadView extends TableView { public static final String ID = - "com.android.ide.eclipse.ddms.views.ThreadView"; // $NON-NLS-1$ + "com.android.ide.eclipse.ddms.views.ThreadView"; //$NON-NLS-1$ private ThreadPanel mPanel; public ThreadView() { |