Author: jm
Date: 2012-09-12 13:57:11 -0700 (Wed, 12 Sep 2012)
New Revision: 30356
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
Log:
Fixes #1444: When continuous mapping changes are cancelled, the UI is updated
appropriately.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditorPanel.java
2012-09-12 19:45:01 UTC (rev 30355)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditorPanel.java
2012-09-12 20:57:11 UTC (rev 30356)
@@ -283,4 +283,9 @@
slider.repaint();
}
}
+
+ @Override
+ protected void cancelChanges() {
+ initSlider();
+ }
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditorPanel.java
2012-09-12 19:45:01 UTC (rev 30355)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditorPanel.java
2012-09-12 20:57:11 UTC (rev 30356)
@@ -294,4 +294,9 @@
return rend.getLegend(width, height);
}
+
+ @Override
+ protected void cancelChanges() {
+ initSlider();
+ }
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-09-12 19:45:01 UTC (rev 30355)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-09-12 20:57:11 UTC (rev 30356)
@@ -209,7 +209,7 @@
@Override
public void windowClosed(WindowEvent
event) {
if (!commitChanges) {
- cancelChanges();
+ cancelChangesInternal();
}
}
@@ -694,7 +694,7 @@
}
}
- void cancelChanges() {
+ void cancelChangesInternal() {
while (mapping.getPointCount() > 0) {
mapping.removePoint(0);
}
@@ -702,7 +702,11 @@
for (ContinuousMappingPoint<K, V> point :
original.getAllPoints()) {
mapping.addPoint(point.getValue(), point.getRange());
}
+ cancelChanges();
+ slider.repaint();
}
+
+ protected abstract void cancelChanges();
// End of variables declaration
protected class ThumbMouseListener extends MouseAdapter {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2012-09-12 19:45:01 UTC (rev 30355)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2012-09-12 20:57:11 UTC (rev 30356)
@@ -294,4 +294,9 @@
return rend.drawIcon(iconWidth, iconHeight, detail);
}
+
+ @Override
+ protected void cancelChanges() {
+ initSlider();
+ }
}
--
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.
