MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary ui form

Browse Source
This commit is contained in:
Eugene Kudelevsky
2011-10-27 16:37:02 +04:00
parent decf17cb69
commit 128294e7e1
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/run/DeviceChooser.form
-29
View File
@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.run.DeviceChooser">
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<scrollpane id="53c51" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="f5073" class="com.intellij.ui.table.JBTable" binding="myDeviceTable">
<constraints/>
<properties>
<preferredScrollableViewportSize width="450" height="220"/>
<striped value="true"/>
</properties>
</component>
</children>
</scrollpane>
</children>
</grid>
</form>
plugins/android/src/org/jetbrains/android/run/DeviceChooser.java
+9 -3
View File
@@ -21,6 +21,7 @@ import com.android.ddmlib.IDevice;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.util.Condition;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.table.JBTable;
import com.intellij.util.Alarm;
import com.intellij.util.ArrayUtil;
@@ -35,11 +36,13 @@ import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import java.awt.*;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.util.text.StringUtil.capitalize;
@@ -56,8 +59,7 @@ public class DeviceChooser implements Disposable {
private volatile boolean myProcessSelectionFlag = true;
private IDevice[] myOldDevices = EMPTY_DEVICE_ARRAY;
@Nullable
private JPanel myPanel;
private JComponent myPanel;
private JBTable myDeviceTable;
private final AndroidFacet myFacet;
@@ -71,6 +73,10 @@ public class DeviceChooser implements Disposable {
@Nullable Condition<IDevice> filter) {
myFacet = facet;
myFilter = filter;
myDeviceTable = new JBTable();
myPanel = ScrollPaneFactory.createScrollPane(myDeviceTable);
myPanel.setPreferredSize(new Dimension(450, 220));
myDeviceTable.setModel(new MyDeviceTableModel(EMPTY_DEVICE_ARRAY));
myDeviceTable.setSelectionMode(multipleSelection ?
@@ -177,7 +183,7 @@ public class DeviceChooser implements Disposable {
}
@Nullable
public JPanel getPanel() {
public JComponent getPanel() {
return myPanel;
}