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

minor fixes: using split pane, bugfix with canonical paths, added remove button

Browse source
This commit is contained in:
fros4943 2010-06-11 09:12:21 +00:00
parent b540408add
commit f3f6a0de24
1 changed files with 55 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
tools/cooja/java/se/sics/cooja/dialogs/ProjectDirectoriesDialog.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: ProjectDirectoriesDialog.java,v 1.15 2010/05/19 17:52:23 fros4943 Exp $ * $Id: ProjectDirectoriesDialog.java,v 1.16 2010/06/11 09:12:21 fros4943 Exp $
*/ */
package se.sics.cooja.dialogs; package se.sics.cooja.dialogs;
@ -64,9 +64,11 @@ import javax.swing.JLabel;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTable; import javax.swing.JTable;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.ListSelectionModel; import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
@ -248,7 +250,7 @@ public class ProjectDirectoriesDialog extends JDialog {
newDefaultProjectDirs += ";"; newDefaultProjectDirs += ";";
} }
newDefaultProjectDirs += gui.createPortablePath(f).getPath(); newDefaultProjectDirs += gui.createPortablePath(f, false).getPath();
} }
newDefaultProjectDirs = newDefaultProjectDirs.replace('\\', '/'); newDefaultProjectDirs = newDefaultProjectDirs.replace('\\', '/');
@ -285,11 +287,15 @@ public class ProjectDirectoriesDialog extends JDialog {
/* Center: Tree and list*/ /* Center: Tree and list*/
{ {
JPanel listPane = new JPanel(new BorderLayout()); final JSplitPane listPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
listPane.setLeftComponent(treePanel = new DirectoryTreePanel(this));
listPane.add(BorderLayout.WEST, treePanel = new DirectoryTreePanel(this)); listPane.setRightComponent(new JScrollPane(table));
listPane.add(BorderLayout.CENTER, new JScrollPane(table)); SwingUtilities.invokeLater(new Runnable() {
public void run() {
listPane.setDividerLocation(0.5);
}
});
smallPane = new JPanel(new BorderLayout()); smallPane = new JPanel(new BorderLayout());
Icon icon = UIManager.getLookAndFeelDefaults().getIcon("Table.ascendingSortIcon"); Icon icon = UIManager.getLookAndFeelDefaults().getIcon("Table.ascendingSortIcon");
if (icon == null) { if (icon == null) {
@ -332,9 +338,40 @@ public class ProjectDirectoriesDialog extends JDialog {
} }
}); });
smallPane.add(BorderLayout.SOUTH, button); smallPane.add(BorderLayout.SOUTH, button);
listPane.add(BorderLayout.EAST, smallPane);
button = new JButton("X");
button.setBackground(Color.RED);
button.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
int selectedIndex = table.getSelectedRow();
if (selectedIndex < 0) {
return;
}
if (selectedIndex >= currentProjects.size()) {
return;
}
File file = currentProjects.get(selectedIndex);
String s1 = "Remove";
String s2 = "Cancel";
Object[] options = { s1, s2 };
int n = JOptionPane.showOptionDialog(GUI.getTopParentContainer(),
"Remove COOJA project?\n" + file.getAbsolutePath(),
"Remove COOJA project?", JOptionPane.YES_NO_OPTION,
JOptionPane.WARNING_MESSAGE, null, options, s1);
if (n != JOptionPane.YES_OPTION) {
return;
}
removeProjectDir(file);
}
});
smallPane.add(BorderLayout.CENTER, button);
mainPane.setBackground(Color.WHITE); mainPane.setBackground(Color.WHITE);
mainPane.add(listPane); JPanel listPanelWithSort = new JPanel(new BorderLayout());
listPanelWithSort.add(BorderLayout.CENTER, listPane);
listPanelWithSort.add(BorderLayout.EAST, smallPane);
mainPane.add(listPanelWithSort);
} }
JPanel topPanel = new JPanel(new BorderLayout()); JPanel topPanel = new JPanel(new BorderLayout());
@ -591,6 +628,15 @@ class DirectoryTreePanel extends JPanel {
ProjectDirectory td = (ProjectDirectory) userObject; ProjectDirectory td = (ProjectDirectory) userObject;
String treeCanonical = td.dir.getCanonicalPath(); String treeCanonical = td.dir.getCanonicalPath();
projectCanonical = projectCanonical.replace('\\', '/');
if (!projectCanonical.endsWith("/")) {
projectCanonical += "/";
}
treeCanonical = treeCanonical.replace('\\', '/');
if (!treeCanonical.endsWith("/")) {
treeCanonical += "/";
}
if (projectCanonical.startsWith(treeCanonical)) { if (projectCanonical.startsWith(treeCanonical)) {
tp = tp.pathByAddingChild(child); tp = tp.pathByAddingChild(child);
if (projectCanonical.equals(treeCanonical)) { if (projectCanonical.equals(treeCanonical)) {