Author: kono
Date: 2011-09-20 16:04:44 -0700 (Tue, 20 Sep 2011)
New Revision: 26900
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/ObjectPlacerControl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Position.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/StrokeIcon.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/FlagAndSelectionHandler.java
Log:
Finished optimization for nodes.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/ObjectPlacerControl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/ObjectPlacerControl.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/ObjectPlacerControl.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -114,8 +114,8 @@
labelAnchors.setSelectedItem(labelAnchor.getName());
justifyCombo.setSelectedItem(lp.getJustify().getName());
- xoffsetBox.setText(new Integer((int)
lp.getOffsetX()).toString());
- yoffsetBox.setText(new Integer((int)
lp.getOffsetY()).toString());
+
xoffsetBox.setText(Integer.valueOf((int)lp.getOffsetX()).toString());
+ yoffsetBox.setText(Integer.valueOf((int)
lp.getOffsetY()).toString());
ignoreEvents = false;
repaint();
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Position.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Position.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/Position.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -76,7 +76,7 @@
return displayNames;
}
- private class Conversion {
+ private static final class Conversion {
// TODO: remove these numbers.
private static final int NW = 0;
private static final int N = 1;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/StrokeIcon.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/StrokeIcon.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/StrokeIcon.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -94,7 +94,6 @@
* Superimpose text if text object is not empty.
*/
if (superimposedText != null) {
- int strWidth =
SwingUtilities.computeStringWidth(g2d.getFontMetrics(), superimposedText);
if (textColor == null) {
g2d.setColor(Color.DARK_GRAY);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -1317,11 +1317,9 @@
private boolean hideGraphObjectInternal(Object obj,
boolean fireListenerEvents) {
if (obj instanceof DEdgeView) {
- int edgeInx;
CyEdge edge;
synchronized (m_lock) {
- edgeInx = ((DEdgeView) obj).getRootGraphIndex();
edge = ((DEdgeView) obj).getEdge();
edge.getCyRow("VIEW").set("hidden", true);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -48,6 +48,7 @@
* there is a threat of multiple threads.
*/
class DNodeDetails extends IntermediateNodeDetails {
+
final DGraphView m_view;
final IntObjHash m_colorsLowDetail = new IntObjHash();
final Object m_deletedEntry = new Object();
@@ -70,46 +71,39 @@
final Map<Integer, Double> m_labelOffsetXs = new HashMap<Integer,
Double>();
final Map<Integer, Double> m_labelOffsetYs = new HashMap<Integer,
Double>();
- DNodeDetails(DGraphView view) {
+ DNodeDetails(final DGraphView view) {
m_view = view;
}
- void unregisterNode(int node) {
- final Object o = m_colorsLowDetail.get(node);
+ void unregisterNode(final int nodeIdx) {
+ final Object o = m_colorsLowDetail.get(nodeIdx);
if ((o != null) && (o != m_deletedEntry))
- m_colorsLowDetail.put(node, m_deletedEntry);
+ m_colorsLowDetail.put(nodeIdx, m_deletedEntry);
- final Integer key = Integer.valueOf(node);
- m_shapes.remove(key);
- m_fillPaints.remove(key);
- m_borderWidths.remove(key);
- m_borderPaints.remove(key);
- m_labelWidths.remove(node);
- m_labelTextAnchors.remove(key);
- m_labelNodeAnchors.remove(key);
- m_labelJustifys.remove(key);
- m_labelOffsetXs.remove(key);
- m_labelOffsetYs.remove(key);
+ m_shapes.remove(nodeIdx);
+ m_fillPaints.remove(nodeIdx);
+ m_borderWidths.remove(nodeIdx);
+ m_borderPaints.remove(nodeIdx);
+ m_labelWidths.remove(nodeIdx);
+ m_labelTextAnchors.remove(nodeIdx);
+ m_labelNodeAnchors.remove(nodeIdx);
+ m_labelJustifys.remove(nodeIdx);
+ m_labelOffsetXs.remove(nodeIdx);
+ m_labelOffsetYs.remove(nodeIdx);
- final Object intr = m_labelCounts.remove(key);
- final int labelCount = ((intr == null) ? 0 : ((Integer)
intr).intValue());
+ final Integer intr = m_labelCounts.remove(nodeIdx);
+ final int labelCount = ((intr == null) ? 0 : intr);
for (int i = 0; i < labelCount; i++) {
- final Long lKey = Long.valueOf((((long) node) << 32) |
((long) i));
+ final Long lKey = (((long) nodeIdx) << 32) | ((long) i);
m_labelTexts.remove(lKey);
m_labelFonts.remove(lKey);
m_labelPaints.remove(lKey);
}
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+ @Override
public Color colorLowDetail(int node) {
final Object o = m_colorsLowDetail.get(node);
@@ -132,20 +126,14 @@
m_colorsLowDetail.put(node, color);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public byte shape(int node) {
- final Object o = m_shapes.get(new Integer(node));
+ @Override
+ public byte shape(final int node) {
+ final Byte shape = m_shapes.get(node);
- if (o == null)
+ if (shape == null)
return super.shape(node);
- return ((Byte) o).byteValue();
+ return shape;
}
/*
@@ -153,21 +141,11 @@
* A negative shape value has the special meaning to remove overridden
shape.
*/
void overrideShape(int node, DNodeShape shape) {
-// if ((shape < 0) || (shape == super.shape(node)))
-// m_shapes.remove(new Integer(node));
-// else
-// m_shapes.put(new Integer(node), new Byte(shape));
m_shapes.put(node, shape.getNativeShape());
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Paint fillPaint(int node) {
+ @Override
+ public Paint fillPaint(final int node) {
final Paint o = m_fillPaints.get(node);
if (o == null)
@@ -179,14 +157,15 @@
/*
* A null paint has the special meaning to remove overridden paint.
*/
- void overrideFillPaint(int node, Paint paint) {
+ void overrideFillPaint(final int node, final Paint paint) {
if ((paint == null) || paint.equals(super.fillPaint(node)))
- m_fillPaints.remove(Integer.valueOf(node));
+ m_fillPaints.remove(node);
else
- m_fillPaints.put(Integer.valueOf(node), paint);
+ m_fillPaints.put(node, paint);
}
+ @Override
public float borderWidth(final int node) {
final Float o = m_borderWidths.get(node);
@@ -199,111 +178,85 @@
/*
* A negative width value has the special meaning to remove overridden
width.
*/
- void overrideBorderWidth(int node, float width) {
+ void overrideBorderWidth(final int node, final float width) {
if ((width < 0.0f) || (width == super.borderWidth(node)))
- m_borderWidths.remove(Integer.valueOf(node));
+ m_borderWidths.remove(node);
else
- m_borderWidths.put(Integer.valueOf(node), new
Float(width));
+ m_borderWidths.put(node, width);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Paint borderPaint(int node) {
- final Object o = m_borderPaints.get(Integer.valueOf(node));
+ @Override
+ public Paint borderPaint(final int node) {
+ final Paint o = m_borderPaints.get(node);
if (o == null)
return super.borderPaint(node);
- return (Paint) o;
+ return o;
}
/*
* A null paint has the special meaning to remove overridden paint.
*/
- void overrideBorderPaint(int node, Paint paint) {
+ void overrideBorderPaint(final int node, final Paint paint) {
if ((paint == null) || paint.equals(super.borderPaint(node)))
- m_borderPaints.remove(Integer.valueOf(node));
+ m_borderPaints.remove(node);
else
- m_borderPaints.put(Integer.valueOf(node), paint);
+ m_borderPaints.put(node, paint);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public int labelCount(int node) {
- final Object o = m_labelCounts.get(Integer.valueOf(node));
+ @Override
+ public int labelCount(final int node) {
+ final Integer o = m_labelCounts.get(node);
if (o == null)
return super.labelCount(node);
- return ((Integer) o).intValue();
+ return o;
}
/*
* A negative labelCount has the special meaning to remove overridden
count.
*/
- void overrideLabelCount(int node, int labelCount) {
+ void overrideLabelCount(final int node, final int labelCount) {
if ((labelCount < 0) || (labelCount == super.labelCount(node)))
- m_labelCounts.remove(Integer.valueOf(node));
+ m_labelCounts.remove(node);
else
- m_labelCounts.put(Integer.valueOf(node),
Integer.valueOf(labelCount));
+ m_labelCounts.put(node, labelCount);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- * @param labelInx DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public String labelText(int node, int labelInx) {
+ @Override
+ public String labelText(final int node, final int labelInx) {
final long key = (((long) node) << 32) | ((long) labelInx);
- final Object o = m_labelTexts.get(Long.valueOf(key));
+ final String o = m_labelTexts.get(key);
if (o == null)
return super.labelText(node, labelInx);
- return (String) o;
+ return o;
}
/*
* A null text has the special meaning to remove overridden text.
*/
- void overrideLabelText(int node, int labelInx, String text) {
+ void overrideLabelText(final int node, final int labelInx, final String
text) {
final long key = (((long) node) << 32) | ((long) labelInx);
if ((text == null) || text.equals(super.labelText(node,
labelInx)))
- m_labelTexts.remove(Long.valueOf(key));
+ m_labelTexts.remove(key);
else
- m_labelTexts.put(Long.valueOf(key), text);
+ m_labelTexts.put(key, text);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- * @param labelInx DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+ @Override
public Font labelFont(int node, int labelInx) {
final long key = (((long) node) << 32) | ((long) labelInx);
- final Object o = m_labelFonts.get(Long.valueOf(key));
+ final Font o = m_labelFonts.get(key);
if (o == null)
return super.labelFont(node, labelInx);
- return (Font) o;
+ return o;
}
/*
@@ -318,14 +271,7 @@
m_labelFonts.put(key, font);
}
- /**
- * DOCUMENT ME!
- *
- * @param node DOCUMENT ME!
- * @param labelInx DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+ @Override
public Paint labelPaint(int node, int labelInx) {
final long key = (((long) node) << 32) | ((long) labelInx);
final Object o = m_labelPaints.get(Long.valueOf(key));
@@ -511,14 +457,15 @@
/*
* A negative width value has the special meaning to remove overridden
width.
*/
- void overrideLabelWidth(int node, double width) {
+ void overrideLabelWidth(final int node, final double width) {
if ((width < 0.0) || (width == super.labelWidth(node)))
- m_labelWidths.remove(new Integer(node));
+ m_labelWidths.remove(node);
else
- m_labelWidths.put(new Integer(node), new Double(width));
+ m_labelWidths.put(node, width);
}
- static byte convertG2ND(int giny) {
+
+ static byte convertG2ND(final int giny) {
switch (giny) {
case (Label.NORTH):
return NodeDetails.ANCHOR_NORTH;
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -1228,6 +1228,9 @@
if (vp == DVisualLexicon.NODE_SHAPE) {
setShape(((NodeShape) value));
} else if (vp == DVisualLexicon.NODE_SELECTED_PAINT) {
+ if(value == null)
+ return;
+
setSelectedPaint((Paint) value);
} else if (vp == MinimalVisualLexicon.NODE_SELECTED) {
setSelected((Boolean) value);
@@ -1237,6 +1240,9 @@
else
graphView.hideGraphObject(this);
} else if (vp == MinimalVisualLexicon.NODE_FILL_COLOR) {
+ if(value == null)
+ return;
+
setUnselectedPaint((Paint) value);
} else if (vp == DVisualLexicon.NODE_BORDER_PAINT) {
setBorderPaint((Paint) value);
@@ -1280,7 +1286,6 @@
applyCustomGraphics(vp,
(CyCustomGraphics<CustomGraphic>) value);
}
visualProperties.put(vp, value);
- //System.out.println(vp.getDisplayName() + " ### Apply to node
view called: " + value);
}
private void applyCustomGraphics(final VisualProperty<?> vp, final
CyCustomGraphics<CustomGraphic> customGraphics) {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/FlagAndSelectionHandler.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/FlagAndSelectionHandler.java
2011-09-20 22:56:58 UTC (rev 26899)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/FlagAndSelectionHandler.java
2011-09-20 23:04:44 UTC (rev 26900)
@@ -141,8 +141,6 @@
if (nodesOrEdges.isEmpty())
return;
- final CyTable table =
nodesOrEdges.iterator().next().getCyRow().getTable();
-
for (final CyTableEntry nodeOrEdge : nodesOrEdges)
nodeOrEdge.getCyRow().set(CyNetwork.SELECTED, selected);
}
--
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.
