From fe42ccc80b4cd673086fb8dcb3fec0ae13a27d3e Mon Sep 17 00:00:00 2001 From: "syeon.hwang" Date: Wed, 4 Apr 2012 15:13:53 +0900 Subject: [PATCH] [Title] Some code cleanup [Type] [Module] Emulator/ [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../emulator/manager/ui/ArchitectureGroup.java | 7 +- src/org/tizen/emulator/manager/ui/MainDialog.java | 134 +++++++++++---------- .../tizen/emulator/manager/ui/vmstree/VMsTree.java | 25 +++- 3 files changed, 95 insertions(+), 71 deletions(-) diff --git a/src/org/tizen/emulator/manager/ui/ArchitectureGroup.java b/src/org/tizen/emulator/manager/ui/ArchitectureGroup.java index 2a7f53f..60bb4f3 100644 --- a/src/org/tizen/emulator/manager/ui/ArchitectureGroup.java +++ b/src/org/tizen/emulator/manager/ui/ArchitectureGroup.java @@ -33,7 +33,6 @@ package org.tizen.emulator.manager.ui; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -53,7 +52,6 @@ public class ArchitectureGroup { group = new Group(archComposite, SWT.NONE); group.setText("Emulator Architecture"); - group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); group.setLayout(new GridLayout(2, false)); x86RadioButton = new Button(group, SWT.RADIO); @@ -83,4 +81,9 @@ public class ArchitectureGroup { x86RadioButton.addSelectionListener(archSelectionListener); armRadioButton.addSelectionListener(archSelectionListener); } + + + public void setLayoutData(Object data) { + group.setLayoutData(data); + } } diff --git a/src/org/tizen/emulator/manager/ui/MainDialog.java b/src/org/tizen/emulator/manager/ui/MainDialog.java index f57f0c4..78657bf 100644 --- a/src/org/tizen/emulator/manager/ui/MainDialog.java +++ b/src/org/tizen/emulator/manager/ui/MainDialog.java @@ -66,6 +66,7 @@ public class MainDialog { // LEFT VIEW VMsTree vmsTree; + Button refreshButton; Button deleteButton; Button resetButton; @@ -101,100 +102,59 @@ public class MainDialog { public void draw() { Composite mainComposite = new Composite(shell, SWT.NONE); - mainComposite.setLayout(new GridLayout(1, false)); + mainComposite.setLayout(getNopaddedGridLayout(1, false)); { Composite archComposite = new Composite(mainComposite, SWT.NONE); - archComposite.setLayout(new GridLayout(1, false)); + archComposite.setLayout(getNopaddedGridLayout(1, false)); archComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); archGroup = new ArchitectureGroup(this, archComposite); - + archGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); + sashForm = new SashForm(mainComposite, SWT.HORIZONTAL); sashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); sashForm.setLayout(new FillLayout()); // Left : VMs tree { final Composite leftView = new Composite(sashForm, SWT.FILL); - GridLayout layout = getNopaddedGridLayout(); + GridLayout layout = getNopaddedGridLayout(1, false); leftView.setLayout(layout); vmsTree = new VMsTree(this, leftView); + vmsTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); Composite buttonComposite = new Composite(leftView, SWT.NONE); buttonComposite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false)); buttonComposite.setLayout(new FillLayout()); - Label temp = new Label(buttonComposite, SWT.NONE); - temp.setText("TODO FIX ME"); - temp.setVisible(false); - temp = new Label(buttonComposite, SWT.NONE); - temp.setText("TODO FIX ME"); - temp.setVisible(false); - - Button refreshButton = new Button(buttonComposite, SWT.PUSH); - refreshButton.setText(StringResource.REFRESH); - refreshButton.setToolTipText("refresh list of virtual machine"); - refreshButton.setImage(ResourceRegistry.getImage(ImageName.REFRESH)); - refreshButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - refreshProperties(); - } - @Override - public void widgetDefaultSelected(SelectionEvent e) {} - }); - - deleteButton = new Button(buttonComposite, SWT.PUSH); - deleteButton.setText(StringResource.DELETE); - deleteButton.setToolTipText("delete selected virtual machine"); - deleteButton.setImage(ResourceRegistry.getImage(ImageName.DELETE)); - deleteButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - deleteVirtualMachine(); - } - @Override - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - resetButton = new Button(buttonComposite, SWT.PUSH); - resetButton.setText(StringResource.RESET); - resetButton.setToolTipText("format os of virtual machine"); - resetButton.setImage(ResourceRegistry.getImage(ImageName.RESET)); - resetButton.addSelectionListener(new SelectionListener() { - @Override - public void widgetDefaultSelected(SelectionEvent arg0) { - } - - @Override - public void widgetSelected(SelectionEvent arg0) { - resetVirtualMachine(); - } + { + Label temp = new Label(buttonComposite, SWT.NONE); + temp.setText("TODO FIX ME"); + temp.setVisible(false); + temp = new Label(buttonComposite, SWT.NONE); + temp.setText("TODO FIX ME"); + temp.setVisible(false); + + refreshButton = new Button(buttonComposite, SWT.PUSH); + deleteButton = new Button(buttonComposite, SWT.PUSH); + resetButton = new Button(buttonComposite, SWT.PUSH); - }); + decorateLeftBottomButtons(); + } } - // LEFT : detail table + // Right : detail table { final Composite rightView = new Composite(sashForm, SWT.FILL); - GridLayout layout = getNopaddedGridLayout(); + GridLayout layout = getNopaddedGridLayout(1, false); rightView.setLayout(layout); detailView = new DetailTableView(this); detailView.createDetailView(shell, rightView); Composite bottomComposite = new Composite(rightView, SWT.NONE); - GridLayout bottomLayout = new GridLayout(2, false); - bottomLayout.horizontalSpacing = 0; - bottomLayout.verticalSpacing = 0; - bottomLayout.marginBottom = 0; - bottomLayout.marginHeight = 0; - bottomLayout.marginLeft = 0; - bottomLayout.marginRight = 0; - bottomLayout.marginTop = 0; - bottomLayout.marginWidth = 0; + GridLayout bottomLayout = getNopaddedGridLayout(2, false); bottomComposite.setLayout(bottomLayout); bottomComposite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false)); @@ -263,7 +223,7 @@ public class MainDialog { deleteButton.setEnabled(false); resetButton.setEnabled(false); } - + public void open() { shell.open(); while(!shell.isDisposed()) { @@ -403,8 +363,8 @@ public class MainDialog { icon.dispose(); } - private GridLayout getNopaddedGridLayout() { - GridLayout layout = new GridLayout(1, false); + private GridLayout getNopaddedGridLayout(int numColumns, boolean makeColumnEqualWidth) { + GridLayout layout = new GridLayout(numColumns, makeColumnEqualWidth); layout.horizontalSpacing = 0; layout.verticalSpacing = 0; layout.marginBottom = 0; @@ -420,6 +380,48 @@ public class MainDialog { public boolean isX86Selected() { return archGroup.x86RadioButton.getSelection(); } + + private void decorateLeftBottomButtons() { + refreshButton.setText(StringResource.REFRESH); + refreshButton.setToolTipText("refresh list of virtual machine"); + refreshButton.setImage(ResourceRegistry.getImage(ImageName.REFRESH)); + refreshButton.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + refreshProperties(); + } + @Override + public void widgetDefaultSelected(SelectionEvent e) {} + }); + + deleteButton.setText(StringResource.DELETE); + deleteButton.setToolTipText("delete selected virtual machine"); + deleteButton.setImage(ResourceRegistry.getImage(ImageName.DELETE)); + deleteButton.addSelectionListener(new SelectionListener() { + @Override + public void widgetSelected(SelectionEvent e) { + deleteVirtualMachine(); + } + @Override + public void widgetDefaultSelected(SelectionEvent e) { + } + }); + + resetButton.setText(StringResource.RESET); + resetButton.setToolTipText("format os of virtual machine"); + resetButton.setImage(ResourceRegistry.getImage(ImageName.RESET)); + resetButton.addSelectionListener(new SelectionListener() { + @Override + public void widgetDefaultSelected(SelectionEvent arg0) { + } + + @Override + public void widgetSelected(SelectionEvent arg0) { + resetVirtualMachine(); + } + + }); + } public void createBaseImage() { MessageBox msg = new MessageBox(shell, SWT.ICON_WARNING | SWT.OK | SWT.CANCEL); diff --git a/src/org/tizen/emulator/manager/ui/vmstree/VMsTree.java b/src/org/tizen/emulator/manager/ui/vmstree/VMsTree.java index bb3c92b..05917b1 100644 --- a/src/org/tizen/emulator/manager/ui/vmstree/VMsTree.java +++ b/src/org/tizen/emulator/manager/ui/vmstree/VMsTree.java @@ -35,9 +35,10 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MessageBox; @@ -65,8 +66,6 @@ public class VMsTree { this.vmsTree = new Tree(parent, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); - vmsTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - vmsTree.setHeaderVisible(true); vmsTree.setLinesVisible(true); @@ -138,6 +137,22 @@ public class VMsTree { } } }); + + vmsTree.addKeyListener(new KeyListener() { + @Override + public void keyReleased(KeyEvent e) {} + @Override + public void keyPressed(KeyEvent e) { + if(e.keyCode == SWT.DEL) { + for(TreeItem item : vmsTree.getSelection()) { + if(!(item.getData() instanceof PropertyContent)) { + return; + } + } + EmulatorManager.getInstance().getMainDialog().deleteVirtualMachine(); + } + } + }); } private void pack() { @@ -267,4 +282,8 @@ public class VMsTree { return ((PropertyContent)vmsTree.getSelection()[0].getData()).property; } + + public void setLayoutData(Object data) { + vmsTree.setLayoutData(data); + } } \ No newline at end of file -- 2.7.4