Author: mmichaud
Date: 2009-04-02 07:55:52 -0700 (Thu, 02 Apr 2009)
New Revision: 16418

Added:
   
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/InputStreamChoose.java
   
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/proxy.java
Modified:
   
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/PrintSomething.java
   
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/fileChoose.java
   
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/input.java
Log:


Added: 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/InputStreamChoose.java
===================================================================
--- 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/InputStreamChoose.java
        2009-04-02 14:55:36 UTC (rev 16417)
+++ 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/InputStreamChoose.java
        2009-04-02 14:55:52 UTC (rev 16418)
@@ -0,0 +1,21 @@
+package org.cytoscape.command;
+
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import org.cytoscape.work.*;
+
+public class InputStreamChoose implements Command{
+
+       @Tunable(description = "URL choose",group = {"Import Network File"})
+       public InputStream is;
+       
+       public InputStreamChoose(){
+//             try{
+//                     url = new URL("");
+//             }catch(MalformedURLException e){e.printStackTrace();}
+       }
+
+       public void execute(){}
+       
+}
\ No newline at end of file

Modified: 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/PrintSomething.java
===================================================================
--- 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/PrintSomething.java
   2009-04-02 14:55:36 UTC (rev 16417)
+++ 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/PrintSomething.java
   2009-04-02 14:55:52 UTC (rev 16418)
@@ -12,15 +12,15 @@
        @Tunable(description="your last name", group={"stuff","advanced"}, 
flag={Param.collapsed})
        public String lastName = "simpson";
 
-       @Tunable(description="Test",dependsOn="monthNames=[April]")
+       @Tunable(description="Test",dependsOn="dayNames=[Wednesday]")
        public Double test = new Double(6.5);   
        
-       @Tunable(description="your foot size", group={"stuff2"})
-       public BoundedDouble footSize = new BoundedDouble(5.0, 8.5, 13.5, true, 
false);
-
-       @Tunable(description="the number of children you 
have",flag={Param.slider})
-       public BoundedInteger kids = new BoundedInteger(0, 1, 10, true, false);
-
+//     @Tunable(description="your foot size", group={"stuff2"})
+//     public BoundedDouble footSize = new BoundedDouble(5.0, 8.5, 13.5, true, 
false);
+//
+//     @Tunable(description="the number of children you 
have",flag={Param.slider})
+//     public BoundedInteger kids = new BoundedInteger(0, 1, 10, true, false);
+//
        @Tunable(description="Month",group={"Today's date"})
        public ListMultipleSelection<String> monthNames = new 
ListMultipleSelection<String>("January","February","March","April","May","June","July","August","September","October","November","December");
        

Modified: 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/fileChoose.java
===================================================================
--- 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/fileChoose.java
       2009-04-02 14:55:36 UTC (rev 16417)
+++ 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/fileChoose.java
       2009-04-02 14:55:52 UTC (rev 16418)
@@ -3,22 +3,13 @@
 import java.io.File;
 
 import org.cytoscape.work.Tunable;
-import org.cytoscape.work.util.myFile;
 
 
 public class fileChoose implements Command {
        
        
        @Tunable(description = "File example",group={"Import Network File"})
-       public myFile myfile;
-
+       public File file;       
        
-       public fileChoose(){
-               File[] files = new File[1];
-               File file = new File("");
-               myfile = new myFile(file);
-       }
-       
-       
        public void execute() {}
 }

Modified: 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/input.java
===================================================================
--- 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/input.java
    2009-04-02 14:55:36 UTC (rev 16417)
+++ 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/input.java
    2009-04-02 14:55:52 UTC (rev 16418)
@@ -27,16 +27,16 @@
        public BoundedInteger bounded = new BoundedInteger(0,45,130,false,true);
 
        
-       @Tunable(description = "Linkage",group={"Hierarchical cluster 
Settings"})
+       @Tunable(description = "Linkage",group={"Hierarchical cluster 
Settings",""},alignment={Param.vertical,Param.horizontal})
        public ListSingleSelection<String> linkages = new 
ListSingleSelection<String>("pairwise average-linkage","pairwise 
single-linkage","pairwise maximum-linkage","pairwise centroid-linkage");
 
-       @Tunable(description = "Distance Metric",group={"Hierarchical cluster 
Settings"})
+       @Tunable(description = "Distance Metric",group={"Hierarchical cluster 
Settings",""})
        public ListSingleSelection<String> distances = new 
ListSingleSelection<String>("Euclidean Distance","City block distance","Pearson 
correlation","Pearson correlation, absolute value");
 
        @Tunable(description="Array sources",group={"Hierarchical cluster 
Settings","Source for array data"})
        public ListMultipleSelection<String> sources = new 
ListMultipleSelection<String>("node.degree","node.gal1RGexp","node.gal1RGsig","node.gal4RGexp","node.gal4RGsig","node.gal80RGexp");
        
-       @Tunable(description="Cluster attributes as well as 
nodes",group={"Hierarchical cluster Settings"})
+       @Tunable(description="Cluster attributes as well as 
nodes",group={"Hierarchical cluster Settings"},alignment={Param.vertical})
        public Boolean bool = new Boolean(false);
        
        

Added: 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/proxy.java
===================================================================
--- 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/proxy.java
    2009-04-02 14:55:36 UTC (rev 16417)
+++ 
csplugins/trunk/pasteur/mathieu/tunables2/src/main/java/org/cytoscape/command/proxy.java
    2009-04-02 14:55:52 UTC (rev 16418)
@@ -0,0 +1,33 @@
+package org.cytoscape.command;
+
+
+import org.cytoscape.work.Tunable;     
+import org.cytoscape.work.Tunable.Param;
+import org.cytoscape.work.util.ListSingleSelection;
+
+public class proxy implements Command{
+
+//     @TunablesValidator
+//     TunablesValidator validator = new MyValidator();
+       
+       @Tunable(description="Type")
+       public ListSingleSelection<String> type = new 
ListSingleSelection<String>("direct","http","socks");
+       
+       @Tunable(description="Host 
name",group={""},dependsOn="type!=direct",alignment={Param.horizontal})
+       public String hostname="";      
+       
+       
@Tunable(description="Port",group={""},dependsOn="type!=direct",alignment={Param.horizontal})
+       public int port;
+       
+       public void execute() {
+       }
+       
+//     class MyValidator implements TunablesValidator
+//     {
+//             public String validate()
+//             {
+//                     
+//             }
+//     }
+       
+}
\ No newline at end of file


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