Author: mes
Date: 2009-07-24 12:20:14 -0700 (Fri, 24 Jul 2009)
New Revision: 17555
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/CLTaskFactoryInterceptor.java
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskFactoryGrabber.java
Log:
removed a bunch of printlns to clean up the output
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/CLTaskFactoryInterceptor.java
===================================================================
---
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/CLTaskFactoryInterceptor.java
2009-07-24 19:03:59 UTC (rev 17554)
+++
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/CLTaskFactoryInterceptor.java
2009-07-24 19:20:14 UTC (rev 17555)
@@ -110,7 +110,6 @@
System.out.println("The Task \"" + argsString + "\"
doesn't exist : Check the options");
printHelp(optionsOfTasks);
System.exit(0);
- //System.out.println("SHOULD CALL EXIT - print options of
tasks");
} else {
tasksWithTheirArgs.get(lastArg).add(argsString);
}
@@ -120,6 +119,7 @@
//print the different parsed arguments
+ /*
System.out.println("tasksWithTheirArgs :");
for(String st : tasksWithTheirArgs.keySet())
System.out.println(st + " = " + tasksWithTheirArgs.get(st));
@@ -129,6 +129,7 @@
for(String st : listOfChoosenTasks)
System.out.println(st);
System.out.println("\n\n\n");
+ */
@@ -149,7 +150,6 @@
System.err.println("Parsing command line failed: "
+pe.getMessage());
printHelp(optionsOfTasks);
System.exit(1);
- //System.out.println("SHOULD CALL EXIT - parser failed");
}
}
@@ -158,14 +158,12 @@
System.out.println("The General Help has been called");
printHelp(optionsOfTasks);
System.exit(0);
- //System.out.println("SHOULD CALL EXIT - called general help");
}
for (String st : listOfChoosenTasks) {
for (TFWrapper tf : taskMap.values()) {
if (st.equals(tf.getName())) {
- System.out.println("\n \n ########### factory loaded =
"+tf.getName()+" ###########");
String tFactoryName = tf.getName();
List<String> lst = new ArrayList<String>();
@@ -194,7 +192,6 @@
if (args.length == 0) {
printHelp(optionsOfTasks);
System.exit(0);
- //System.out.println("SHOULD CALL EXIT - no args");
}
}
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
===================================================================
---
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
2009-07-24 19:03:59 UTC (rev 17554)
+++
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TFWrapper.java
2009-07-24 19:20:14 UTC (rev 17555)
@@ -21,7 +21,6 @@
this.taskManager = taskManager;
this.ti = ti;
this.name = fact.getTask().getClass().getSimpleName();
- System.out.println("Name of the task is :" + name);
}
public Option getOption() {
@@ -32,34 +31,6 @@
return "-"+name;
}
- public void checkFactory(CommandLine line,Map<String,List<String>> map,
List<String> list) {
-// System.out.println("\n \n ########### factory loaded = "+name+"
###########");
-// String tFactoryName = getName();
-// List<String> lst = new ArrayList<String>();
-//
-// for(int i=0;i<map.get(tFactoryName).size();i++) {
-// if(map.get(tFactoryName).get(i).contains(" ")) {
-// int val =
map.get(tFactoryName).get(i).indexOf(" ");
-//
lst.add(map.get(tFactoryName).get(i).substring(0, val));
-//
lst.add(map.get(tFactoryName).get(i).substring(val+1));
-// }
-// else{
-//
lst.add(map.get(tFactoryName).get(i).toString());
-// }
-// }
-//
-// //creation of arguments
-// String[] args = new String[lst.size()];
-// for(int i=0;i<lst.size();i++)args[i]=lst.get(i);
-//
-//
-// System.out.println("#####arguments used are : ");
-// for(int
i=0;i<args.length;i++)System.out.println(args[i]+" ");
-// System.out.println("\n\n");
-//
-// executeTask(list.toArray(new String[lst.size()]));
- }
-
public void executeTask() {
Task task = factory.getTask();
ti.loadTunables(task);
Modified:
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskFactoryGrabber.java
===================================================================
---
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskFactoryGrabber.java
2009-07-24 19:03:59 UTC (rev 17554)
+++
core3/cmdline-parser-impl/trunk/src/main/java/org/cytoscape/cmdline/internal/TaskFactoryGrabber.java
2009-07-24 19:20:14 UTC (rev 17555)
@@ -14,19 +14,16 @@
private TunableInterceptor ti;
public TaskFactoryGrabber(TaskManager tm, TunableInterceptor ti) throws
InterruptedException {
- System.out.println("Grabber Called");
this.tm = tm;
this.ti = ti;
taskMap = new HashMap<TaskFactory,TFWrapper>();
}
synchronized public void addTaskFactory(TaskFactory factory, Map props)
{
- System.out.println("addTaskFactory called");
taskMap.put(factory, new TFWrapper(factory,tm,ti));
}
synchronized public void removeTaskFactory(TaskFactory factory, Map
props) {
- System.out.println("removeTaskFactory called");
taskMap.remove(factory);
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
