# HG changeset patch # User Alex Kotchnev # Date 1258774398 18000 # Node ID 8c758be195fb9d41c752c9a9c70e1ed06dafe986 # Parent 81c5f6b4e646dcf8f59ca32aabc60db82e9aa282 added sdk_r3 jars and fixed compile errors. Tests are still broken diff -r 81c5f6b4e646 -r 8c758be195fb androidprefs/manifest.mf --- a/androidprefs/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/androidprefs/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.android.androidprefs OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/androidprefs/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 AutoUpdate-Show-In-Client: false diff -r 81c5f6b4e646 -r 8c758be195fb androidprefs/release/modules/ext/androidprefs.jar Binary file androidprefs/release/modules/ext/androidprefs.jar has changed diff -r 81c5f6b4e646 -r 8c758be195fb ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java --- a/ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java Thu Sep 24 00:51:11 2009 -0400 +++ b/ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java Fri Nov 20 22:33:18 2009 -0500 @@ -17,7 +17,7 @@ import com.android.ddmlib.AndroidDebugBridge; import com.android.ddmlib.Client; -import com.android.ddmlib.Device; +import com.android.ddmlib.IDevice; import java.util.logging.Logger; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -68,8 +68,8 @@ AndroidDebugBridge.addClientChangeListener(listener); try { //Is the app already ready? - final Device[] devices = bridge.getDevices(); - for (Device device : devices) { + final IDevice[] devices = bridge.getDevices(); + for (IDevice device : devices) { final Client client = device.getClient(app); if (client != null) { LOG.fine("Found client: "+ client + " port: " + client.getDebuggerListenPort()); //NOI18N diff -r 81c5f6b4e646 -r 8c758be195fb ant/manifest.mf --- a/ant/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/ant/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -2,7 +2,7 @@ OpenIDE-Module: org.netbeans.modules.android.ant OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/ant/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/android/ant/layer.xml -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6 AutoUpdate-Show-In-Client: false diff -r 81c5f6b4e646 -r 8c758be195fb core/manifest.mf --- a/core/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/core/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -2,7 +2,7 @@ OpenIDE-Module: org.netbeans.modules.android.core OpenIDE-Module-Layer: org/netbeans/modules/android/core/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/core/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6 AutoUpdate-Show-In-Client: false diff -r 81c5f6b4e646 -r 8c758be195fb core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java --- a/core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java Thu Sep 24 00:51:11 2009 -0400 +++ b/core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java Fri Nov 20 22:33:18 2009 -0500 @@ -16,7 +16,7 @@ package org.netbeans.modules.android.core.ddm; import com.android.ddmlib.DebugPortManager.IDebugPortProvider; -import com.android.ddmlib.Device; +import com.android.ddmlib.IDevice; /** * @@ -28,7 +28,7 @@ private DebugPortProvider() {} - public int getPort(Device device, String appName) { + public int getPort(IDevice device, String appName) { return DebugPortProvider.NO_STATIC_PORT; } diff -r 81c5f6b4e646 -r 8c758be195fb core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java --- a/core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java Thu Sep 24 00:51:11 2009 -0400 +++ b/core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java Fri Nov 20 22:33:18 2009 -0500 @@ -15,7 +15,7 @@ package org.netbeans.modules.android.core.ui; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.avd.AvdManager.AvdInfo; +import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import javax.swing.JTable; import javax.swing.table.DefaultTableModel; @@ -79,7 +79,7 @@ for (AvdInfo info : infos) { IAndroidTarget target = info.getTarget(); tableModel.addRow(new Object[] { - info.getName(), target.getName(), target.getApiVersionName(), target.getApiVersionNumber() + info.getName(), target.getName(), target.getVersionName(), target.getVersion() }); } } diff -r 81c5f6b4e646 -r 8c758be195fb core/src/org/netbeans/modules/android/core/ui/DeviceNode.java --- a/core/src/org/netbeans/modules/android/core/ui/DeviceNode.java Thu Sep 24 00:51:11 2009 -0400 +++ b/core/src/org/netbeans/modules/android/core/ui/DeviceNode.java Fri Nov 20 22:33:18 2009 -0500 @@ -17,7 +17,8 @@ import com.android.ddmlib.AndroidDebugBridge; import com.android.ddmlib.Client; -import com.android.ddmlib.Device; +//import com.android.ddmlib.Device; +import com.android.ddmlib.IDevice; import com.android.ddmlib.RawImage; import java.awt.image.BufferedImage; import java.awt.image.DataBuffer; @@ -60,9 +61,9 @@ */ public class DeviceNode extends AbstractNode implements AndroidDebugBridge.IDeviceChangeListener { - private final Device device; + private final IDevice device; - DeviceNode (final Device device) { + DeviceNode (final IDevice device) { super (new DeviceChildren(device),Lookups.fixed(device)); assert device != null; this.device = device; @@ -93,7 +94,7 @@ private void updateDescription () { final String serNum = this.device.getSerialNumber(); - final Device.DeviceState state = this.device.getState(); + final IDevice.DeviceState state = this.device.getState(); this.setShortDescription(NbBundle.getMessage(DeviceNode.class, "HINT_Device",serNum,state.toString())); } @@ -180,14 +181,14 @@ } - public void deviceConnected(Device device) { + public void deviceConnected(IDevice device) { } - public void deviceDisconnected(Device device) { + public void deviceDisconnected(IDevice device) { } - public void deviceChanged(Device device, int changeType) { - if (this.device.equals(device) && (changeType & Device.CHANGE_STATE) == Device.CHANGE_STATE) { + public void deviceChanged(IDevice device, int changeType) { + if (this.device.equals(device) && (changeType & IDevice.CHANGE_STATE) == IDevice.CHANGE_STATE) { this.updateDescription(); firePropertySetsChange(null, null); } @@ -196,9 +197,9 @@ private static class DeviceChildren extends Children.Keys implements AndroidDebugBridge.IDeviceChangeListener { - private final Device device; + private final IDevice device; - public DeviceChildren(final Device device) { + public DeviceChildren(final IDevice device) { assert device != null; this.device = device; } @@ -231,16 +232,16 @@ return new Node[] {new ClientNode(key.client)}; } - public void deviceConnected(Device device) { + public void deviceConnected(IDevice device) { //Not important } - public void deviceDisconnected(Device device) { + public void deviceDisconnected(IDevice device) { //Not important } - public void deviceChanged(Device device, int eventType) { - if (this.device.equals(device) && (eventType & Device.CHANGE_CLIENT_LIST) == Device.CHANGE_CLIENT_LIST) { + public void deviceChanged(IDevice device, int eventType) { + if (this.device.equals(device) && (eventType & IDevice.CHANGE_CLIENT_LIST) == IDevice.CHANGE_CLIENT_LIST) { SwingUtilities.invokeLater(new Runnable() { public void run() { updateKeys(); @@ -288,7 +289,7 @@ protected void performAction(Node[] nodes) { assert nodes != null; assert nodes.length == 1; - final Device device = nodes[0].getLookup().lookup(Device.class); + final IDevice device = nodes[0].getLookup().lookup(IDevice.class); assert device != null; try { final RawImage image = device.getScreenshot(); @@ -328,7 +329,7 @@ if (nodes.length != 1) { return false; } - return nodes[0].getLookup().lookup(Device.class) != null; + return nodes[0].getLookup().lookup(IDevice.class) != null; } @Override diff -r 81c5f6b4e646 -r 8c758be195fb core/src/org/netbeans/modules/android/core/ui/DevicesNode.java --- a/core/src/org/netbeans/modules/android/core/ui/DevicesNode.java Thu Sep 24 00:51:11 2009 -0400 +++ b/core/src/org/netbeans/modules/android/core/ui/DevicesNode.java Fri Nov 20 22:33:18 2009 -0500 @@ -16,7 +16,7 @@ package org.netbeans.modules.android.core.ui; import com.android.ddmlib.AndroidDebugBridge; -import com.android.ddmlib.Device; +import com.android.ddmlib.IDevice; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.CharConversionException; @@ -167,7 +167,7 @@ final Set keys = new HashSet(); final AndroidDebugBridge bridge = AndroidDebugBridgeFactory.getDefault(); if (bridge != null) { - for (Device device : bridge.getDevices()) { + for (IDevice device : bridge.getDevices()) { keys.add(new DeviceHolder(device)); } } @@ -203,15 +203,15 @@ } } - public void deviceConnected(Device arg0) { + public void deviceConnected(IDevice arg0) { updateKeysAsync(); } - public void deviceDisconnected(Device arg0) { + public void deviceDisconnected(IDevice arg0) { updateKeysAsync(); } - public void deviceChanged(Device arg0, int arg1) { + public void deviceChanged(IDevice arg0, int arg1) { //Handled by node itself } @@ -219,9 +219,9 @@ private static class DeviceHolder { - public final Device device; + public final IDevice device; - public DeviceHolder (final Device device) { + public DeviceHolder (final IDevice device) { assert device != null; this.device = device; } diff -r 81c5f6b4e646 -r 8c758be195fb ddmlib/manifest.mf --- a/ddmlib/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/ddmlib/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: com.android.ddmlib OpenIDE-Module-Localizing-Bundle: com/android/ddmlib/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 diff -r 81c5f6b4e646 -r 8c758be195fb ddmlib/release/modules/ext/ddmlib.jar Binary file ddmlib/release/modules/ext/ddmlib.jar has changed diff -r 81c5f6b4e646 -r 8c758be195fb grammars/manifest.mf --- a/grammars/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/grammars/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -2,7 +2,7 @@ OpenIDE-Module: org.netbeans.modules.android.grammars OpenIDE-Module-Layer: org/netbeans/modules/android/grammars/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/grammars/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6 AutoUpdate-Show-In-Client: false diff -r 81c5f6b4e646 -r 8c758be195fb kit/manifest.mf --- a/kit/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/kit/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.android.kit OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/kit/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6 diff -r 81c5f6b4e646 -r 8c758be195fb logcat/manifest.mf --- a/logcat/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/logcat/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -1,8 +1,8 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.android.logcat -OpenIDE-Module-Install: org/nyerel/nbandroid/logcat/Installer.class -OpenIDE-Module-Layer: org/nyerel/nbandroid/logcat/layer.xml -OpenIDE-Module-Localizing-Bundle: org/nyerel/nbandroid/logcat/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 -OpenIDE-Module-Java-Dependencies: Java > 1.6 - +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.android.logcat +OpenIDE-Module-Install: org/nyerel/nbandroid/logcat/Installer.class +OpenIDE-Module-Layer: org/nyerel/nbandroid/logcat/layer.xml +OpenIDE-Module-Localizing-Bundle: org/nyerel/nbandroid/logcat/Bundle.properties +OpenIDE-Module-Specification-Version: 0.91 +OpenIDE-Module-Java-Dependencies: Java > 1.6 + diff -r 81c5f6b4e646 -r 8c758be195fb logcat/src/org/nyerel/nbandroid/logcat/LogReader.java --- a/logcat/src/org/nyerel/nbandroid/logcat/LogReader.java Thu Sep 24 00:51:11 2009 -0400 +++ b/logcat/src/org/nyerel/nbandroid/logcat/LogReader.java Fri Nov 20 22:33:18 2009 -0500 @@ -14,7 +14,7 @@ package org.nyerel.nbandroid.logcat; import com.android.ddmlib.AndroidDebugBridge; -import com.android.ddmlib.Device; +import com.android.ddmlib.IDevice; import com.android.ddmlib.Log.LogLevel; import com.android.ddmlib.MultiLineReceiver; import java.io.IOException; @@ -41,7 +41,7 @@ private static final Logger LOG = Logger.getLogger(LogReader.class.getName()); private Set listeners; - private Device device; + private IDevice device; private LogCatOutputReceiver receiver; private LogEventInfo lastLogEventInfo; private static Pattern sLogPattern = Pattern.compile( @@ -79,7 +79,7 @@ } boolean gotIt = false; LOG.info("searching for device with sn: " + device.getSerialNumber()); - for (Device d: adb.getDevices()) { + for (IDevice d: adb.getDevices()) { LOG.info("device: " + d.getSerialNumber()); if (d.equals(device)) { gotIt = true; @@ -180,7 +180,7 @@ } private void reallyStartReading() { - Device[] devs = adb.getDevices(); + IDevice[] devs = adb.getDevices(); if (devs != null && devs.length > 0) { device = devs[0]; } else { diff -r 81c5f6b4e646 -r 8c758be195fb platform/manifest.mf --- a/platform/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/platform/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -3,6 +3,6 @@ OpenIDE-Module: org.netbeans.modules.android.platform OpenIDE-Module-Layer: org/netbeans/modules/android/platform/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/platform/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6 diff -r 81c5f6b4e646 -r 8c758be195fb platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java --- a/platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java Thu Sep 24 00:51:11 2009 -0400 +++ b/platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java Fri Nov 20 22:33:18 2009 -0500 @@ -106,7 +106,7 @@ int i = 0; for (IAndroidTarget target : targets) { tableModel.addRow(new Object[] { - target.getName(), target.getDescription(), target.getApiVersionName()}); + target.getName(), target.getDescription(), target.getVersionName()}); if (target.getLocation().equals(targetLocation)) { selectRow = i; } diff -r 81c5f6b4e646 -r 8c758be195fb project/nbproject/project.properties --- a/project/nbproject/project.properties Thu Sep 24 00:51:11 2009 -0400 +++ b/project/nbproject/project.properties Fri Nov 20 22:33:18 2009 -0500 @@ -7,7 +7,7 @@ nbm.homepage=http://nbandroid.kenai.com nbm.module.author=Martin Adamek, Radim Kubacki, Tomas Zezula -spec.version.base=0.9 +spec.version.base=0.91 test.unit.cp.extra=${test.dist.dir}/unit/platform9/org-openide-util/tests.jar:\ ${test.dist.dir}/unit/platform9/org-openide-filesystems/tests.jar:\ ${test.dist.dir}/unit/ide10/org-netbeans-modules-projectapi/tests.jar:\ diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/AndroidActionProvider.java --- a/project/src/org/netbeans/modules/android/project/AndroidActionProvider.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/AndroidActionProvider.java Fri Nov 20 22:33:18 2009 -0500 @@ -16,8 +16,9 @@ import com.android.ddmlib.IDevice; import com.android.prefs.AndroidLocation.AndroidLocationException; -import com.android.sdklib.avd.AvdManager; -import com.android.sdklib.avd.AvdManager.AvdInfo; +import com.android.sdklib.ISdkLog; +import com.android.sdklib.internal.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import java.awt.Dialog; import java.io.IOException; import java.io.InputStream; @@ -604,11 +605,12 @@ } String targetMode = this.project.evaluator().getProperty(AndroidProjectProperties.PROP_TARGET_MODE); String targetAvd = this.project.evaluator().getProperty(AndroidProjectProperties.PROP_TARGET_PREFFERED_AVD); - final AvdManager avdMgr = new AvdManager(sdkTarget.getSdk(), SdkLogProvider.createSdkLogger(true)); + final ISdkLog sdkLog = SdkLogProvider.createSdkLogger(true); + final AvdManager avdMgr = new AvdManager(sdkTarget.getSdk(), sdkLog); AvdSelector.AvdManagerMock avdMgrMock = new AvdSelector.AvdManagerMock() { public void reloadAvds() throws AndroidLocationException { - avdMgr.reloadAvds(); + avdMgr.reloadAvds(sdkLog); } public AvdInfo getAvd(String name, boolean validAvdOnly) { diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/AvdSelector.java --- a/project/src/org/netbeans/modules/android/project/AvdSelector.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/AvdSelector.java Fri Nov 20 22:33:18 2009 -0500 @@ -19,8 +19,8 @@ import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.IAndroidTarget; import com.android.sdklib.SdkManager; -import com.android.sdklib.avd.AvdManager; -import com.android.sdklib.avd.AvdManager.AvdInfo; +import com.android.sdklib.internal.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import java.util.HashMap; import java.util.Map; import org.openide.util.Exceptions; @@ -168,7 +168,7 @@ System.out.println("Device "+ device + " has API string " + apiString); try { int apiNumber = Integer.parseInt(apiString); - if (apiNumber >= target.getApiVersionNumber()) { + if (apiNumber >= target.getVersion().getApiLevel()) { // device is compatible with project compatibleAvds.put(device, null); continue; @@ -202,7 +202,7 @@ for (AvdInfo avd : avds) { if (target.isCompatibleBaseFor(avd.getTarget())) { if (bestMatchAvd == null || - avd.getTarget().getApiVersionNumber() < bestMatchAvd.getTarget().getApiVersionNumber()) { + avd.getTarget().getVersion().getApiLevel() < bestMatchAvd.getTarget().getVersion().getApiLevel()) { bestMatchAvd = avd; } } diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/DeviceChooser.java --- a/project/src/org/netbeans/modules/android/project/DeviceChooser.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/DeviceChooser.java Fri Nov 20 22:33:18 2009 -0500 @@ -16,7 +16,7 @@ package org.netbeans.modules.android.project; import com.android.ddmlib.IDevice; -import com.android.sdklib.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager; import org.netbeans.modules.android.project.AvdSelector.LaunchData; /** diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java --- a/project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java Fri Nov 20 22:33:18 2009 -0500 @@ -15,7 +15,7 @@ package org.netbeans.modules.android.project.ui.customizer; import com.android.prefs.AndroidLocation.AndroidLocationException; -import com.android.sdklib.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager; import java.awt.Component; import java.awt.Font; import java.awt.event.ActionEvent; diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java --- a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java Fri Nov 20 22:33:18 2009 -0500 @@ -16,7 +16,7 @@ package org.netbeans.modules.android.project.ui.customizer; import com.android.ddmlib.IDevice; -import com.android.sdklib.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager; import org.netbeans.modules.android.project.*; import java.awt.Dialog; import org.netbeans.modules.android.project.AvdSelector.LaunchData; diff -r 81c5f6b4e646 -r 8c758be195fb project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java --- a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java Fri Nov 20 22:33:18 2009 -0500 @@ -14,10 +14,10 @@ package org.netbeans.modules.android.project.ui.customizer; -import com.android.ddmlib.Device.DeviceState; import com.android.ddmlib.IDevice; -import com.android.sdklib.avd.AvdManager; -import com.android.sdklib.avd.AvdManager.AvdInfo; +import com.android.ddmlib.IDevice.DeviceState; +import com.android.sdklib.internal.avd.AvdManager; +import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import javax.swing.event.ListSelectionEvent; diff -r 81c5f6b4e646 -r 8c758be195fb project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java --- a/project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java Thu Sep 24 00:51:11 2009 -0400 +++ b/project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java Fri Nov 20 22:33:18 2009 -0500 @@ -14,7 +14,7 @@ package org.netbeans.modules.android.project; -import com.android.sdklib.avd.AvdManager.AvdInfo; +import com.android.sdklib.internal.avd.AvdManager.AvdInfo; import java.beans.PropertyChangeListener; import java.io.IOException; import java.io.OutputStream; diff -r 81c5f6b4e646 -r 8c758be195fb sdklib/manifest.mf --- a/sdklib/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/sdklib/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -1,5 +1,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.android.sdklib OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/sdklib/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 AutoUpdate-Show-In-Client: false diff -r 81c5f6b4e646 -r 8c758be195fb sdklib/nbproject/genfiles.properties --- a/sdklib/nbproject/genfiles.properties Thu Sep 24 00:51:11 2009 -0400 +++ b/sdklib/nbproject/genfiles.properties Fri Nov 20 22:33:18 2009 -0500 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=9111f7cc +build.xml.data.CRC32=4d02a8be build.xml.script.CRC32=098c7b18 -build.xml.stylesheet.CRC32=79c3b980@1.28.1.7 +build.xml.stylesheet.CRC32=79c3b980@1.31.0.7 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=9111f7cc +nbproject/build-impl.xml.data.CRC32=4d02a8be nbproject/build-impl.xml.script.CRC32=78298899 -nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.1.7 +nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.31.0.7 diff -r 81c5f6b4e646 -r 8c758be195fb sdklib/nbproject/project.xml --- a/sdklib/nbproject/project.xml Thu Sep 24 00:51:11 2009 -0400 +++ b/sdklib/nbproject/project.xml Fri Nov 20 22:33:18 2009 -0500 @@ -17,8 +17,7 @@ com.android.sdklib - com.android.sdklib.avd - com.android.sdklib.project + com.android.sdklib.internal.avd ext/sdklib.jar diff -r 81c5f6b4e646 -r 8c758be195fb sdklib/release/modules/ext/sdklib.jar Binary file sdklib/release/modules/ext/sdklib.jar has changed diff -r 81c5f6b4e646 -r 8c758be195fb xml/manifest.mf --- a/xml/manifest.mf Thu Sep 24 00:51:11 2009 -0400 +++ b/xml/manifest.mf Fri Nov 20 22:33:18 2009 -0500 @@ -3,6 +3,6 @@ OpenIDE-Module: org.netbeans.modules.android.xml OpenIDE-Module-Layer: org/netbeans/modules/android/xml/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/android/xml/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 0.9 +OpenIDE-Module-Specification-Version: 0.91 OpenIDE-Module-Java-Dependencies: Java > 1.6