deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replaced borders with separator for a more compact view

Browse source
This commit is contained in:
nifi 2010-05-09 22:50:34 +00:00
parent ffdda2259f
commit 2bfeb01dcd
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/cooja/java/se/sics/cooja/plugins/MoteInterfaceViewer.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: MoteInterfaceViewer.java,v 1.9 2010/03/14 19:50:34 fros4943 Exp $ * $Id: MoteInterfaceViewer.java,v 1.10 2010/05/09 22:50:34 nifi Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -41,11 +41,11 @@ import java.util.Collection;
import java.util.Vector; import java.util.Vector;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import org.jdom.Element; import org.jdom.Element;
@ -85,18 +85,17 @@ public class MoteInterfaceViewer extends VisPlugin implements HasQuickHelp, Mote
mote = moteToView; mote = moteToView;
JLabel label; JLabel label;
JPanel mainPane = new JPanel(); JPanel mainPane = new JPanel(new BorderLayout());
mainPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
mainPane.setLayout(new BorderLayout());
JPanel smallPane; JPanel smallPane;
// Select interface combo box // Select interface combo box
smallPane = new JPanel(new BorderLayout()); smallPane = new JPanel(new BorderLayout());
smallPane.add(new JSeparator(), BorderLayout.SOUTH);
label = new JLabel("Select interface:"); label = new JLabel("Select interface:");
selectInterfaceComboBox = new JComboBox(); selectInterfaceComboBox = new JComboBox();
final JPanel interfacePanel = new JPanel(); final JPanel interfacePanel = new JPanel(new BorderLayout());
Collection<MoteInterface> intfs = mote.getInterfaces().getInterfaces(); Collection<MoteInterface> intfs = mote.getInterfaces().getInterfaces();
for (MoteInterface intf : intfs) { for (MoteInterface intf : intfs) {
@ -125,11 +124,10 @@ public class MoteInterfaceViewer extends VisPlugin implements HasQuickHelp, Mote
} }
currentInterfaceVisualizer = selectedMoteInterface.getInterfaceVisualizer(); currentInterfaceVisualizer = selectedMoteInterface.getInterfaceVisualizer();
if (currentInterfaceVisualizer != null) { if (currentInterfaceVisualizer != null) {
currentInterfaceVisualizer.setBorder(BorderFactory.createEtchedBorder());
interfacePanel.add(BorderLayout.CENTER, currentInterfaceVisualizer); interfacePanel.add(BorderLayout.CENTER, currentInterfaceVisualizer);
currentInterfaceVisualizer.setVisible(true); currentInterfaceVisualizer.setVisible(true);
} else { } else {
interfacePanel.add(new JLabel("No interface visualizer")); interfacePanel.add(new JLabel("No interface visualizer", JLabel.CENTER));
currentInterfaceVisualizer = null; currentInterfaceVisualizer = null;
} }
setSize(getSize()); setSize(getSize());
@ -140,10 +138,8 @@ public class MoteInterfaceViewer extends VisPlugin implements HasQuickHelp, Mote
smallPane.add(BorderLayout.WEST, label); smallPane.add(BorderLayout.WEST, label);
smallPane.add(BorderLayout.EAST, selectInterfaceComboBox); smallPane.add(BorderLayout.EAST, selectInterfaceComboBox);
mainPane.add(BorderLayout.NORTH, smallPane); mainPane.add(BorderLayout.NORTH, smallPane);
mainPane.add(Box.createRigidArea(new Dimension(0,10)));
// Add selected interface // Add selected interface
interfacePanel.setLayout(new BorderLayout());
if (selectInterfaceComboBox.getItemCount() > 0) { if (selectInterfaceComboBox.getItemCount() > 0) {
selectInterfaceComboBox.setSelectedIndex(0); selectInterfaceComboBox.setSelectedIndex(0);
selectInterfaceComboBox.dispatchEvent(new ActionEvent(selectInterfaceComboBox, ActionEvent.ACTION_PERFORMED, "")); selectInterfaceComboBox.dispatchEvent(new ActionEvent(selectInterfaceComboBox, ActionEvent.ACTION_PERFORMED, ""));
@ -153,6 +149,7 @@ public class MoteInterfaceViewer extends VisPlugin implements HasQuickHelp, Mote
mainScrollPane = new JScrollPane(mainPane, mainScrollPane = new JScrollPane(mainPane,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
mainScrollPane.setBorder(BorderFactory.createEmptyBorder(0,2,0,2));
this.setContentPane(mainScrollPane); this.setContentPane(mainScrollPane);
pack(); pack();
setPreferredSize(new Dimension(350,300)); setPreferredSize(new Dimension(350,300));