Author: mmichaud
Date: 2009-03-27 09:00:48 -0700 (Fri, 27 Mar 2009)
New Revision: 16352

Modified:
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   
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/FloatHandler.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/IntegerHandler.java
   
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
Log:


Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   2009-03-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/DoubleHandler.java
   2009-03-27 16:00:48 UTC (rev 16352)
@@ -43,6 +43,10 @@
                                value = Double.parseDouble(f.get(o).toString());
                        }catch(Exception e){e.printStackTrace();}
                        JOptionPane.showMessageDialog(null,"A double was 
Expected"+newline+"Value will be set to default = "+value.doubleValue(), 
"Error",JOptionPane.ERROR_MESSAGE);
+                       try{
+                               jtf.setText(f.get(o).toString());
+                               jtf.setBackground(Color.white);
+                       }catch(Exception e){e.printStackTrace();}
                }
                try {
                        f.set(o,value.doubleValue());

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-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FileHandler.java
     2009-03-27 16:00:48 UTC (rev 16352)
@@ -1,216 +1,250 @@
-package org.cytoscape.work.internal.tunables;
-
-import java.awt.Font;
-import java.lang.reflect.*;
-import javax.swing.*;
-
-import java.io.File;
-
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.Tunable.Param;
-import org.jdesktop.layout.GroupLayout;
-import org.jdesktop.layout.LayoutStyle;
-
-import cytoscape.Cytoscape;
-
-
-public class FileHandler extends AbstractGuiHandler {
-
-       File myFile;
-       private JFileChooser fileChooser;
-       private JButton button;
-       private boolean filechoosen;
-       private JTextField networkFileTextField;
-       private ImageIcon image;
-       private JLabel titleLabel;
-       private JSeparator titleSeparator;
-
-       //FileUtil flUtil;
-       
-       protected FileHandler(Field f, Object o, Tunable t) {
-               super(f,o,t);
-               //this.flUtil = flUtil;
-               filechoosen = false;
-               fileChooser = new JFileChooser();
-
-               for(Param s :t.flag())if(s.equals(Param.network)){
-                       String[] biopax = {".xml",".rdf",".owl"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("BioPAX 
files",biopax));
-                       String[] xgmml ={".xml",".xgmml"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("XGMML 
files",xgmml));
-                       String[] psi ={".xml"};
-                       fileChooser.addChoosableFileFilter(new 
MyFilter("PSI-MI",psi));
-                       String[] sif={".sif"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("SIF 
files",sif));
-                       String[] gml={".gml"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("GML 
files",gml));
-                       String[] sbml={".xml",".sbml"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("SBML 
files",sbml));
-                       String[] allnetworks = 
{".xml",".rdf",".owl",".xgmml",".sif",".sbml"};
-                       fileChooser.addChoosableFileFilter(new MyFilter("All 
network files(*.xml, *.rdf, *.owl, *.xgmml, *.sif, *.sbml)",allnetworks));
-               }
-               for(Param s :t.flag())if(s.equals(Param.session)){
-                       fileChooser.addChoosableFileFilter(new 
MyFilter("Session files",".cys"));
-               }
-               for(Param s :t.flag())if(s.equals(Param.attributes)){
-                       fileChooser.addChoosableFileFilter(new 
MyFilter("Attributes files",""));
-               }
-       
-               titleSeparator = new JSeparator();
-               titleLabel = new JLabel("Import Network 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(true);
-               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();}
-               
-                               
-               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()));
-       }
-
-       
-       public void handle() {
-               if(!filechoosen){
-                       int ret = fileChooser.showOpenDialog(panel);
-                       if (ret == JFileChooser.APPROVE_OPTION) {
-                           File file = fileChooser.getSelectedFile();
-                               //File file = 
flUtil.getFile("TEST",FileUtil.LOAD);
-                               if ( file != null ) {
-                                       try{
-                                               f.set(o,file);
-                                       }catch (Exception e) { 
e.printStackTrace();}
-                                       networkFileTextField.setFont(new 
Font(null, Font.PLAIN,10));
-                                       
networkFileTextField.setText(file.getAbsolutePath());
-                                       filechoosen=true;
-                               }
-                       }
-               }
-       }
-
-    public String getState() {
-               String s;
-               try {
-                       Object obj = f.get(o);
-                       if ( obj == null )
-                               s = "";
-                       else
-                               s = obj.toString();
-               } catch (IllegalAccessException e) {
-                       e.printStackTrace();
-                       s = "";
-               }
-               return s;
-    }
-    
-    private class MyFilter extends javax.swing.filechooser.FileFilter {
-               
-       private final String description;
-       private String extension;
-       private String[] extensions;
- 
-       public MyFilter(String description, String extension){
-               super();
-               this.description = description;
-               this.extension = extension;
-       }
-    
-       public MyFilter(String description, String[] extensions) {
-               super();
-               this.description = description;
-               this.extensions = extensions;
-       }
- 
-       public boolean accept(File file){
-               if (file.isDirectory()) return true; 
-        
-               String fileName = file.getName().toLowerCase(); 
-        
-               if (extensions != null){
-                       boolean accept = false;
-                       for (int i=0; i<extensions.length; i++){
-                               if (fileName.endsWith(extensions[i])){
-                                       accept = true;
-                               }
-                       }
-                       return accept;
-               }
-               else {
-                       return fileName.endsWith(extension);
-               }        
-       }
-       
-           public String getDescription(){
-               return description;
-           }
-        
-           public String getExtension(){
-               return extension;
-           }
-        
-           public String[] getExtensions() {
-               return extensions;
-           }
-    } 
-}
+package org.cytoscape.work.internal.tunables;
+
+import java.awt.Font;
+import java.lang.reflect.*;
+import javax.swing.*;
+
+import java.awt.event.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
+import org.jdesktop.layout.GroupLayout;
+import org.jdesktop.layout.LayoutStyle;
+
+
+import cytoscape.Cytoscape;
+
+
+public class FileHandler extends AbstractGuiHandler {
+
+       File myFile;
+       private JFileChooser fileChooser;
+       private JButton chooseButton;
+       private JButton importButton;
+       private JTextField networkFileTextField;
+       private ImageIcon image;
+       private JLabel titleLabel;
+       private JSeparator titleSeparator;
+       private InputStream is = null;
+       private MouseClic mc;
+       //FileUtil flUtil;
+       
+       protected FileHandler(Field f, Object o, Tunable t) {
+               super(f,o,t);
+               //this.flUtil = flUtil;
+               fileChooser = new JFileChooser();
+
+               for(Param s :t.flag())if(s.equals(Param.network)){
+                       String[] biopax = {".xml",".rdf",".owl"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("BioPAX 
files",biopax));
+                       String[] xgmml ={".xml",".xgmml"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("XGMML 
files",xgmml));
+                       String[] psi ={".xml"};
+                       fileChooser.addChoosableFileFilter(new 
MyFilter("PSI-MI",psi));
+                       String[] sif={".sif"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("SIF 
files",sif));
+                       String[] gml={".gml"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("GML 
files",gml));
+                       String[] sbml={".xml",".sbml"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("SBML 
files",sbml));
+                       String[] allnetworks = 
{".xml",".rdf",".owl",".xgmml",".sif",".sbml"};
+                       fileChooser.addChoosableFileFilter(new MyFilter("All 
network files(*.xml, *.rdf, *.owl, *.xgmml, *.sif, *.sbml)",allnetworks));
+               }
+               for(Param s :t.flag())if(s.equals(Param.session)){
+                       fileChooser.addChoosableFileFilter(new 
MyFilter("Session files",".cys"));
+               }
+               for(Param s :t.flag())if(s.equals(Param.attributes)){
+                       fileChooser.addChoosableFileFilter(new 
MyFilter("Attributes files",""));
+               }
+       
+               titleSeparator = new JSeparator();
+               titleLabel = new JLabel("Import Network 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(true);
+               networkFileTextField.setFont(new Font(null, Font.ITALIC,12));
+               mc = new MouseClic(networkFileTextField);
+               networkFileTextField.addMouseListener(mc);
+               chooseButton = new JButton("Open a File...",image);
+               chooseButton.setActionCommand("open");
+               chooseButton.addActionListener(new myFileActionListener());
+               importButton = new JButton("import");
+               importButton.setActionCommand("import");
+               importButton.addActionListener(new myFileActionListener());
+               importButton.setEnabled(false);
+               
+               try{
+                       this.myFile=(File)f.get(o);
+               }catch(Exception e){e.printStackTrace();}
+               
+                               
+               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(chooseButton))
+                                               .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(chooseButton)
+                                               .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(chooseButton))
+                                               )
+                                               .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(chooseButton)
+                                                               
.add(networkFileTextField))
+                                               
.addPreferredGap(LayoutStyle.RELATED,3, Short.MAX_VALUE)
+                                               .addContainerGap()));
+       }
+
+       
+       public void handle() {
+               try{
+                       f.set(o,new File(networkFileTextField.getText()));
+               }catch(Exception e){e.printStackTrace();}
+       }
+
+       
+    public String getState() {
+               String s;
+               try {
+                       Object obj = f.get(o);
+                       if ( obj == null )
+                               s = "";
+                       else
+                               s = obj.toString();
+               } catch (IllegalAccessException e) {
+                       e.printStackTrace();
+                       s = "";
+               }
+               return s;
+    }
+
+
+    private class myFileActionListener implements ActionListener{
+       public void actionPerformed(ActionEvent ae){
+               if(ae.getActionCommand().equals("open")){
+                       int ret = fileChooser.showOpenDialog(panel);
+                       if (ret == JFileChooser.APPROVE_OPTION) {
+                               File file = fileChooser.getSelectedFile();
+                               //File file = 
flUtil.getFile("TEST",FileUtil.LOAD);
+                               if ( file != null ) {
+                                       networkFileTextField.setFont(new 
Font(null, Font.PLAIN,10));
+                                       
networkFileTextField.setText(file.getAbsolutePath());
+                                       
networkFileTextField.removeMouseListener(mc);
+                               }
+                       }
+               }
+               if(ae.getActionCommand().equals("import")){
+                       
+               }
+       }
+    }
+    
+    
+    private class MouseClic extends MouseAdapter implements MouseListener{
+       JComponent component;
+       public MouseClic(JComponent component) {
+               this.component = component;
+       }
+       public void mouseClicked(MouseEvent e){
+               ((JTextField)component).setText("");
+       }
+    }
+    
+    private class MyFilter extends javax.swing.filechooser.FileFilter {
+               
+       private final String description;
+       private String extension;
+       private String[] extensions;
+ 
+       public MyFilter(String description, String extension){
+               super();
+               this.description = description;
+               this.extension = extension;
+       }
+    
+       public MyFilter(String description, String[] extensions) {
+               super();
+               this.description = description;
+               this.extensions = extensions;
+       }
+ 
+       public boolean accept(File file){
+               if (file.isDirectory()) return true; 
+        
+               String fileName = file.getName().toLowerCase(); 
+        
+               if (extensions != null){
+                       boolean accept = false;
+                       for (int i=0; i<extensions.length; i++){
+                               if (fileName.endsWith(extensions[i])){
+                                       accept = true;
+                               }
+                       }
+                       return accept;
+               }
+               else {
+                       return fileName.endsWith(extension);
+               }        
+       }
+       
+           public String getDescription(){
+               return description;
+           }
+        
+           public String getExtension(){
+               return extension;
+           }
+        
+           public String[] getExtensions() {
+               return extensions;
+           }
+    } 
+}

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
    2009-03-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/FloatHandler.java
    2009-03-27 16:00:48 UTC (rev 16352)
@@ -42,6 +42,10 @@
                                value = Double.parseDouble(f.get(o).toString());
                        }catch(Exception e){e.printStackTrace();}
                JOptionPane.showMessageDialog(null,"A float was 
Expected"+newline+"Value will be set to default = "+value.floatValue(), 
"Error",JOptionPane.ERROR_MESSAGE);
+               try{
+                       jtf.setText(f.get(o).toString());
+                       jtf.setBackground(Color.white);
+               }catch(Exception e){e.printStackTrace();}
                }
                try {
                        f.set(o,value.floatValue());

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-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/InputStreamHandler.java
      2009-03-27 16:00:48 UTC (rev 16352)
@@ -4,7 +4,11 @@
 import java.awt.Component;
 import java.awt.Font;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,7 +38,6 @@
        private String urlstr;
        private JComboBox networkFileComboBox;
        private JFileChooser fileChooser;
-       private boolean filechoosen;
        private JSeparator titleSeparator;
        private String pleaseMessage = "Please provide URL or select from list";
 
@@ -44,6 +47,7 @@
        private JRadioButton remoteRadioButton;
        private JRadioButton localRadioButton;
        private JTextField networkFileTextField;
+       private MouseClic mc;
        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>";
        
@@ -54,7 +58,6 @@
                //this.stUtil=stUtil;
                titleLabel = new JLabel("Import Network File");
                this.theBookmarks=bookmarks;
-               filechoosen = false;
                fileChooser = new JFileChooser();
                bookmarkEditor = new BookmarkComboBoxEditor();
                try{
@@ -76,23 +79,10 @@
        
        public void handle() {
                if(localRadioButton.isSelected()){
-                       if(!filechoosen){
-                               int ret = fileChooser.showOpenDialog(null);
-                               if (ret == JFileChooser.APPROVE_OPTION){
-                                       //File file = flUtil.getFile("Import 
Network File",flUtil.LOAD);
-                                   File file = fileChooser.getSelectedFile();
-                                       if ( file != null ){
-                                               try{
-//                                                     InStream = 
flUtil.getInputStream(file.getAbsolutePath());
-                                                       InStream = new 
BufferedInputStream(new FileInputStream(file));
-                                                       f.set(o,InStream);
-                                               }catch (Exception e) { 
e.printStackTrace();}
-                                               
networkFileTextField.setFont(new Font(null, Font.PLAIN,10));
-                                               
networkFileTextField.setText(file.getPath());
-                                       }
-                               }
-                       }
-                       filechoosen=true;
+                       try{
+                               InStream = new BufferedInputStream(new 
FileInputStream(networkFileTextField.getText()));
+                               f.set(o,InStream);
+                       }catch(Exception e){e.printStackTrace();}
                }
                else if(remoteRadioButton.isSelected()){
                        urlstr = bookmarkEditor.getURLstr();
@@ -143,8 +133,12 @@
                
                networkFileTextField.setText("Please select a network file...");
                networkFileTextField.setName("networkFileTextField");
+               mc = new MouseClic(networkFileTextField);
+               networkFileTextField.addMouseListener(mc);
 
                selectButton.setText("Select");
+               selectButton.addActionListener(new myFileActionListener());
+               selectButton.setActionCommand("open");
 
                networkFileComboBox.setRenderer(new MyCellRenderer());
                networkFileComboBox.setEditor(bookmarkEditor);
@@ -277,7 +271,6 @@
                LocalRemoteListener l = new LocalRemoteListener();
                localRadioButton.addActionListener(l);
                remoteRadioButton.addActionListener(l);
-               selectButton.addActionListener(this);
        }
 
     
@@ -319,7 +312,35 @@
                }
        }
     
+       private class myFileActionListener implements ActionListener{
+       public void actionPerformed(ActionEvent ae){
+               if(ae.getActionCommand().equals("open")){
+                       int ret = fileChooser.showOpenDialog(panel);
+                       if (ret == JFileChooser.APPROVE_OPTION) {
+                               File file = fileChooser.getSelectedFile();
+                               //File file = 
flUtil.getFile("TEST",FileUtil.LOAD);
+                               if ( file != null ) {
+                                       networkFileTextField.setFont(new 
Font(null, Font.PLAIN,10));
+                                       
networkFileTextField.setText(file.getAbsolutePath());
+                                       
networkFileTextField.removeMouseListener(mc);
+                               }
+                       }
+               }
+       }
+    }
     
+    
+    private class MouseClic extends MouseAdapter implements MouseListener{
+       JComponent component;
+       public MouseClic(JComponent component) {
+               this.component = component;
+       }
+       public void mouseClicked(MouseEvent e){
+               ((JTextField)component).setText("");
+       }
+    }
+       
+    
        private class BookmarkComboBoxEditor implements ComboBoxEditor {
                DataSource theDataSource = new DataSource();
                JTextField tfInput = new JTextField(pleaseMessage);

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
  2009-03-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/IntegerHandler.java
  2009-03-27 16:00:48 UTC (rev 16352)
@@ -43,6 +43,10 @@
                                value = Double.parseDouble(f.get(o).toString());
                        }catch(Exception e){e.printStackTrace();}
                JOptionPane.showMessageDialog(null,"An Integer was 
Expected"+newline+"Value will be set to default = "+value.intValue(), 
"Error",JOptionPane.ERROR_MESSAGE);
+               try{
+                       jtf.setText(f.get(o).toString());
+                       jtf.setBackground(Color.white);
+               }catch(Exception e){e.printStackTrace();}
                }
                try {
                        f.set(o,value.intValue());

Modified: 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
===================================================================
--- 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
     2009-03-27 00:18:19 UTC (rev 16351)
+++ 
core3/work-swing-impl/trunk/src/main/java/org/cytoscape/work/internal/tunables/LongHandler.java
     2009-03-27 16:00:48 UTC (rev 16352)
@@ -41,6 +41,10 @@
                                value = Double.parseDouble(f.get(o).toString());
                        }catch(Exception e){e.printStackTrace();}
                JOptionPane.showMessageDialog(null,"A long was 
Expected"+newline+"Value will be set to default = "+value.longValue(), 
"Error",JOptionPane.ERROR_MESSAGE);       
+               try{
+                       jtf.setText(f.get(o).toString());
+                       jtf.setBackground(Color.white);
+               }catch(Exception e){e.printStackTrace();}
                }
                try {
                        f.set(o,value.longValue());


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to