[nbandroid~mercurial:533] Update module version.

[radim@kenai.com]

Project:    nbandroid
Repository: mercurial
Revision:   533
Author:     radim
Date:       2012-02-02 13:09:29 UTC
Link:       

Log Message:
------------
Accept double click in device selection dialog.
Merge
Update module version.


Revisions:
----------
531
532
533


Modified Paths:
---------------
project/src/org/netbeans/modules/android/project/AvdSelector.java
project/src/org/netbeans/modules/android/project/launch/AndroidLauncherImpl.java
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.form
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
logcat/manifest.mf
logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java
project/manifest.mf


Diffs:
------
diff -r 63688e4dd412 -r 73e0a43ce675 
project/src/org/netbeans/modules/android/project/AvdSelector.java
--- a/project/src/org/netbeans/modules/android/project/AvdSelector.java Fri 
Dec 30 14:24:28 2011 +0100
+++ b/project/src/org/netbeans/modules/android/project/AvdSelector.java Thu 
Feb 02 12:05:47 2012 +0100
@@ -66,6 +66,11 @@
     public IDevice getDevice() {
       return device;
     }
+
+    @Override
+    public String toString() {
+      return "LaunchData{" + "avdInfo=" + avdInfo + ", device=" + device + 
'}';
+    }
   }
 
   public interface AvdManagerMock { // TODO AvdManager should be interface

diff -r 63688e4dd412 -r 73e0a43ce675 
project/src/org/netbeans/modules/android/project/launch/AndroidLauncherImpl.java
--- 
a/project/src/org/netbeans/modules/android/project/launch/AndroidLauncherImpl.java
  Fri Dec 30 14:24:28 2011 +0100
+++ 
b/project/src/org/netbeans/modules/android/project/launch/AndroidLauncherImpl.java
  Thu Feb 02 12:05:47 2012 +0100
@@ -193,14 +193,14 @@
   public boolean simpleLaunch(LaunchInfo launchInfo, IDevice device) {
     // API level check
     if (!checkBuildInfo(launchInfo, device)) {
-      LOG.log(Level.INFO, "Launch canceled!");
+      LOG.log(Level.INFO, "Launch cancelled! Build info does not pass the 
check");
       stopLaunch(launchInfo);
       return false;
     }
 
     // sync the app
     if (!syncApp(launchInfo, device)) {
-      LOG.log(Level.INFO, "Launch canceled!");
+      LOG.log(Level.INFO, "Launch cancelled! Cannot sync the app");
       stopLaunch(launchInfo);
       return false;
     }

diff -r 63688e4dd412 -r 73e0a43ce675 
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
--- 
a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
     Fri Dec 30 14:24:28 2011 +0100
+++ 
b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceChooserImpl.java
     Thu Feb 02 12:05:47 2012 +0100
@@ -39,7 +39,7 @@
   public LaunchData selectDevice(AvdManager avdManager, IDevice[] devices) {
 
     final DeviceUiChooser panel = new DeviceUiChooser(avdManager, devices);
-    Object[] options = new Object[]{
+    final Object[] options = new Object[]{
       DialogDescriptor.OK_OPTION,
       DialogDescriptor.CANCEL_OPTION
     };
@@ -57,7 +57,15 @@
       }
     });
 
-    Dialog dlg = DialogDisplayer.getDefault().createDialog(desc);
+    final Dialog dlg = DialogDisplayer.getDefault().createDialog(desc);
+    panel.addSelectCallback(new Runnable() {
+
+      @Override
+      public void run() {
+        dlg.setVisible(false);
+        desc.setValue(options[0]);
+      }
+    });
     dlg.setVisible(true);
     dlg.dispose();
     if (desc.getValue() == options[0]) {

diff -r 63688e4dd412 -r 73e0a43ce675 
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.form
--- 
a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.form
       Fri Dec 30 14:24:28 2011 +0100
+++ 
b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.form
       Thu Feb 02 12:05:47 2012 +0100
@@ -73,11 +73,6 @@
       </Events>
     </Component>
     <Container class="javax.swing.JScrollPane" name="jScrollPane1">
-      <Properties>
-        <Property name="preferredSize" type="java.awt.Dimension" 
editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="null"/>
-        </Property>
-      </Properties>
       <AuxValues>
         <AuxValue name="autoScrollPane" type="java.lang.Boolean" 
value="true"/>
       </AuxValues>

diff -r 63688e4dd412 -r 73e0a43ce675 
project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
--- 
a/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
       Fri Dec 30 14:24:28 2011 +0100
+++ 
b/project/src/org/netbeans/modules/android/project/ui/customizer/DeviceUiChooser.java
       Thu Feb 02 12:05:47 2012 +0100
@@ -18,8 +18,11 @@
 import com.android.ddmlib.IDevice.DeviceState;
 import com.android.sdklib.internal.avd.AvdManager;
 import com.android.sdklib.internal.avd.AvdInfo;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import javax.swing.GroupLayout.Alignment;
@@ -45,6 +48,7 @@
   private final IDevice[] devices;
   private List<LaunchDeviceListener> listeners = new 
CopyOnWriteArrayList<LaunchDeviceListener>();
   private AvdUISelector avdUISelector;
+  private Runnable dblClickCallback;
 
   /** Creates new form DeviceUiChooser */
   public DeviceUiChooser(AvdManager avdManager, IDevice[] devices) {
@@ -67,6 +71,20 @@
     } else {
       jRadioAVD.setSelected(true);
     }
+    devicesTable.addMouseListener(new MouseAdapter() {
+
+      @Override
+      public void mouseClicked(MouseEvent e) {
+        if (e.getComponent().isEnabled() && e.getButton() == 
MouseEvent.BUTTON1 && e.getClickCount() == 2) {
+          Point p = e.getPoint();
+          int row = devicesTable.rowAtPoint(p);
+//          int column = devicesTable.columnAtPoint(p);
+          if (dblClickCallback != null && row != -1 && 
jRadioDevice.isSelected()) {
+            dblClickCallback.run();
+          }
+        }
+      }
+    });
   }
 
   private void setupDevicesTable() {
@@ -243,4 +261,8 @@
       lsnr.lauchDeviceChanged(ld);
     }
   }
+
+  void addSelectCallback(Runnable dblClickCallback) {
+    this.dblClickCallback = dblClickCallback;
+  }
 }


diff -r 73e0a43ce675 -r d2141cfd90d2 logcat/manifest.mf
--- a/logcat/manifest.mf        Thu Feb 02 12:05:47 2012 +0100
+++ b/logcat/manifest.mf        Thu Feb 02 14:08:31 2012 +0100
@@ -4,6 +4,6 @@
 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: 1.11
+OpenIDE-Module-Specification-Version: 1.12
 OpenIDE-Module-Java-Dependencies: Java > 1.6
 

diff -r 73e0a43ce675 -r d2141cfd90d2 
logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java
--- a/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java       Thu 
Feb 02 12:05:47 2012 +0100
+++ b/logcat/src/org/nyerel/nbandroid/logcat/LogTopComponent.java       Thu 
Feb 02 14:08:31 2012 +0100
@@ -839,6 +839,7 @@
             @Override
             public void mouseClicked(MouseEvent evt) {
                 try {
+                    LogTableModel model = (LogTableModel)table.getModel();
                     int row = table.getSelectedRow();
                     int col = table.getSelectedColumn();
 
@@ -847,7 +848,12 @@
                         row = 
table.getRowSorter().convertRowIndexToModel(row);
                     }
 
-                    LogEvent event = 
((LogTableModel)table.getModel()).getValueAt(row);
+                    // check, if the computed index is in the model
+                    if (row < 0 || row >= model.getRowCount()) {
+                        return;
+                    }
+
+                    LogEvent event = model.getValueAt(row);
                     StackTraceElement ste = event.getStackTraceElement();
 
                     if (col == LogTableModel.COL_MESSAGE && ste != null) {


diff -r d2141cfd90d2 -r 9ca55306e32f project/manifest.mf
--- a/project/manifest.mf       Thu Feb 02 14:08:31 2012 +0100
+++ b/project/manifest.mf       Thu Feb 02 14:09:29 2012 +0100
@@ -5,5 +5,5 @@
 OpenIDE-Module-Localizing-Bundle: 
org/netbeans/modules/android/project/Bundle.properties
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module-Java-Dependencies: Java > 1.6
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44