Author: kono
Date: 2010-10-08 16:43:38 -0700 (Fri, 08 Oct 2010)
New Revision: 22196
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/actions/ShowCustomGraphicsManagerAction.java
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/CytoscapeSessionReader.java
cytoscape/trunk/application/src/main/java/cytoscape/visual/VisualMappingManager.java
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/CustomGraphicsManager.java
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/ui/CustomGraphicsManagerDialog.java
Log:
Small issues related to Custom Graphics Manager had been fixed.
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/actions/ShowCustomGraphicsManagerAction.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/actions/ShowCustomGraphicsManagerAction.java
2010-10-08 20:59:15 UTC (rev 22195)
+++
cytoscape/trunk/application/src/main/java/cytoscape/actions/ShowCustomGraphicsManagerAction.java
2010-10-08 23:43:38 UTC (rev 22196)
@@ -12,6 +12,13 @@
import cytoscape.visual.customgraphic.RestoreImageTask;
import cytoscape.visual.customgraphic.ui.CustomGraphicsManagerDialog;
+/**
+ * Display Custom Graphics Manager GUI.
+ * First time user calls this function, manager loads image from
.cytoscape/images directory.
+ *
+ * @author kono
+ *
+ */
public class ShowCustomGraphicsManagerAction extends CytoscapeAction {
private static final long serialVersionUID = 5876533870116518191L;
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/CytoscapeSessionReader.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/CytoscapeSessionReader.java
2010-10-08 20:59:15 UTC (rev 22195)
+++
cytoscape/trunk/application/src/main/java/cytoscape/data/readers/CytoscapeSessionReader.java
2010-10-08 23:43:38 UTC (rev 22196)
@@ -401,7 +401,7 @@
.getCustomGraphicsManager();
// Remove all custom graphics before loading new images.
- manager.removeAll();
+ //manager.removeAll();
// First, restore image-based custom graphics
for (String id : imageMap.keySet()) {
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/VisualMappingManager.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/VisualMappingManager.java
2010-10-08 20:59:15 UTC (rev 22195)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/VisualMappingManager.java
2010-10-08 23:43:38 UTC (rev 22196)
@@ -330,8 +330,10 @@
if(cgMapping instanceof DiscreteMapping) {
final Map allMapping = ((DiscreteMapping)
cgMapping).getAll();
Collection cgSet = allMapping.values();
- for(Object cg: cgSet)
-
manager.setUsedInCurrentSession((CyCustomGraphics) cg, true);
+ for(Object cg: cgSet) {
+ if(cg != null)
+
manager.setUsedInCurrentSession((CyCustomGraphics) cg, true);
+ }
} else if(cgMapping instanceof ContinuousMapping) {
final List<ContinuousMappingPoint> points =
((ContinuousMapping) cgMapping).getAllPoints();
for(ContinuousMappingPoint point: points) {
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/CustomGraphicsManager.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/CustomGraphicsManager.java
2010-10-08 20:59:15 UTC (rev 22195)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/CustomGraphicsManager.java
2010-10-08 23:43:38 UTC (rev 22196)
@@ -85,10 +85,7 @@
this.isUsedCustomGraphics.put(NULL, false);
restoreDefaultVectorImageObjects();
- Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(
- Cytoscape.CYTOSCAPE_EXIT, this);
-
- //restoreImages();
+
Cytoscape.getPropertyChangeSupport().addPropertyChangeListener(Cytoscape.CYTOSCAPE_EXIT,
this);
}
/**
@@ -159,7 +156,7 @@
final BufferedImage image = f.get();
if (image == null)
continue;
-
+
final CyCustomGraphics cg = new
URLImageCustomGraphics(
fMap.get(f), image);
if (cg instanceof Taggable &&
metatagMap.get(f) != null)
@@ -357,9 +354,7 @@
}
public Boolean isUsedInCurrentSession(final CyCustomGraphics graphics) {
- if(graphics == null)
- throw new NullPointerException("CyCustomGraphics cannot
be null.");
- if(this.isUsedCustomGraphics.containsKey(graphics) ==false)
+ if(graphics == null ||
this.isUsedCustomGraphics.containsKey(graphics) == false)
return false;
return isUsedCustomGraphics.get(graphics);
@@ -367,7 +362,7 @@
public void setUsedInCurrentSession(final CyCustomGraphics graphics,
final Boolean isUsed) {
if(isUsed == null || graphics == null)
- throw new NullPointerException("Parameters cannot be
null.");
+ return;
if(this.isUsedCustomGraphics.containsKey(graphics) == false){
// Just ignore.
Modified:
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/ui/CustomGraphicsManagerDialog.java
===================================================================
---
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/ui/CustomGraphicsManagerDialog.java
2010-10-08 20:59:15 UTC (rev 22195)
+++
cytoscape/trunk/application/src/main/java/cytoscape/visual/customgraphic/ui/CustomGraphicsManagerDialog.java
2010-10-08 23:43:38 UTC (rev 22196)
@@ -1,6 +1,7 @@
package cytoscape.visual.customgraphic.ui;
import java.awt.Dimension;
+import java.awt.Frame;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
@@ -12,7 +13,7 @@
import javax.swing.JOptionPane;
import cytoscape.Cytoscape;
-import cytoscape.render.stateful.CustomGraphic;
+import cytoscape.logger.CyLogger;
import cytoscape.visual.customgraphic.CustomGraphicsManager;
import cytoscape.visual.customgraphic.CyCustomGraphics;
import cytoscape.visual.customgraphic.impl.bitmap.URLImageCustomGraphics;
@@ -27,6 +28,8 @@
private static final long serialVersionUID = 7681270324415099781L;
+ private static final CyLogger logger =
CyLogger.getLogger(CustomGraphicsManagerDialog.class);
+
// List of graphics available
private CustomGraphicsBrowser browser;
@@ -36,17 +39,22 @@
// Manager object for on-memory graphics.
private final CustomGraphicsManager manager;
- /** Creates new form CustomGraphicsManagerDialog */
- public CustomGraphicsManagerDialog(java.awt.Frame parent, boolean
modal) {
+ /**
+ * Creates new form CustomGraphicsManagerDialog
+ *
+ * @param parent
+ * @param modal
+ */
+ public CustomGraphicsManagerDialog(Frame parent, boolean modal) {
super(parent, modal);
manager =
Cytoscape.getVisualMappingManager().getCustomGraphicsManager();
initComponents();
try {
browser = new CustomGraphicsBrowser();
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ logger.error("Could not get CustomGraphicsBrowser
object.", e);
}
+
detail = new CustomGraphicsDetailPanel();
this.leftScrollPane.setViewportView(browser);
@@ -65,7 +73,6 @@
* regenerated by the Form Editor.
*/
@SuppressWarnings("unchecked")
- // <editor-fold defaultstate="collapsed" desc="Generated Code">
private void initComponents() {
buttonPanel = new javax.swing.JPanel();
--
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.
