Author: kono
Date: 2012-06-19 15:45:12 -0700 (Tue, 19 Jun 2012)
New Revision: 29626
Modified:
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
Log:
Minor source code cleanup only.
Modified:
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
===================================================================
---
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
2012-06-19 22:17:30 UTC (rev 29625)
+++
core3/impl/trunk/layout-prefuse-impl/src/main/java/org/cytoscape/prefuse/layouts/internal/ForceDirectedLayoutTask.java
2012-06-19 22:45:12 UTC (rev 29626)
@@ -29,23 +29,18 @@
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.layout.AbstractPartitionLayoutTask;
-import org.cytoscape.view.layout.EdgeWeighter;
import org.cytoscape.view.layout.LayoutEdge;
import org.cytoscape.view.layout.LayoutNode;
import org.cytoscape.view.layout.LayoutPartition;
import org.cytoscape.view.layout.LayoutPoint;
-import org.cytoscape.view.layout.WeightTypes;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import org.cytoscape.work.Tunable;
import org.cytoscape.work.undo.UndoSupport;
-import org.cytoscape.work.util.ListSingleSelection;
import prefuse.util.force.DragForce;
import prefuse.util.force.ForceItem;
@@ -56,28 +51,27 @@
/**
* This class wraps the Prefuse force-directed layout algorithm.
- * See {@link http://prefuse.org} for more detail.
+ *
+ * @see <a href="http://prefuse.org";>Prefuse web site</a>
*/
public class ForceDirectedLayoutTask extends AbstractPartitionLayoutTask {
private ForceSimulator m_fsim;
-
private ForceDirectedLayout.Integrators integrator;
-
private Map<LayoutNode,ForceItem> forceItems;
-
private ForceDirectedLayoutContext context;
/**
* Creates a new ForceDirectedLayout object.
*/
- public ForceDirectedLayoutTask(final String name, CyNetworkView
networkView, Set<View<CyNode>> nodesToLayOut, final ForceDirectedLayoutContext
context,
- final ForceDirectedLayout.Integrators
integrator, String attrName, UndoSupport undo) {
- super(name, context.singlePartition, networkView,
nodesToLayOut,attrName, undo);
+ public ForceDirectedLayoutTask(final String name, CyNetworkView
networkView, Set<View<CyNode>> nodesToLayOut,
+ final ForceDirectedLayoutContext context, final
ForceDirectedLayout.Integrators integrator,
+ String attrName, UndoSupport undo) {
+ super(name, context.singlePartition, networkView,
nodesToLayOut, attrName, undo);
this.context = context;
this.integrator = integrator;
-
+
edgeWeighter = context.edgeWeighter;
edgeWeighter.setWeightAttribute(layoutAttribute);
@@ -86,7 +80,7 @@
m_fsim.addForce(new SpringForce());
m_fsim.addForce(new DragForce());
- forceItems = new HashMap<LayoutNode,ForceItem>();
+ forceItems = new HashMap<LayoutNode, ForceItem>();
}
public String getName() {
--
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.
