From 268c824eb161f4c1f3042201bb5a0a637e18d633 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet <> Date: Fri, 17 Apr 2009 11:08:12 -0700 Subject: [PATCH] AI 146736: am: CL 146674 "Target" nomenclature fixes Original author: xav Merged from: //branches/cupcake/... Automated import of CL 146736 --- .../eclipse/adt/project/properties/AndroidPropertyPage.java | 2 +- .../libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java | 2 +- .../src/com/android/sdkuilib/SdkTargetSelector.java | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/project/properties/AndroidPropertyPage.java b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/project/properties/AndroidPropertyPage.java index 9ab1154c9..c9568b2ae 100644 --- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/project/properties/AndroidPropertyPage.java +++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/project/properties/AndroidPropertyPage.java @@ -68,7 +68,7 @@ public class AndroidPropertyPage extends PropertyPage implements IWorkbenchPrope top.setLayout(new GridLayout(1, false)); Label l = new Label(top, SWT.NONE); - l.setText("Project Target"); + l.setText("Project Build Target"); mSelector = new SdkTargetSelector(top, targets); diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java index d62c231c1..20c211ba7 100644 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/AvdSelector.java @@ -89,7 +89,7 @@ public final class AvdSelector { final TableColumn column1 = new TableColumn(mTable, SWT.NONE); column1.setText("Target Name"); final TableColumn column2 = new TableColumn(mTable, SWT.NONE); - column2.setText("SDK"); + column2.setText("Platform"); final TableColumn column3 = new TableColumn(mTable, SWT.NONE); column3.setText("API Level"); diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/SdkTargetSelector.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/SdkTargetSelector.java index 37d69b8ba..cd789f61e 100644 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/SdkTargetSelector.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/SdkTargetSelector.java @@ -35,8 +35,6 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import java.util.ArrayList; - /** * The SDK target selector is a table that is added to the given parent composite. @@ -102,11 +100,11 @@ public class SdkTargetSelector { // create the table columns final TableColumn column0 = new TableColumn(mTable, SWT.NONE); - column0.setText("SDK Target"); + column0.setText("Target Name"); final TableColumn column1 = new TableColumn(mTable, SWT.NONE); column1.setText("Vendor"); final TableColumn column2 = new TableColumn(mTable, SWT.NONE); - column2.setText("Version"); + column2.setText("Platform"); final TableColumn column3 = new TableColumn(mTable, SWT.NONE); column3.setText("API Level");