Author: pwang
Date: 2011-10-12 16:46:12 -0700 (Wed, 12 Oct 2011)
New Revision: 27152
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
Log:
Clean up
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-10-12 23:28:29 UTC (rev 27151)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeDetails.java
2011-10-12 23:46:12 UTC (rev 27152)
@@ -293,36 +293,30 @@
}
-
-
-// //@Override
+ //@Override
public Paint targetArrowSelectedPaint(final int edge) {
-
//System.out.println("DEdgeDetails.targetArrowSelectedPaint()...ZZZZ");
-
final Paint arrowPaint =
this.m_targetArrowSelectedPaints.get(edge);
if (arrowPaint == null)
- if ( m_targetArrowSelectedPaintDefault == null )
+ if ( m_targetArrowSelectedPaintDefault == null ){
return super.targetArrowPaint(edge);
+ }
else
return m_targetArrowSelectedPaintDefault;
+
return arrowPaint;
}
-//
-//
- void setTargetArrowSelectedPaintDefault(Paint p) {
+
+
+ void setTargetArrowSelectedPaintDefault(Paint p) {
m_targetArrowSelectedPaintDefault = p;
}
-//
-//
-// /*
-// * A null paint has the special meaning to remove overridden paint.
-// */
- void overrideTargetArrowSelectedPaint(final int edge, final Paint
paint) {
-
System.out.println("DEdgeDetails.overrideTargetArrowSelectedPaint()...");
-
+ /*
+ * A null paint has the special meaning to remove overridden paint.
+ */
+ void overrideTargetArrowSelectedPaint(final int edge, final Paint
paint) {
if ((paint == null) ||
paint.equals(super.targetArrowPaint(edge)))
this.m_targetArrowSelectedPaints.remove(edge);
else {
@@ -330,10 +324,7 @@
isCleared = false;
}
}
-//
-//
-//=================
-
+
/**
* {@inheritDoc}
*/
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
2011-10-12 23:28:29 UTC (rev 27151)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DEdgeView.java
2011-10-12 23:46:12 UTC (rev 27152)
@@ -78,8 +78,6 @@
Paint m_sourceSelectedPaint;
Paint m_targetUnselectedPaint;
Paint m_targetSelectedPaint;
- Paint m_targetArrowSelectedPaint;
- Paint m_targetArrowUnselectedPaint;
int m_sourceEdgeEnd; // One of the EdgeView edge end constants.
int m_targetEdgeEnd; // Ditto.
ArrayList<Point2D> m_anchors; // A list of Point2D objects.
@@ -106,9 +104,7 @@
m_sourceUnselectedPaint =
m_view.m_edgeDetails.sourceArrowPaint(m_inx);
m_sourceSelectedPaint = Color.red;
m_targetUnselectedPaint =
m_view.m_edgeDetails.targetArrowPaint(m_inx);
- m_targetSelectedPaint = Color.red;
- m_targetArrowSelectedPaint =
m_view.m_edgeDetails.targetArrowSelectedPaint(m_inx);;
- m_targetArrowUnselectedPaint =
m_view.m_edgeDetails.targetArrowPaint(m_inx);;
+ m_targetSelectedPaint =
m_view.m_edgeDetails.targetArrowSelectedPaint(m_inx); //Color.red;
m_sourceEdgeEnd = GraphGraphics.ARROW_NONE;
m_targetEdgeEnd = GraphGraphics.ARROW_NONE;
m_anchors = null;
@@ -307,9 +303,7 @@
* @return DOCUMENT ME!
*/
public Paint getTargetEdgeEndPaint() {
- //System.out.println("\n\nDEdgeView.getTargetArrorPaint()...");
-
- return m_targetArrowUnselectedPaint;
+ return m_targetUnselectedPaint;
}
/**
@@ -318,10 +312,7 @@
* @return DOCUMENT ME!
*/
public Paint getTargetEdgeEndSelectedPaint() {
-
-
//System.out.println("\n\nDEdgeView.getTargetArrowSelectedPaint()...ABC");
-
- return m_targetArrowSelectedPaint;
+ return m_targetSelectedPaint;
}
/**
@@ -353,19 +344,15 @@
*/
public void setTargetEdgeEndSelectedPaint(Paint paint) {
-
//System.out.println("\n\nDEdgeView.setTargetEdgeEndSelectedPaint()...");
-
synchronized (m_view.m_lock) {
if (paint == null)
throw new NullPointerException("paint is null");
- //System.out.println("\tAAAAAAAA\n");
+ m_targetSelectedPaint = paint;
- m_targetArrowSelectedPaint = paint;
-
if (isSelected()) {
m_view.m_edgeDetails.overrideTargetArrowSelectedPaint(m_inx,
- m_targetArrowSelectedPaint);
+ m_targetSelectedPaint);
m_view.m_contentChanged = true;
}
}
--
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.
