Author: kono
Date: 2012-01-04 11:56:18 -0800 (Wed, 04 Jan 2012)
New Revision: 27917
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
Log:
Unnecessary parameters had been removed from constructor.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-01-04 19:47:18 UTC (rev 27916)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2012-01-04 19:56:18 UTC (rev 27917)
@@ -806,7 +806,7 @@
private void addHandleInternal(final int insertInx, final Point2D
handleLocation) {
synchronized (m_view.m_lock) {
final Bend bend = m_view.m_edgeDetails.bend(m_inx);
- final Handle handle = new HandleImpl(this.m_view, this,
handleLocation.getX(), handleLocation.getY());
+ final Handle handle = new
HandleImpl(handleLocation.getX(), handleLocation.getY());
//final Point2D.Float addThis = new Point2D.Float();
//addThis.setLocation(handleLocation);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-01-04 19:47:18 UTC (rev 27916)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/HandleImpl.java
2012-01-04 19:56:18 UTC (rev 27917)
@@ -12,6 +12,7 @@
*/
public class HandleImpl implements Handle {
+ // Original handle location
private double x;
private double y;
@@ -19,18 +20,14 @@
private double originalDist;
private double positionRatioOnEdge;
- public HandleImpl(DGraphView graphView, DEdgeView view, final double x,
- final double y) {
+ public HandleImpl(final double x, final double y) {
this.x = x;
this.y = y;
}
@Override
- public Point2D getPoint(DGraphView graphView, DEdgeView view) {
- return convertToAbsolute(graphView, view);
- }
+ public Point2D getPoint(final DGraphView graphView, final DEdgeView
view) {
- private Point2D convertToAbsolute(DGraphView graphView, DEdgeView view)
{
final CyNode source = view.getModel().getSource();
final CyNode target = view.getModel().getTarget();
final View<CyNode> sourceView = graphView.getNodeView(source);
@@ -64,7 +61,15 @@
return newPoint;
}
+
+ @Override
+ public void setPoint(DGraphView graphView, DEdgeView view, double x,
double y) {
+ this.x = x;
+ this.y = y;
+ convertToRatio(graphView, view, new Point2D.Double(x, y));
+ }
+
private void convertToRatio(DGraphView graphView, DEdgeView view,
final Point2D absolutePoint) {
orthVector = new double[2];
@@ -106,14 +111,4 @@
+ Math.pow(oY - sY, 2))
/ originalDist;
}
-
- @Override
- public void setPoint(DGraphView graphView, DEdgeView view, double x,
- double y) {
- this.x = x;
- this.y = y;
-
- convertToRatio(graphView, view, new Point2D.Double(x, y));
- }
-
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
2012-01-04 19:47:18 UTC (rev 27916)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/EdgeBendVisualProperty.java
2012-01-04 19:56:18 UTC (rev 27917)
@@ -22,12 +22,13 @@
@Override
public String toSerializableString(final Bend value) {
+
+
return value.toString();
}
@Override
public Bend parseSerializableString(String value) {
- // TODO: Implement parser for String representation of Bend.
return DEFAULT_EDGE_BEND;
}
}
--
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.
