Author: mmichaud
Date: 2009-03-18 10:54:12 -0700 (Wed, 18 Mar 2009)
New Revision: 16306
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
Log:
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-03-18 17:53:44 UTC (rev 16305)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-03-18 17:54:12 UTC (rev 16306)
@@ -7,39 +7,109 @@
import java.io.File;
import org.cytoscape.work.Tunable;
+import org.jdesktop.layout.GroupLayout;
+import org.jdesktop.layout.LayoutStyle;
+import cytoscape.Cytoscape;
+
public class FileHandler extends AbstractGuiHandler {
JButton button;
File myFile;
JFileChooser fileChooser;
boolean filechoosen;
- JTextField path;
+ JTextField networkFileTextField;
//FileUtil flUtil;
+ ImageIcon image;
+ JLabel titleLabel;
+ JSeparator titleSeparator;
public FileHandler(Field f, Object o, Tunable t) {
super(f,o,t);
//this.flUtil = flUtil;
filechoosen = false;
fileChooser = new JFileChooser();
+ titleSeparator = new JSeparator();
+ titleLabel = new JLabel("Import URL file");
+ image = new
ImageIcon(Cytoscape.class.getResource("/images/ximian/stock_open.png"));
+ networkFileTextField = new JTextField();
+ networkFileTextField.setText("Please select a network file...");
+ networkFileTextField.setName("networkFileTextField");
+ networkFileTextField.setEditable(false);
+ networkFileTextField.setFont(new Font(null, Font.ITALIC,12));
+ button = new JButton("Open a File...",image);
+ button.addActionListener(this);
try{
this.myFile=(File)f.get(o);
}catch(Exception e){e.printStackTrace();}
- path = new JTextField("select file",14);
- path.setFont(new Font(null, Font.ITALIC,10));
- panel.add(path);
- button = new JButton("Select File...");
- button.addActionListener(this);
- panel.add(button);
-
+
+ GroupLayout layout = new GroupLayout(panel);
+ panel.setLayout(layout);
+
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+ .add(
+ layout.createSequentialGroup()
+ .addContainerGap()
+
.add(layout.createParallelGroup(GroupLayout.LEADING)
+
.add(titleLabel,GroupLayout.PREFERRED_SIZE,350,GroupLayout.PREFERRED_SIZE)
+
.add(titleSeparator,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+ )
+ .addContainerGap()
+
.add(layout.createSequentialGroup()
+
.add(networkFileTextField,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+
.addPreferredGap(LayoutStyle.RELATED)
+ .add(button))
+ .addContainerGap()));
+
+
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(titleLabel)
+ .add(8, 8, 8)
+
.add(titleSeparator,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+ .add(7, 7, 7)
+
.addPreferredGap(LayoutStyle.RELATED)
+
.add(networkFileTextField,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
+ .add(button)
+ .addContainerGap()));
+
+
+
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+
.add(layout.createParallelGroup(GroupLayout.LEADING)
+
.add(titleLabel,GroupLayout.PREFERRED_SIZE,350,GroupLayout.PREFERRED_SIZE)
+
.add(titleSeparator,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+
.add(layout.createSequentialGroup()
+
.add(networkFileTextField,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+
.addPreferredGap(LayoutStyle.RELATED)
+
.add(button))
+ )
+ .addContainerGap()));
+
+layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(titleLabel)
+ .add(8, 8, 8)
+
.add(titleSeparator,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+ .add(7, 7, 7)
+
.addPreferredGap(LayoutStyle.RELATED)
+
.add(layout.createParallelGroup(GroupLayout.BASELINE)
+
.add(button)
+
.add(networkFileTextField))
+
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
+
.addContainerGap()));
+// panel.add(button);
}
+
public void handle() {
if(!filechoosen){
- int ret = fileChooser.showOpenDialog(null);
+ int ret = fileChooser.showOpenDialog(panel);
if (ret == JFileChooser.APPROVE_OPTION) {
File file = fileChooser.getSelectedFile();
//File file =
flUtil.getFile("TEST",FileUtil.LOAD);
@@ -47,8 +117,8 @@
try{
f.set(o,file);
}catch (Exception e) {
e.printStackTrace();}
- path.setFont(new Font(null,
Font.PLAIN,10));
- path.setText(file.getAbsolutePath());
+ networkFileTextField.setFont(new
Font(null, Font.PLAIN,10));
+
networkFileTextField.setText(file.getAbsolutePath());
}
}
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2009-03-18 17:53:44 UTC (rev 16305)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2009-03-18 17:54:12 UTC (rev 16306)
@@ -1,6 +1,5 @@
package org.cytoscape.work.internal.tunables;
-
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -17,9 +16,9 @@
import org.cytoscape.work.internal.tunables.utils.*;
import org.cytoscape.work.*;
import org.cytoscape.work.Tunable.Param;
-
import org.cytoscape.work.spring.SpringTunableInterceptor;
+
public class GuiTunableInterceptor extends
SpringTunableInterceptor<Guihandler> {
private Component parent=null;
@@ -30,7 +29,6 @@
public GuiTunableInterceptor(HandlerFactory<Guihandler> factory) {
super( factory );
panelMap = new HashMap<java.util.List<Guihandler>,JPanel>();
- //this.parent=parent;
}
public void setParent(Object o) {
@@ -97,8 +95,8 @@
// get the gui into the proper state
for ( Guihandler h : lh )
h.notifyDependents();
-
-
+
+
if(parent==null){
//Custom button text
Object[] buttons = {"OK","Cancel"};
@@ -110,7 +108,7 @@
null,
buttons,
buttons[0]);
- // process the values set in the gui : USELESS BECAUSE OF
LISTENERS
+
if ( n == JOptionPane.OK_OPTION ){
for ( Guihandler h : lh ) h.handle();
return true;
@@ -120,18 +118,6 @@
}
else{
-// JPanel buttonPanel = new JPanel();
-// JButton okButton = new JButton("OK");
-// okButton.setActionCommand("ok");
-// okButton.addActionListener(new myActionListener());
-// okButton.setToolTipText("Click to validate");
-// JButton cancelButton = new JButton("Cancel");
-// cancelButton.setActionCommand("cancel");
-// cancelButton.addActionListener(new myActionListener());
-// cancelButton.setToolTipText("Cancel all previous
actions");
-// buttonPanel.add(okButton);
-// buttonPanel.add(cancelButton);
-
int nbPanel = ((Container)
parent).getComponentCount()-1;
JPanel buttonBox = (JPanel) ((Container)
parent).getComponent(nbPanel);
((JPanel)parent).remove(nbPanel);
@@ -141,18 +127,8 @@
}
}
-// private class myActionListener implements ActionListener{
-// public void actionPerformed(ActionEvent ae){
-// if(ae.getActionCommand() == "ok"){ for(Guihandler h:
lh)h.handle();m=true;}
-// else m=false;
-// ((JPanel)parent).remove(r);
-// ((JPanel)parent).repaint();
-// }
-// }
-
private JPanel createJPanel(String title, Guihandler gh) {
-
if ( gh == null )
return getSimplePanel(title);
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
2009-03-18 17:53:44 UTC (rev 16305)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
2009-03-18 17:54:12 UTC (rev 16306)
@@ -16,8 +16,11 @@
import org.cytoscape.property.bookmark.DataSource;
import org.cytoscape.work.Tunable;
import org.jdesktop.layout.GroupLayout;
+import org.jdesktop.layout.LayoutStyle;
+import cytoscape.Cytoscape;
+
public class URLHandler extends AbstractGuiHandler {
URL url;
@@ -27,7 +30,7 @@
String urlstr;
BookmarkComboBoxEditor bookmarkEditor = new BookmarkComboBoxEditor();
JComboBox networkFileComboBox;
- JLabel titleLabel = new JLabel("Import URL file");
+ JLabel titleLabel;
private JSeparator titleSeparator;
private String pleaseMessage = "Please provide URL or select from list";
@@ -37,6 +40,7 @@
this.bkUtil=bkUtil;
this.theBookmarks=bookmarks;
titleSeparator = new JSeparator();
+ titleLabel = new JLabel("Import URL file");
try{
this.url= (URL) f.get(o);
}catch(Exception e){e.printStackTrace();}
@@ -64,60 +68,29 @@
GroupLayout layout = new GroupLayout(panel);
panel.setLayout(layout);
- layout.setHorizontalGroup(layout
- .createParallelGroup(
-
org.jdesktop.layout.GroupLayout.LEADING)
+
layout.setHorizontalGroup(layout.createParallelGroup(GroupLayout.LEADING)
.add(
- layout
-
.createSequentialGroup()
-
.addContainerGap()
- .add(
-
layout
-
.createParallelGroup(
-
org.jdesktop.layout.GroupLayout.LEADING)
-
.add(
-
networkFileComboBox,
-
0, 350,
-
Short.MAX_VALUE)
-
.add(
-
titleLabel,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
350,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-
.add(
-
titleSeparator,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
350,
-
Short.MAX_VALUE)
-
)
-
.addContainerGap()));
-layout
- .setVerticalGroup(layout
- .createParallelGroup(
-
org.jdesktop.layout.GroupLayout.LEADING)
+ layout.createSequentialGroup()
+ .addContainerGap()
+
.add(layout.createParallelGroup(GroupLayout.LEADING)
+
.add(networkFileComboBox,0, 350,Short.MAX_VALUE)
+
.add(titleLabel,GroupLayout.PREFERRED_SIZE,350,GroupLayout.PREFERRED_SIZE)
+
.add(titleSeparator,GroupLayout.DEFAULT_SIZE,350,Short.MAX_VALUE)
+ )
+ .addContainerGap()));
+
+
layout.setVerticalGroup(layout.createParallelGroup(GroupLayout.LEADING)
.add(
- layout
-
.createSequentialGroup()
-
.addContainerGap()
- .add(titleLabel)
- .add(8, 8, 8)
- .add(
-
titleSeparator,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(7, 7, 7)
-
.addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)
- .add(
-
networkFileComboBox,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-
.addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED,
-
3, Short.MAX_VALUE)
-
.addContainerGap()));
+ layout.createSequentialGroup()
+ .addContainerGap()
+ .add(titleLabel)
+ .add(8, 8, 8)
+
.add(titleSeparator,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+ .add(7, 7, 7)
+
.addPreferredGap(LayoutStyle.RELATED)
+
.add(networkFileComboBox,GroupLayout.PREFERRED_SIZE,GroupLayout.DEFAULT_SIZE,GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
+ .addContainerGap()));
//panel = new JPanel(new BorderLayout());
panel.add(new JLabel("URL Path = "));
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
