[nbandroid~mercurial:178] Ignore 'Can't dispatch DDM chunk ...' lines in adb output to be able to d
- From: radim@kenai.com
- To: commits@nbandroid.kenai.com
- Subject: [nbandroid~mercurial:178] Ignore 'Can't dispatch DDM chunk ...' lines in adb output to be able to d
- Date: Sun, 17 Jan 2010 17:30:40 +0000
Project: nbandroid
Repository: mercurial
Revision: 178
Author: radim
Date: 2010-01-17 17:20:11 UTC
Link:
Log Message:
------------
Switched to NetBeans 6.7.1 as a platform.
Adding compile dependency on junit module to make NB editor happy (tests were
executed but Java support couldn't find junit.framework.* classes)
Switched to Andoid SDK r04 - applied patch from akochnev
More on switching to Andoid SDK r04
Fix dependencies to make logcat better part of suite
Fix dependencies to make logcat better part of suite
Fix dependencies to make logcat better part of suite
Fix dependencies to use build number during build
Ignore 'Can't dispatch DDM chunk ...' lines in adb output to be able to
deploy package.
Revisions:
----------
171
172
173
174
175
176
177
178
Modified Paths:
---------------
ant/nbproject/project.xml
platform/nbproject/project.xml
project/nbproject/project.properties
suite/nbproject/platform.properties
xml/nbproject/project.xml
androidprefs/manifest.mf
androidprefs/release/modules/ext/androidprefs.jar
ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java
ant/manifest.mf
core/manifest.mf
core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java
core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java
core/src/org/netbeans/modules/android/core/ui/DeviceNode.java
core/src/org/netbeans/modules/android/core/ui/DevicesNode.java
ddmlib/manifest.mf
ddmlib/release/modules/ext/ddmlib.jar
grammars/manifest.mf
kit/manifest.mf
logcat/manifest.mf
logcat/src/org/nyerel/nbandroid/logcat/LogReader.java
platform/manifest.mf
platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java
project/src/org/netbeans/modules/android/project/AndroidActionProvider.java
project/src/org/netbeans/modules/android/project/AvdSelector.java
project/src/org/netbeans/modules/android/project/DeviceChooser.java
project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java
sdklib/manifest.mf
sdklib/nbproject/genfiles.properties
sdklib/nbproject/project.xml
sdklib/release/modules/ext/sdklib.jar
xml/manifest.mf
ant/nbproject/genfiles.properties
grammars/test/unit/src/org/netbeans/modules/android/grammars/TestUtil.java
project/test/unit/src/org/netbeans/modules/android/project/AvdSelectorTest.java
xml/nbproject/genfiles.properties
logcat/nbproject/project.xml
project/nbproject/project.xml
core/nbproject/project.xml
kit/nbproject/project.xml
ant/antsrc/org/netbeans/modules/android/ant/AdbPackageManagerWait.java
ant/antsrc/org/netbeans/modules/android/ant/Util.java
Diffs:
------
diff -r 76db2f9f0cb9 -r c2ebf334df50 ant/nbproject/project.xml
--- a/ant/nbproject/project.xml Mon Sep 21 21:36:20 2009 -0700
+++ b/ant/nbproject/project.xml Sun Dec 20 21:50:37 2009 +0100
@@ -41,6 +41,15 @@
</run-dependency>
</dependency>
</module-dependencies>
+ <test-dependencies>
+ <test-type>
+ <name>unit</name>
+ <test-dependency>
+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ </test-type>
+ </test-dependencies>
<public-packages/>
<extra-compilation-unit>
<package-root>antsrc</package-root>
diff -r 76db2f9f0cb9 -r c2ebf334df50 platform/nbproject/project.xml
--- a/platform/nbproject/project.xml Mon Sep 21 21:36:20 2009 -0700
+++ b/platform/nbproject/project.xml Sun Dec 20 21:50:37 2009 +0100
@@ -151,6 +151,10 @@
<test-dependency>
<code-name-base>org.netbeans.modules.masterfs</code-name-base>
</test-dependency>
+ <test-dependency>
+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
</test-type>
</test-dependencies>
<friend-packages>
diff -r 76db2f9f0cb9 -r c2ebf334df50 project/nbproject/project.properties
--- a/project/nbproject/project.properties Mon Sep 21 21:36:20 2009 -0700
+++ b/project/nbproject/project.properties Sun Dec 20 21:50:37 2009 +0100
@@ -7,7 +7,7 @@
nbm.homepage=http://nbandroid.kenai.com
nbm.module.author=Martin Adamek, Radim Kubacki, Tomas Zezula
-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:\
+test.unit.cp.extra=${test.dist.dir}/unit/platform10/org-openide-util/tests.jar:\
+${test.dist.dir}/unit/platform10/org-openide-filesystems/tests.jar:\
+${test.dist.dir}/unit/ide11/org-netbeans-modules-projectapi/tests.jar:\
${basedir}/../libs/easymock.jar
diff -r 76db2f9f0cb9 -r c2ebf334df50 suite/nbproject/platform.properties
--- a/suite/nbproject/platform.properties Mon Sep 21 21:36:20 2009 -0700
+++ b/suite/nbproject/platform.properties Sun Dec 20 21:50:37 2009 +0100
@@ -12,4 +12,4 @@
# Location of test distribution (uses some calls from NetBeans 6.7)
# test.dist.dir=/home/radim/src/netbeans.org/release67/nbbuild/build/testdist
-nbplatform.active=default
+nbplatform.active=NetBeans_IDE_6.7.1
diff -r 76db2f9f0cb9 -r c2ebf334df50 xml/nbproject/project.xml
--- a/xml/nbproject/project.xml Mon Sep 21 21:36:20 2009 -0700
+++ b/xml/nbproject/project.xml Sun Dec 20 21:50:37 2009 +0100
@@ -117,6 +117,15 @@
</run-dependency>
</dependency>
</module-dependencies>
+ <test-dependencies>
+ <test-type>
+ <name>unit</name>
+ <test-dependency>
+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ </test-type>
+ </test-dependencies>
<public-packages/>
</data>
</configuration>
diff -r c2ebf334df50 -r 97f079b19b38 androidprefs/manifest.mf
--- a/androidprefs/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/androidprefs/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
androidprefs/release/modules/ext/androidprefs.jar
Binary file androidprefs/release/modules/ext/androidprefs.jar has changed
diff -r c2ebf334df50 -r 97f079b19b38
ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java
--- a/ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java Sun
Dec 20 21:50:37 2009 +0100
+++ b/ant/antsrc/org/netbeans/modules/android/ant/GetDebuggerPort.java Sun
Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 ant/manifest.mf
--- a/ant/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/ant/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 core/manifest.mf
--- a/core/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/core/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java
--- a/core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java
Sun Dec 20 21:50:37 2009 +0100
+++ b/core/src/org/netbeans/modules/android/core/ddm/DebugPortProvider.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java
--- a/core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java Sun
Dec 20 21:50:37 2009 +0100
+++ b/core/src/org/netbeans/modules/android/core/ui/AvdUISelector.java Sun
Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
core/src/org/netbeans/modules/android/core/ui/DeviceNode.java
--- a/core/src/org/netbeans/modules/android/core/ui/DeviceNode.java Sun
Dec 20 21:50:37 2009 +0100
+++ b/core/src/org/netbeans/modules/android/core/ui/DeviceNode.java Sun
Dec 20 22:06:11 2009 +0100
@@ -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<ClientHolder>
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 c2ebf334df50 -r 97f079b19b38
core/src/org/netbeans/modules/android/core/ui/DevicesNode.java
--- a/core/src/org/netbeans/modules/android/core/ui/DevicesNode.java Sun
Dec 20 21:50:37 2009 +0100
+++ b/core/src/org/netbeans/modules/android/core/ui/DevicesNode.java Sun
Dec 20 22:06:11 2009 +0100
@@ -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<DeviceHolder> keys = new HashSet<DeviceHolder>();
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 c2ebf334df50 -r 97f079b19b38 ddmlib/manifest.mf
--- a/ddmlib/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/ddmlib/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 ddmlib/release/modules/ext/ddmlib.jar
Binary file ddmlib/release/modules/ext/ddmlib.jar has changed
diff -r c2ebf334df50 -r 97f079b19b38 grammars/manifest.mf
--- a/grammars/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/grammars/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 kit/manifest.mf
--- a/kit/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/kit/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 logcat/manifest.mf
--- a/logcat/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/logcat/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
logcat/src/org/nyerel/nbandroid/logcat/LogReader.java
--- a/logcat/src/org/nyerel/nbandroid/logcat/LogReader.java Sun Dec 20
21:50:37 2009 +0100
+++ b/logcat/src/org/nyerel/nbandroid/logcat/LogReader.java Sun Dec 20
22:06:11 2009 +0100
@@ -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<LogListener> 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 c2ebf334df50 -r 97f079b19b38 platform/manifest.mf
--- a/platform/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/platform/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java
---
a/platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/platform/src/org/netbeans/modules/android/platform/wizard/AndroidConfigurePanel.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/AndroidActionProvider.java
---
a/project/src/org/netbeans/modules/android/project/AndroidActionProvider.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/project/src/org/netbeans/modules/android/project/AndroidActionProvider.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/AvdSelector.java
--- a/project/src/org/netbeans/modules/android/project/AvdSelector.java Sun
Dec 20 21:50:37 2009 +0100
+++ b/project/src/org/netbeans/modules/android/project/AvdSelector.java Sun
Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/DeviceChooser.java
--- a/project/src/org/netbeans/modules/android/project/DeviceChooser.java
Sun Dec 20 21:50:37 2009 +0100
+++ b/project/src/org/netbeans/modules/android/project/DeviceChooser.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java
---
a/project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/project/src/org/netbeans/modules/android/project/ui/customizer/CustomizerRun.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
---
a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
---
a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38
project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java
---
a/project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java
Sun Dec 20 21:50:37 2009 +0100
+++
b/project/test/unit/src/org/netbeans/modules/android/project/AndroidActionProviderTest.java
Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 sdklib/manifest.mf
--- a/sdklib/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/sdklib/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 sdklib/nbproject/genfiles.properties
--- a/sdklib/nbproject/genfiles.properties Sun Dec 20 21:50:37 2009 +0100
+++ b/sdklib/nbproject/genfiles.properties Sun Dec 20 22:06:11 2009 +0100
@@ -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 c2ebf334df50 -r 97f079b19b38 sdklib/nbproject/project.xml
--- a/sdklib/nbproject/project.xml Sun Dec 20 21:50:37 2009 +0100
+++ b/sdklib/nbproject/project.xml Sun Dec 20 22:06:11 2009 +0100
@@ -17,8 +17,7 @@
</module-dependencies>
<public-packages>
<package>com.android.sdklib</package>
- <package>com.android.sdklib.avd</package>
- <package>com.android.sdklib.project</package>
+ <package>com.android.sdklib.internal.avd</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/sdklib.jar</runtime-relative-path>
diff -r c2ebf334df50 -r 97f079b19b38 sdklib/release/modules/ext/sdklib.jar
Binary file sdklib/release/modules/ext/sdklib.jar has changed
diff -r c2ebf334df50 -r 97f079b19b38 xml/manifest.mf
--- a/xml/manifest.mf Sun Dec 20 21:50:37 2009 +0100
+++ b/xml/manifest.mf Sun Dec 20 22:06:11 2009 +0100
@@ -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
diff -r 97f079b19b38 -r 0d313358799b ant/nbproject/genfiles.properties
--- a/ant/nbproject/genfiles.properties Sun Dec 20 22:06:11 2009 +0100
+++ b/ant/nbproject/genfiles.properties Sat Jan 16 14:56:52 2010 +0100
@@ -3,6 +3,6 @@
build.xml.stylesheet.CRC32=79c3b980
# 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=5e616efe
+nbproject/build-impl.xml.data.CRC32=00d1f403
nbproject/build-impl.xml.script.CRC32=6de8cd4b
-nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.1.7
+nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.31.1.7
diff -r 97f079b19b38 -r 0d313358799b
grammars/test/unit/src/org/netbeans/modules/android/grammars/TestUtil.java
---
a/grammars/test/unit/src/org/netbeans/modules/android/grammars/TestUtil.java
Sun Dec 20 22:06:11 2009 +0100
+++
b/grammars/test/unit/src/org/netbeans/modules/android/grammars/TestUtil.java
Sat Jan 16 14:56:52 2010 +0100
@@ -44,6 +44,8 @@
"android-sdk-windows-1.1_r1" : "android-sdk-linux_x86-1.1_r1";
public static final String SDK_1_5_NAME = Utilities.isWindows() ?
"android-sdk-windows-1.5_r3" : "android-sdk-linux_x86-1.5_r3";
+ public static final String SDK_R04_NAME = Utilities.isWindows() ?
+ "android-sdk-windows" : "android-sdk-linux_x86";
private TestUtil() {
}
diff -r 97f079b19b38 -r 0d313358799b
project/test/unit/src/org/netbeans/modules/android/project/AvdSelectorTest.java
---
a/project/test/unit/src/org/netbeans/modules/android/project/AvdSelectorTest.java
Sun Dec 20 22:06:11 2009 +0100
+++
b/project/test/unit/src/org/netbeans/modules/android/project/AvdSelectorTest.java
Sat Jan 16 14:56:52 2010 +0100
@@ -18,8 +18,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 junit.framework.TestCase;
import org.easymock.EasyMock;
import org.netbeans.modules.android.project.AvdSelector.AvdManagerMock;
diff -r 97f079b19b38 -r 0d313358799b xml/nbproject/genfiles.properties
--- a/xml/nbproject/genfiles.properties Sun Dec 20 22:06:11 2009 +0100
+++ b/xml/nbproject/genfiles.properties Sat Jan 16 14:56:52 2010 +0100
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ad49086b
+build.xml.data.CRC32=747174e3
build.xml.script.CRC32=8a4c05a2
-build.xml.stylesheet.CRC32=79c3b980@1.28.1.7
+build.xml.stylesheet.CRC32=79c3b980@1.31.1.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=ad49086b
+nbproject/build-impl.xml.data.CRC32=747174e3
nbproject/build-impl.xml.script.CRC32=aa520386
-nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.1.7
+nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.31.1.7
diff -r 0d313358799b -r 8b4ed29467db logcat/manifest.mf
--- a/logcat/manifest.mf Sat Jan 16 14:56:52 2010 +0100
+++ b/logcat/manifest.mf Sun Jan 17 14:01:40 2010 +0100
@@ -3,6 +3,7 @@
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
+AutoUpdate-Show-In-Client: false
OpenIDE-Module-Specification-Version: 0.91
OpenIDE-Module-Java-Dependencies: Java > 1.6
diff -r 0d313358799b -r 8b4ed29467db logcat/nbproject/project.xml
--- a/logcat/nbproject/project.xml Sat Jan 16 14:56:52 2010 +0100
+++ b/logcat/nbproject/project.xml Sun Jan 17 14:01:40 2010 +0100
@@ -11,7 +11,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
diff -r 0d313358799b -r 8b4ed29467db project/nbproject/project.xml
--- a/project/nbproject/project.xml Sat Jan 16 14:56:52 2010 +0100
+++ b/project/nbproject/project.xml Sun Jan 17 14:01:40 2010 +0100
@@ -11,7 +11,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <specification-version>0.8</specification-version>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
diff -r 8b4ed29467db -r ed6cec0083dc logcat/nbproject/project.xml
--- a/logcat/nbproject/project.xml Sun Jan 17 14:01:40 2010 +0100
+++ b/logcat/nbproject/project.xml Sun Jan 17 14:02:16 2010 +0100
@@ -28,7 +28,7 @@
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
diff -r ed6cec0083dc -r 6e483be68382 core/nbproject/project.xml
--- a/core/nbproject/project.xml Sun Jan 17 14:02:16 2010 +0100
+++ b/core/nbproject/project.xml Sun Jan 17 14:08:05 2010 +0100
@@ -116,6 +116,7 @@
<friend-packages>
<friend>org.netbeans.modules.android.ant</friend>
<friend>org.netbeans.modules.android.kit</friend>
+ <friend>org.netbeans.modules.android.logcat</friend>
<friend>org.netbeans.modules.android.platform</friend>
<friend>org.netbeans.modules.android.project</friend>
<package>org.netbeans.modules.android.core.ddm</package>
diff -r 6e483be68382 -r 584daffd7ade kit/nbproject/project.xml
--- a/kit/nbproject/project.xml Sun Jan 17 14:08:05 2010 +0100
+++ b/kit/nbproject/project.xml Sun Jan 17 14:27:29 2010 +0100
@@ -10,70 +10,70 @@
<code-name-base>com.android.ddmlib</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.androidprefs</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.ant</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.core</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.grammars</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.logcat</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.platform</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.project</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.sdklib</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.android.xml</code-name-base>
<build-prerequisite/>
<run-dependency>
- <implementation-version/>
+ <specification-version>0.9</specification-version>
</run-dependency>
</dependency>
<dependency>
diff -r 584daffd7ade -r 8a79d33a7d23
ant/antsrc/org/netbeans/modules/android/ant/AdbPackageManagerWait.java
--- a/ant/antsrc/org/netbeans/modules/android/ant/AdbPackageManagerWait.java
Sun Jan 17 14:27:29 2010 +0100
+++ b/ant/antsrc/org/netbeans/modules/android/ant/AdbPackageManagerWait.java
Sun Jan 17 18:20:11 2010 +0100
@@ -94,7 +94,7 @@
Process p = util.adb(prefix + "shell pm path android"); // NOI18N
BufferedReader r = new BufferedReader (new
InputStreamReader(p.getInputStream(),"UTF-8")); // NOI18N
String line;
- if ((line = r.readLine()) != null) {
+ while ((line = r.readLine()) != null) {
if (line.startsWith("package:/")) { // NOI18N
return true;
}
diff -r 584daffd7ade -r 8a79d33a7d23
ant/antsrc/org/netbeans/modules/android/ant/Util.java
--- a/ant/antsrc/org/netbeans/modules/android/ant/Util.java Sun Jan 17
14:27:29 2010 +0100
+++ b/ant/antsrc/org/netbeans/modules/android/ant/Util.java Sun Jan 17
18:20:11 2010 +0100
@@ -16,12 +16,14 @@
import java.io.File;
import java.io.IOException;
+import java.util.logging.Logger;
/**
*
* @author Martin Adamek
*/
public class Util {
+ private static final Logger LOG = Logger.getLogger(Util.class.getName());
private final File adb;
@@ -36,7 +38,9 @@
Process adb (final String command) throws IOException {
assert command != null;
final Runtime rt = Runtime.getRuntime();
- Process p = rt.exec(adb.getAbsolutePath()+" "+command);
+ String cmd = adb.getAbsolutePath() + " " + command;
+ LOG.info("Running command '" + cmd + "'");
+ Process p = rt.exec(cmd);
return p;
}
|
[nbandroid~mercurial:178] Ignore 'Can't dispatch DDM chunk ...' lines in adb output to be able to d |
radim | 01/17/2010 |
