auto import from //depot/cupcake/@137055
This commit is contained in:
@@ -0,0 +1,177 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.sdkuilib;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.window.Window;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.ModifyEvent;
|
||||
import org.eclipse.swt.events.ModifyListener;
|
||||
import org.eclipse.swt.events.VerifyEvent;
|
||||
import org.eclipse.swt.events.VerifyListener;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Text;
|
||||
|
||||
/**
|
||||
* Edit dialog to create/edit APK configuration. The dialog displays 2 text fields for the config
|
||||
* name and its filter.
|
||||
*/
|
||||
class ApkConfigEditDialog extends Dialog implements ModifyListener, VerifyListener {
|
||||
|
||||
private String mName;
|
||||
private String mFilter;
|
||||
private Text mNameField;
|
||||
private Text mFilterField;
|
||||
private Button mOkButton;
|
||||
|
||||
/**
|
||||
* Creates an edit dialog with optional initial values for the name and filter.
|
||||
* @param name optional value for the name. Can be null.
|
||||
* @param filter optional value for the filter. Can be null.
|
||||
* @param parentShell the parent shell.
|
||||
*/
|
||||
protected ApkConfigEditDialog(String name, String filter, Shell parentShell) {
|
||||
super(parentShell);
|
||||
mName = name;
|
||||
mFilter = filter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the name of the config. This is only valid if the user clicked OK and {@link #open()}
|
||||
* returned {@link Window#OK}
|
||||
*/
|
||||
public String getName() {
|
||||
return mName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the filter for the config. This is only valid if the user clicked OK and
|
||||
* {@link #open()} returned {@link Window#OK}
|
||||
*/
|
||||
public String getFilter() {
|
||||
return mFilter;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createContents(Composite parent) {
|
||||
Control control = super.createContents(parent);
|
||||
|
||||
mOkButton = getButton(IDialogConstants.OK_ID);
|
||||
validateButtons();
|
||||
|
||||
return control;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createDialogArea(Composite parent) {
|
||||
Composite composite = new Composite(parent, SWT.NONE);
|
||||
GridLayout layout;
|
||||
composite.setLayout(layout = new GridLayout(2, false));
|
||||
layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
|
||||
layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
|
||||
layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
|
||||
layout.horizontalSpacing = convertHorizontalDLUsToPixels(
|
||||
IDialogConstants.HORIZONTAL_SPACING);
|
||||
|
||||
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
|
||||
Label l = new Label(composite, SWT.NONE);
|
||||
l.setText("Name");
|
||||
|
||||
mNameField = new Text(composite, SWT.BORDER);
|
||||
mNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
mNameField.addVerifyListener(this);
|
||||
if (mName != null) {
|
||||
mNameField.setText(mName);
|
||||
}
|
||||
mNameField.addModifyListener(this);
|
||||
|
||||
l = new Label(composite, SWT.NONE);
|
||||
l.setText("Filter");
|
||||
|
||||
mFilterField = new Text(composite, SWT.BORDER);
|
||||
mFilterField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
if (mFilter != null) {
|
||||
mFilterField.setText(mFilter);
|
||||
}
|
||||
mFilterField.addVerifyListener(this);
|
||||
mFilterField.addModifyListener(this);
|
||||
|
||||
applyDialogFont(composite);
|
||||
return composite;
|
||||
}
|
||||
|
||||
/**
|
||||
* Validates the OK button based on the content of the 2 text fields.
|
||||
*/
|
||||
private void validateButtons() {
|
||||
mOkButton.setEnabled(mNameField.getText().trim().length() > 0 &&
|
||||
mFilterField.getText().trim().length() > 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void okPressed() {
|
||||
mName = mNameField.getText();
|
||||
mFilter = mFilterField.getText().trim();
|
||||
super.okPressed();
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback for text modification in the 2 text fields.
|
||||
*/
|
||||
public void modifyText(ModifyEvent e) {
|
||||
validateButtons();
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback to ensure the content of the text field are proper.
|
||||
*/
|
||||
public void verifyText(VerifyEvent e) {
|
||||
Text source = ((Text)e.getSource());
|
||||
if (source == mNameField) {
|
||||
// check for a-zA-Z0-9.
|
||||
final String text = e.text;
|
||||
final int len = text.length();
|
||||
for (int i = 0 ; i < len; i++) {
|
||||
char letter = text.charAt(i);
|
||||
if (letter > 255 || Character.isLetterOrDigit(letter) == false) {
|
||||
e.doit = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (source == mFilterField) {
|
||||
// we can't validate the content as its typed, but we can at least ensure the characters
|
||||
// are valid. Same as mNameFiled + the comma.
|
||||
final String text = e.text;
|
||||
final int len = text.length();
|
||||
for (int i = 0 ; i < len; i++) {
|
||||
char letter = text.charAt(i);
|
||||
if (letter > 255 || (Character.isLetterOrDigit(letter) == false && letter != ',')) {
|
||||
e.doit = false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,211 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.sdkuilib;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.jface.dialogs.MessageDialog;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.ControlAdapter;
|
||||
import org.eclipse.swt.events.ControlEvent;
|
||||
import org.eclipse.swt.events.SelectionAdapter;
|
||||
import org.eclipse.swt.events.SelectionEvent;
|
||||
import org.eclipse.swt.graphics.Rectangle;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Table;
|
||||
import org.eclipse.swt.widgets.TableColumn;
|
||||
import org.eclipse.swt.widgets.TableItem;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* The APK Configuration widget is a table that is added to the given parent composite.
|
||||
* <p/>
|
||||
* To use, create it using {@link #ApkConfigWidget(Composite)} then
|
||||
* call {@link #fillTable(Map) to set the initial list of configurations.
|
||||
*/
|
||||
public class ApkConfigWidget {
|
||||
private final static int INDEX_NAME = 0;
|
||||
private final static int INDEX_FILTER = 1;
|
||||
|
||||
private Table mApkConfigTable;
|
||||
private Button mEditButton;
|
||||
private Button mDelButton;
|
||||
|
||||
public ApkConfigWidget(final Composite parent) {
|
||||
final Composite apkConfigComp = new Composite(parent, SWT.NONE);
|
||||
apkConfigComp.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
apkConfigComp.setLayout(new GridLayout(2, false));
|
||||
|
||||
mApkConfigTable = new Table(apkConfigComp, SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER);
|
||||
mApkConfigTable.setHeaderVisible(true);
|
||||
mApkConfigTable.setLinesVisible(true);
|
||||
|
||||
GridData data = new GridData();
|
||||
data.grabExcessVerticalSpace = true;
|
||||
data.grabExcessHorizontalSpace = true;
|
||||
data.horizontalAlignment = GridData.FILL;
|
||||
data.verticalAlignment = GridData.FILL;
|
||||
mApkConfigTable.setLayoutData(data);
|
||||
|
||||
// create the table columns
|
||||
final TableColumn column0 = new TableColumn(mApkConfigTable, SWT.NONE);
|
||||
column0.setText("Name");
|
||||
column0.setWidth(100);
|
||||
final TableColumn column1 = new TableColumn(mApkConfigTable, SWT.NONE);
|
||||
column1.setText("Configuration");
|
||||
column1.setWidth(100);
|
||||
|
||||
Composite buttonComp = new Composite(apkConfigComp, SWT.NONE);
|
||||
buttonComp.setLayoutData(new GridData(GridData.FILL_VERTICAL));
|
||||
GridLayout gl;
|
||||
buttonComp.setLayout(gl = new GridLayout(1, false));
|
||||
gl.marginHeight = gl.marginWidth = 0;
|
||||
|
||||
Button newButton = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
|
||||
newButton.setText("New...");
|
||||
newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
|
||||
mEditButton = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
|
||||
mEditButton.setText("Edit...");
|
||||
mEditButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
|
||||
mDelButton = new Button(buttonComp, SWT.PUSH | SWT.FLAT);
|
||||
mDelButton.setText("Delete");
|
||||
mDelButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
|
||||
newButton.addSelectionListener(new SelectionAdapter() {
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
ApkConfigEditDialog dlg = new ApkConfigEditDialog(null /*name*/, null /*filter*/,
|
||||
apkConfigComp.getShell());
|
||||
if (dlg.open() == Dialog.OK) {
|
||||
TableItem item = new TableItem(mApkConfigTable, SWT.NONE);
|
||||
item.setText(INDEX_NAME, dlg.getName());
|
||||
item.setText(INDEX_FILTER, dlg.getFilter());
|
||||
|
||||
onSelectionChanged();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
mEditButton.addSelectionListener(new SelectionAdapter() {
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
// get the current selection (single mode so we don't care about any item beyond
|
||||
// index 0).
|
||||
TableItem[] items = mApkConfigTable.getSelection();
|
||||
if (items.length != 0) {
|
||||
ApkConfigEditDialog dlg = new ApkConfigEditDialog(
|
||||
items[0].getText(INDEX_NAME), items[0].getText(INDEX_FILTER),
|
||||
apkConfigComp.getShell());
|
||||
if (dlg.open() == Dialog.OK) {
|
||||
items[0].setText(INDEX_NAME, dlg.getName());
|
||||
items[0].setText(INDEX_FILTER, dlg.getFilter());
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
mDelButton.addSelectionListener(new SelectionAdapter() {
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
// get the current selection (single mode so we don't care about any item beyond
|
||||
// index 0).
|
||||
int[] indices = mApkConfigTable.getSelectionIndices();
|
||||
if (indices.length != 0) {
|
||||
TableItem item = mApkConfigTable.getItem(indices[0]);
|
||||
if (MessageDialog.openQuestion(parent.getShell(),
|
||||
"Apk Configuration deletion",
|
||||
String.format(
|
||||
"Are you sure you want to delete configuration '%1$s'?",
|
||||
item.getText(INDEX_NAME)))) {
|
||||
// delete the item.
|
||||
mApkConfigTable.remove(indices[0]);
|
||||
|
||||
onSelectionChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Add a listener to resize the column to the full width of the table
|
||||
mApkConfigTable.addControlListener(new ControlAdapter() {
|
||||
@Override
|
||||
public void controlResized(ControlEvent e) {
|
||||
Rectangle r = mApkConfigTable.getClientArea();
|
||||
column0.setWidth(r.width * 30 / 100); // 30%
|
||||
column1.setWidth(r.width * 70 / 100); // 70%
|
||||
}
|
||||
});
|
||||
|
||||
// add a selection listener on the table, to enable/disable buttons.
|
||||
mApkConfigTable.addSelectionListener(new SelectionAdapter() {
|
||||
@Override
|
||||
public void widgetSelected(SelectionEvent e) {
|
||||
onSelectionChanged();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void fillTable(Map<String, String> apkConfigMap) {
|
||||
// get the names in a list so that we can sort them.
|
||||
if (apkConfigMap != null) {
|
||||
Set<String> keys = apkConfigMap.keySet();
|
||||
String[] keyArray = keys.toArray(new String[keys.size()]);
|
||||
Arrays.sort(keyArray);
|
||||
|
||||
for (String key : keyArray) {
|
||||
TableItem item = new TableItem(mApkConfigTable, SWT.NONE);
|
||||
item.setText(INDEX_NAME, key);
|
||||
item.setText(INDEX_FILTER, apkConfigMap.get(key));
|
||||
}
|
||||
}
|
||||
|
||||
onSelectionChanged();
|
||||
}
|
||||
|
||||
public Map<String, String> getApkConfigs() {
|
||||
// go through all the items from the table and fill a new map
|
||||
HashMap<String, String> map = new HashMap<String, String>();
|
||||
|
||||
TableItem[] items = mApkConfigTable.getItems();
|
||||
for (TableItem item : items) {
|
||||
map.put(item.getText(INDEX_NAME), item.getText(INDEX_FILTER));
|
||||
}
|
||||
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles table selection changes.
|
||||
*/
|
||||
private void onSelectionChanged() {
|
||||
if (mApkConfigTable.getSelectionCount() > 0) {
|
||||
mEditButton.setEnabled(true);
|
||||
mDelButton.setEnabled(true);
|
||||
} else {
|
||||
mEditButton.setEnabled(false);
|
||||
mDelButton.setEnabled(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,32 +48,57 @@ import java.util.ArrayList;
|
||||
*/
|
||||
public class SdkTargetSelector {
|
||||
|
||||
private final IAndroidTarget[] mTargets;
|
||||
private IAndroidTarget[] mTargets;
|
||||
private final boolean mAllowSelection;
|
||||
private final boolean mAllowMultipleSelection;
|
||||
private SelectionListener mSelectionListener;
|
||||
private Table mTable;
|
||||
private Label mDescription;
|
||||
private Composite mInnerGroup;
|
||||
|
||||
/**
|
||||
* Creates a new SDK Target Selector.
|
||||
*
|
||||
* @param parent The parent composite where the selector will be added.
|
||||
* @param targets The list of targets. This is <em>not</em> copied, the caller must not modify.
|
||||
* Targets can be null or an empty array, in which case the table is disabled.
|
||||
* @param allowMultipleSelection True if more than one SDK target can be selected at the same
|
||||
* time.
|
||||
*/
|
||||
public SdkTargetSelector(Composite parent, IAndroidTarget[] targets,
|
||||
boolean allowMultipleSelection) {
|
||||
this(parent, targets, true /*allowSelection*/, allowMultipleSelection);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new SDK Target Selector.
|
||||
*
|
||||
* @param parent The parent composite where the selector will be added.
|
||||
* @param targets The list of targets. This is <em>not</em> copied, the caller must not modify.
|
||||
* Targets can be null or an empty array, in which case the table is disabled.
|
||||
* @param allowSelection True if selection is enabled.
|
||||
* @param allowMultipleSelection True if more than one SDK target can be selected at the same
|
||||
* time.
|
||||
* time. Used only if allowSelection is true.
|
||||
*/
|
||||
public SdkTargetSelector(Composite parent, IAndroidTarget[] targets,
|
||||
boolean allowSelection,
|
||||
boolean allowMultipleSelection) {
|
||||
mTargets = targets;
|
||||
|
||||
// Layout has 1 column
|
||||
Composite group = new Composite(parent, SWT.NONE);
|
||||
group.setLayout(new GridLayout());
|
||||
group.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
group.setFont(parent.getFont());
|
||||
mInnerGroup = new Composite(parent, SWT.NONE);
|
||||
mInnerGroup.setLayout(new GridLayout());
|
||||
mInnerGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
mInnerGroup.setFont(parent.getFont());
|
||||
|
||||
mAllowSelection = allowSelection;
|
||||
mAllowMultipleSelection = allowMultipleSelection;
|
||||
mTable = new Table(group, SWT.CHECK | SWT.FULL_SELECTION | SWT.SINGLE | SWT.BORDER);
|
||||
int style = SWT.BORDER;
|
||||
if (allowSelection) {
|
||||
style |= SWT.CHECK | SWT.FULL_SELECTION;
|
||||
}
|
||||
if (!mAllowMultipleSelection) {
|
||||
style |= SWT.SINGLE;
|
||||
}
|
||||
mTable = new Table(mInnerGroup, style);
|
||||
mTable.setHeaderVisible(true);
|
||||
mTable.setLinesVisible(false);
|
||||
|
||||
@@ -84,7 +109,7 @@ public class SdkTargetSelector {
|
||||
data.verticalAlignment = GridData.FILL;
|
||||
mTable.setLayoutData(data);
|
||||
|
||||
mDescription = new Label(group, SWT.WRAP);
|
||||
mDescription = new Label(mInnerGroup, SWT.WRAP);
|
||||
mDescription.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
|
||||
// create the table columns
|
||||
@@ -93,15 +118,26 @@ public class SdkTargetSelector {
|
||||
final TableColumn column1 = new TableColumn(mTable, SWT.NONE);
|
||||
column1.setText("Vendor");
|
||||
final TableColumn column2 = new TableColumn(mTable, SWT.NONE);
|
||||
column2.setText("API Level");
|
||||
column2.setText("Version");
|
||||
final TableColumn column3 = new TableColumn(mTable, SWT.NONE);
|
||||
column3.setText("SDK");
|
||||
column3.setText("API Level");
|
||||
|
||||
adjustColumnsWidth(mTable, column0, column1, column2, column3);
|
||||
setupSelectionListener(mTable);
|
||||
fillTable(mTable);
|
||||
setTargets(targets);
|
||||
setupTooltip(mTable);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the layout data of the inner composite widget that contains the target selector.
|
||||
* By default the layout data is set to a {@link GridData} with a {@link GridData#FILL_BOTH}
|
||||
* mode.
|
||||
* <p/>
|
||||
* This can be useful if you want to change the {@link GridData#horizontalSpan} for example.
|
||||
*/
|
||||
public Object getLayoutData() {
|
||||
return mInnerGroup.getLayoutData();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the list of known targets.
|
||||
@@ -112,6 +148,16 @@ public class SdkTargetSelector {
|
||||
return mTargets;
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes the targets of the SDK Target Selector.
|
||||
*
|
||||
* @param targets The list of targets. This is <em>not</em> copied, the caller must not modify.
|
||||
*/
|
||||
public void setTargets(IAndroidTarget[] targets) {
|
||||
mTargets = targets;
|
||||
fillTable(mTable);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets a selection listener. Set it to null to remove it.
|
||||
* The listener will be called <em>after</em> this table processed its selection
|
||||
@@ -139,6 +185,10 @@ public class SdkTargetSelector {
|
||||
* @return true if the target could be selected, false otherwise.
|
||||
*/
|
||||
public boolean setSelection(IAndroidTarget target) {
|
||||
if (!mAllowSelection) {
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean found = false;
|
||||
boolean modified = false;
|
||||
for (TableItem i : mTable.getItems()) {
|
||||
@@ -224,6 +274,10 @@ public class SdkTargetSelector {
|
||||
* double-clicked (aka "the default selection").
|
||||
*/
|
||||
private void setupSelectionListener(final Table table) {
|
||||
if (!mAllowSelection) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Add a selection listener that will check/uncheck items when they are double-clicked
|
||||
table.addSelectionListener(new SelectionListener() {
|
||||
/** Default selection means double-click on "most" platforms */
|
||||
@@ -281,6 +335,9 @@ public class SdkTargetSelector {
|
||||
* </ul>
|
||||
*/
|
||||
private void fillTable(final Table table) {
|
||||
|
||||
table.removeAll();
|
||||
|
||||
if (mTargets != null && mTargets.length > 0) {
|
||||
table.setEnabled(true);
|
||||
for (IAndroidTarget target : mTargets) {
|
||||
|
||||
Reference in New Issue
Block a user