Author: kono
Date: 2011-07-25 11:18:13 -0700 (Mon, 25 Jul 2011)
New Revision: 26261
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/SubnetworkBuilderUtil.java
Log:
Source code had been re-formatted because it was broken. No functional changes.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/SubnetworkBuilderUtil.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/SubnetworkBuilderUtil.java
2011-07-25 17:59:08 UTC (rev 26260)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/subnetworkbuilder/SubnetworkBuilderUtil.java
2011-07-25 18:18:13 UTC (rev 26261)
@@ -18,7 +18,6 @@
import
org.cytoscape.task.internal.quickstart.ImportNetworkFromPublicDataSetTask;
import
org.cytoscape.task.internal.quickstart.datasource.InteractionFilePreprocessor;
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
-import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.CyNetworkViewFactory;
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.view.vizmap.VisualMappingFunctionFactory;
@@ -28,93 +27,92 @@
public class SubnetworkBuilderUtil {
- private CyNetworkReaderManager mgr;
- private CyNetworkManager netmgr;
- protected final CyNetworkViewManager networkViewManager;
- private Properties props;
- private StreamUtil streamUtil;
+ private CyNetworkReaderManager mgr;
+ private CyNetworkManager netmgr;
+ protected final CyNetworkViewManager networkViewManager;
+ private Properties props;
+ private StreamUtil streamUtil;
- protected final CyEventHelper eventHelper;
- protected final CyApplicationManager appManager;
+ protected final CyEventHelper eventHelper;
+ protected final CyApplicationManager appManager;
- private CyNetworkNaming cyNetworkNaming;
+ private CyNetworkNaming cyNetworkNaming;
- private final CyRootNetworkFactory crnf;
- private final CyNetworkViewFactory cnvf;
+ private final CyRootNetworkFactory crnf;
+ private final CyNetworkViewFactory cnvf;
- private final Set<InteractionFilePreprocessor> processors;
+ private final Set<InteractionFilePreprocessor> processors;
- VisualStyleBuilder vsBuilder;
- final VisualMappingManager vmm;
+ VisualStyleBuilder vsBuilder;
+ final VisualMappingManager vmm;
- // For mapping generator
- final VisualStyleFactory vsFactory;
- private VisualMappingFunctionFactory discFactory;
- private VisualMappingFunctionFactory ptFactory;
- private final CyLayoutAlgorithmManager layouts;
+ // For mapping generator
+ final VisualStyleFactory vsFactory;
+ private VisualMappingFunctionFactory discFactory;
+ private VisualMappingFunctionFactory ptFactory;
+ private final CyLayoutAlgorithmManager layouts;
- public SubnetworkBuilderUtil(CyNetworkReaderManager mgr, CyNetworkManager
netmgr,
- final CyNetworkViewManager networkViewManager,
CyProperty<Properties> cyProps,
- CyNetworkNaming cyNetworkNaming, StreamUtil streamUtil, final
CyEventHelper eventHelper,
- final CyApplicationManager appManager, CyRootNetworkFactory crnf,
CyNetworkViewFactory cnvf,
- VisualMappingManager vmm, final VisualStyleFactory vsFactory, final
CyLayoutAlgorithmManager layouts) {
+ public SubnetworkBuilderUtil(CyNetworkReaderManager mgr,
CyNetworkManager netmgr,
+ final CyNetworkViewManager networkViewManager,
CyProperty<Properties> cyProps,
+ CyNetworkNaming cyNetworkNaming, StreamUtil streamUtil,
final CyEventHelper eventHelper,
+ final CyApplicationManager appManager,
CyRootNetworkFactory crnf, CyNetworkViewFactory cnvf,
+ VisualMappingManager vmm, final VisualStyleFactory
vsFactory, final CyLayoutAlgorithmManager layouts) {
- this.mgr = mgr;
- this.netmgr = netmgr;
- this.networkViewManager = networkViewManager;
- this.crnf = crnf;
- this.cnvf = cnvf;
- this.vmm = vmm;
- this.props = cyProps.getProperties();
- this.cyNetworkNaming = cyNetworkNaming;
- this.streamUtil = streamUtil;
- this.processors = new HashSet<InteractionFilePreprocessor>();
- this.eventHelper = eventHelper;
- this.appManager = appManager;
- this.vsFactory = vsFactory;
- this.layouts = layouts;
- }
+ this.mgr = mgr;
+ this.netmgr = netmgr;
+ this.networkViewManager = networkViewManager;
+ this.crnf = crnf;
+ this.cnvf = cnvf;
+ this.vmm = vmm;
+ this.props = cyProps.getProperties();
+ this.cyNetworkNaming = cyNetworkNaming;
+ this.streamUtil = streamUtil;
+ this.processors = new HashSet<InteractionFilePreprocessor>();
+ this.eventHelper = eventHelper;
+ this.appManager = appManager;
+ this.vsFactory = vsFactory;
+ this.layouts = layouts;
+ }
- public void addProcessor(InteractionFilePreprocessor processor, Map props)
{
- if (processor != null)
- this.processors.add(processor);
- }
+ public void addProcessor(InteractionFilePreprocessor processor, Map
props) {
+ if (processor != null)
+ this.processors.add(processor);
+ }
- public void removeProcessor(InteractionFilePreprocessor processor, Map
props) {
- if (processor != null)
- this.processors.remove(processor);
+ public void removeProcessor(InteractionFilePreprocessor processor, Map
props) {
+ if (processor != null)
+ this.processors.remove(processor);
- }
+ }
- public Task getWebServiceImportTask() {
- return new ImportNetworkFromPublicDataSetTask(processors, mgr, netmgr,
networkViewManager, props,
- cyNetworkNaming, streamUtil);
- }
+ public Task getWebServiceImportTask() {
+ return new ImportNetworkFromPublicDataSetTask(processors, mgr,
netmgr, networkViewManager, props,
+ cyNetworkNaming, streamUtil);
+ }
- Task getNewNetworkSelectedNodesOnlyTask(final CyNetwork network) {
- return new NewNetworkSelectedNodesOnlyTask(network, crnf, cnvf, netmgr,
networkViewManager, cyNetworkNaming,
- vmm, appManager);
- }
-
- Task getApplLayoutTask() {
- return new ApplyLayoutTask(this, layouts);
- }
+ Task getNewNetworkSelectedNodesOnlyTask(final CyNetwork network) {
+ return new NewNetworkSelectedNodesOnlyTask(network, crnf, cnvf,
netmgr, networkViewManager, cyNetworkNaming,
+ vmm, appManager);
+ }
- public void addFactory(VisualMappingFunctionFactory factory, Map props) {
+ Task getApplLayoutTask() {
+ return new ApplyLayoutTask(this, layouts);
+ }
+ public void addFactory(VisualMappingFunctionFactory factory, Map props)
{
- if (factory.toString().startsWith("Discrete Mapping"))
- discFactory = factory;
- else if (factory.toString().startsWith("Passthrough Mapping"))
- ptFactory = factory;
+ if (factory.toString().startsWith("Discrete Mapping"))
+ discFactory = factory;
+ else if (factory.toString().startsWith("Passthrough Mapping"))
+ ptFactory = factory;
- if (discFactory != null && ptFactory != null) {
- this.vsBuilder = new VisualStyleBuilder(vsFactory, discFactory,
ptFactory);
+ if (discFactory != null && ptFactory != null) {
+ this.vsBuilder = new VisualStyleBuilder(vsFactory,
discFactory, ptFactory);
+ }
}
- }
- void removeFactory(VisualMappingFunctionFactory factory, Map props) {
+ void removeFactory(VisualMappingFunctionFactory factory, Map props) {
- }
+ }
}
--
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.