Author: pwang
Date: 2011-05-09 11:26:08 -0700 (Mon, 09 May 2011)
New Revision: 24962

Modified:
   
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
   
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
Log:
Change visibility of some fields (from private to protected)

Modified: 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
===================================================================
--- 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
 2011-05-09 17:30:02 UTC (rev 24961)
+++ 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
 2011-05-09 18:26:08 UTC (rev 24962)
@@ -45,22 +45,21 @@
 
 public class QuickStartTask extends AbstractTask {
 
-       private static final String LOAD_NETWORK = "Load a Network";
-       private static final String LOAD_TABLE = "Load an Attribute Table";
-       private static final String LOAD_SUBNETWORK = "Create subnetwork from 
interactome";
+       protected static final String LOAD_NETWORK = "Load a Network";
+       protected static final String LOAD_TABLE = "Load an Attribute Table";
+       protected static final String LOAD_SUBNETWORK = "Create subnetwork from 
interactome";
        
        // @Tunable(description="What would you like to do today?\nCytoscape 
requires at the minimum a network to do anything.  A network and attributes 
makes life much better.  If you don't have a network, that's OK, we'll help you 
find one.")
        @Tunable(description = "What would you like to do today?")
        public ListSingleSelection<String> selection = new 
ListSingleSelection<String>(
                        LOAD_NETWORK, LOAD_TABLE, LOAD_SUBNETWORK);
 
-       private final QuickStartState state;
-       private final ImportTaskUtil importTaskUtil;
+       protected final QuickStartState state;
+       protected final ImportTaskUtil importTaskUtil;
        
-       private final CyNetworkManager networkManager;
-       private final SubnetworkBuilderUtil subnetworkUtil;
+       protected final CyNetworkManager networkManager;
+       protected final SubnetworkBuilderUtil subnetworkUtil;
        
-       
        public QuickStartTask(final QuickStartState state, final ImportTaskUtil 
importTaskUtil, 
                        final CyNetworkManager networkManager, final 
SubnetworkBuilderUtil subnetworkUtil) {
                super();
@@ -71,6 +70,10 @@
        }
 
        public void run(TaskMonitor e) {
+               doLoading();
+       }
+       
+       protected void doLoading(){
                String selected = selection.getSelectedValue();
                if (selected == LOAD_NETWORK) {
                        insertTasksAfterCurrentTask(new LoadNetworkTask(state, 
importTaskUtil));
@@ -78,6 +81,6 @@
                        insertTasksAfterCurrentTask(new LoadTableTask(state, 
importTaskUtil));
                 else if (selected == LOAD_SUBNETWORK) {
                         insertTasksAfterCurrentTask(new 
SubnetworkBuilderTask(networkManager, subnetworkUtil));         
-               }
+               }               
        }
 }

Modified: 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
===================================================================
--- 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
  2011-05-09 17:30:02 UTC (rev 24961)
+++ 
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
  2011-05-09 18:26:08 UTC (rev 24962)
@@ -36,9 +36,9 @@
 
 public class QuickStartTaskFactory implements TaskFactory {
        
-       private final ImportTaskUtil util;
-       private final CyNetworkManager networkManager;
-       private final SubnetworkBuilderUtil subnetworkUtil;
+       protected final ImportTaskUtil util;
+       protected final CyNetworkManager networkManager;
+       protected final SubnetworkBuilderUtil subnetworkUtil;
        
        public QuickStartTaskFactory(final ImportTaskUtil util, 
                        final CyNetworkManager networkManager, final 
SubnetworkBuilderUtil subnetworkUtil) {

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