Author: mmichaud
Date: 2009-03-16 06:51:34 -0700 (Mon, 16 Mar 2009)
New Revision: 16278
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/GuiHandlerFactory.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/InputStreamHandler.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-16 10:56:39 UTC (rev 16277)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
2009-03-16 13:51:34 UTC (rev 16278)
@@ -8,7 +8,6 @@
import org.cytoscape.work.Tunable;
-import cytoscape.util.*;
public class FileHandler extends AbstractGuiHandler {
@@ -17,11 +16,11 @@
JFileChooser fileChooser;
boolean filechoosen;
JTextField path;
- FileUtil flUtil;
+ //FileUtil flUtil;
- public FileHandler(Field f, Object o, Tunable t,FileUtil flUtil) {
+ public FileHandler(Field f, Object o, Tunable t) {
super(f,o,t);
- this.flUtil = flUtil;
+ //this.flUtil = flUtil;
filechoosen = false;
fileChooser = new JFileChooser();
@@ -29,8 +28,7 @@
this.myFile=(File)f.get(o);
}catch(Exception e){e.printStackTrace();}
- panel.add(new JLabel("Path :"));
- path = new JTextField("select file",12);
+ path = new JTextField("select file",14);
path.setFont(new Font(null, Font.ITALIC,10));
panel.add(path);
button = new JButton("Select File...");
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-03-16 10:56:39 UTC (rev 16277)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiHandlerFactory.java
2009-03-16 13:51:34 UTC (rev 16278)
@@ -64,11 +64,14 @@
else if(type == ListMultipleSelection.class)
return new ListMultipleHandler<String>(f,o,t);
else if(type == File.class)
- return new FileHandler(f,o,t,flUtil);
+// return new FileHandler(f,o,t,flUtil);
+ return new FileHandler(f,o,t);
else if(type == URL.class)
+// return new URLHandler(f,o,t,bookmarks,bkUtil);
return new URLHandler(f,o,t,bookmarks,bkUtil);
else if(type == InputStream.class)
- return new
InputStreamHandler(f,o,t,bookmarks,bkUtil,flUtil,stUtil);
+// return new
InputStreamHandler(f,o,t,bookmarks,bkUtil,flUtil,stUtil);
+ return new InputStreamHandler(f,o,t,bookmarks,bkUtil);
return null;
}
}
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-16 10:56:39 UTC (rev 16277)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/GuiTunableInterceptor.java
2009-03-16 13:51:34 UTC (rev 16278)
@@ -1,6 +1,6 @@
package org.cytoscape.work.internal.tunables;
-import java.awt.BorderLayout;
+
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
@@ -33,9 +33,15 @@
//this.parent=parent;
}
- public void setParent(Component c) {
- parent = c;
+ public void setParent(Object o) {
+ if(o instanceof JPanel)
+ this.parent = (Component)o;
+ else throw new IllegalArgumentException("Not a JPanel");
}
+
+ public void handle(){
+ for(Guihandler h: lh)h.handle();
+ }
public boolean createUI(Object... proxyObjs) {
Object[] objs = convertSpringProxyObjs( proxyObjs );
@@ -135,10 +141,6 @@
}
}
- public void Handle(){
- for(Guihandler h: lh)h.handle();
- }
-
// private class myActionListener implements ActionListener{
// public void actionPerformed(ActionEvent ae){
// if(ae.getActionCommand() == "ok"){ for(Guihandler h:
lh)h.handle();m=true;}
@@ -183,6 +185,4 @@
ret.setLayout(new BoxLayout(ret,BoxLayout.PAGE_AXIS));
return ret;
}
-
-
}
Modified:
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
===================================================================
---
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
2009-03-16 10:56:39 UTC (rev 16277)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
2009-03-16 13:51:34 UTC (rev 16278)
@@ -1,13 +1,14 @@
package org.cytoscape.work.internal.tunables;
-import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Font;
import java.awt.event.ActionListener;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
import java.lang.reflect.Field;
import java.net.URL;
import java.util.List;
@@ -21,6 +22,7 @@
import org.cytoscape.property.bookmark.DataSource;
import org.cytoscape.work.Tunable;
import org.cytoscape.io.util.*;
+import org.jdesktop.layout.GroupLayout;
public class InputStreamHandler extends AbstractGuiHandler {
@@ -30,9 +32,9 @@
String urlstr;
BookmarkComboBoxEditor bookmarkEditor = new BookmarkComboBoxEditor();
JComboBox networkFileComboBox;
- FileUtil flUtil;
+ //FileUtil flUtil;
BookmarksUtil bkUtil;
- StreamUtil stUtil;
+ //StreamUtil stUtil;
InputStream InStream = null;
URL url;
@@ -41,24 +43,26 @@
JFileChooser fileChooser;
boolean filechoosen;
JTextField path;
+ private javax.swing.JSeparator titleSeparator;
private String pleaseMessage = "Please provide URL or select from list";
+ //private JPanel valuePanel;
+ private JLabel titleLabel = new JLabel("Import Network File");
private JPanel radioButtonPanel;
- private JPanel valuePanel;
- private javax.swing.JButton selectButton;
- private javax.swing.JRadioButton remoteRadioButton;
- private javax.swing.JRadioButton localRadioButton;
- private javax.swing.JTextField networkFileTextField;
+ private JButton selectButton;
+ private JRadioButton remoteRadioButton;
+ private JRadioButton localRadioButton;
+ private JTextField networkFileTextField;
private static final String URL_TOOLTIP = "<html>Enter URL or
<strong><font color=\"red\">Drag and Drop local/remote
files.</font></strong></html>";
private static final String LOCAL_TOOLTIP = "<html>Specify path to
local files.</html>";
- public InputStreamHandler(Field f, Object o, Tunable t,Bookmarks
bookmarks,BookmarksUtil bkUtil,FileUtil flUtil,StreamUtil stUtil) {
+ public InputStreamHandler(Field f, Object o, Tunable t,Bookmarks
bookmarks,BookmarksUtil bkUtil) {
super(f,o,t);
this.bkUtil=bkUtil;
- this.flUtil=flUtil;
- this.stUtil=stUtil;
+ //this.flUtil=flUtil;
+ //this.stUtil=stUtil;
this.theBookmarks=bookmarks;
filechoosen = false;
fileChooser = new JFileChooser();
@@ -76,20 +80,19 @@
theCategoryList.add(theCategory);
}
- //System.out.println("Test INPUTSTREAM");
- panel.add(new JLabel("Path :"));
- path = new JTextField("select file",12);
- path.setFont(new Font(null, Font.ITALIC,10));
- panel.add(path);
+ //panel.add(new JLabel("Path :"));
+ //path = new JTextField("select file",12);
+ //path.setFont(new Font(null, Font.ITALIC,10));
+ //panel.add(path);
initComponents();
addListeners();
switchImportView("remote");
- panel = new JPanel(new BorderLayout());
- panel.add(radioButtonPanel,BorderLayout.NORTH);
- panel.add(valuePanel,BorderLayout.SOUTH);
+ //panel = new JPanel(new BorderLayout());
+ //panel.add(radioButtonPanel,BorderLayout.NORTH);
+ //panel.add(valuePanel,BorderLayout.SOUTH);
}
@@ -102,7 +105,8 @@
File file = fileChooser.getSelectedFile();
if ( file != null ){
try{
- InStream = new
FileInputStream(file);
+ InStream = new
FileInputStream(file.getAbsolutePath());
+ //OutputStream out =
new FileOutputStream(file);
//InStream =
flUtil.getInputStream(file.getAbsolutePath());
f.set(o,InStream);
}catch (Exception e) {
e.printStackTrace();}
@@ -118,7 +122,7 @@
try{
if ( urlstr != null ) {
url = new URL(urlstr);
- InStream = stUtil.getInputStream(url);
+ //InStream = stUtil.getInputStream(url);
f.set(o,InStream);
}
}catch (Exception e){}
@@ -146,10 +150,11 @@
networkFileTextField = new javax.swing.JTextField();
networkFileComboBox = new javax.swing.JComboBox();
selectButton = new javax.swing.JButton();
+ titleSeparator = new JSeparator();
radioButtonPanel = new javax.swing.JPanel();
- valuePanel = new javax.swing.JPanel();
+ //valuePanel = new javax.swing.JPanel();
-
radioButtonPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Data
Source Type"));
+
radioButtonPanel.setBorder(BorderFactory.createTitledBorder("Data Source
Type"));
localRadioButton.setSelected(true);
localRadioButton.setText("Local");
@@ -163,11 +168,11 @@
remoteRadioButton.setToolTipText(URL_TOOLTIP);
- radioButtonPanel.add(localRadioButton);
- radioButtonPanel.add(remoteRadioButton);
- valuePanel.add(networkFileTextField);
- valuePanel.add(selectButton);
- valuePanel.add(networkFileComboBox);
+ //radioButtonPanel.add(localRadioButton);
+ //radioButtonPanel.add(remoteRadioButton);
+ //valuePanel.add(networkFileTextField);
+ //valuePanel.add(selectButton);
+ //valuePanel.add(networkFileComboBox);
networkFileTextField.setText("Please select a network file...");
networkFileTextField.setName("networkFileTextField");
@@ -183,6 +188,122 @@
final ToolTipManager tp = ToolTipManager.sharedInstance();
tp.setInitialDelay(1);
tp.setDismissDelay(7500);
+
+ GroupLayout radioButtonPanelLayout = new
GroupLayout(radioButtonPanel);
+ radioButtonPanel.setLayout(radioButtonPanelLayout);
+ radioButtonPanelLayout
+ .setHorizontalGroup(radioButtonPanelLayout
+ .createParallelGroup(
+
org.jdesktop.layout.GroupLayout.LEADING)
+ .add(
+ radioButtonPanelLayout
+
.createSequentialGroup()
+
.addContainerGap()
+
.add(localRadioButton)
+
.addPreferredGap(
+
org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(remoteRadioButton)
+
.addContainerGap(250, Short.MAX_VALUE)));
+ radioButtonPanelLayout
+ .setVerticalGroup(radioButtonPanelLayout
+ .createParallelGroup(
+
org.jdesktop.layout.GroupLayout.LEADING)
+ .add(
+
radioButtonPanelLayout
+
.createSequentialGroup()
+ .add(
+
radioButtonPanelLayout
+
.createParallelGroup(
+
org.jdesktop.layout.GroupLayout.BASELINE)
+
.add(localRadioButton)
+
.add(remoteRadioButton))));
+
+ GroupLayout layout = new org.jdesktop.layout.GroupLayout(panel);
+ panel.setLayout(layout);
+ layout
+ .setHorizontalGroup(layout
+ .createParallelGroup(
+
org.jdesktop.layout.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)
+
.add(
+
radioButtonPanel,
+
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
+
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
+
Short.MAX_VALUE)
+
.add(
+
layout
+
.createSequentialGroup()
+
.add(
+
networkFileTextField,
+
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
+
350,
+
Short.MAX_VALUE)
+
.addPreferredGap(
+
org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(
+
selectButton))
+
)
+
.addContainerGap()));
+layout
+ .setVerticalGroup(layout
+ .createParallelGroup(
+
org.jdesktop.layout.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)
+ .add(
+
radioButtonPanel,
+
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
+
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
+
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(
+
org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(
+
layout
+
.createParallelGroup(
+
org.jdesktop.layout.GroupLayout.BASELINE)
+
.add(selectButton)
+
.add(
+
networkFileTextField))
+ .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()));
}
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-16 10:56:39 UTC (rev 16277)
+++
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/URLHandler.java
2009-03-16 13:51:34 UTC (rev 16278)
@@ -15,6 +15,7 @@
import org.cytoscape.property.bookmark.Category;
import org.cytoscape.property.bookmark.DataSource;
import org.cytoscape.work.Tunable;
+import org.jdesktop.layout.GroupLayout;
public class URLHandler extends AbstractGuiHandler {
@@ -26,6 +27,8 @@
String urlstr;
BookmarkComboBoxEditor bookmarkEditor = new BookmarkComboBoxEditor();
JComboBox networkFileComboBox;
+ JLabel titleLabel = new JLabel("Import URL file");
+ private JSeparator titleSeparator;
private String pleaseMessage = "Please provide URL or select from list";
@@ -33,6 +36,7 @@
super(f,o,t);
this.bkUtil=bkUtil;
this.theBookmarks=bookmarks;
+ titleSeparator = new JSeparator();
try{
this.url= (URL) f.get(o);
}catch(Exception e){e.printStackTrace();}
@@ -45,7 +49,6 @@
List<Category> theCategoryList =
bookmarks.getCategory();
theCategoryList.add(theCategory);
}
-
networkFileComboBox = new JComboBox();
networkFileComboBox.setRenderer(new MyCellRenderer());
networkFileComboBox.setEditor(bookmarkEditor);
@@ -53,6 +56,69 @@
networkFileComboBox.setName("networkFileComboBox");
networkFileComboBox.setToolTipText("<html><body>You can specify
URL by the following:<ul><li>Type URL</li><li>Select from pull down
menu</li><li>Drag & Drop URL from Web Browser</li></ul></body><html>");
+
+ final ToolTipManager tp = ToolTipManager.sharedInstance();
+ tp.setInitialDelay(1);
+ tp.setDismissDelay(7500);
+
+
+ GroupLayout layout = new GroupLayout(panel);
+ panel.setLayout(layout);
+ layout.setHorizontalGroup(layout
+ .createParallelGroup(
+
org.jdesktop.layout.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)
+ .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()));
+
//panel = new JPanel(new BorderLayout());
panel.add(new JLabel("URL Path = "));
panel.add(networkFileComboBox);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
