Author: kono
Date: 2012-04-27 14:57:55 -0700 (Fri, 27 Apr 2012)
New Revision: 29034
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_L.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_NL.png
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/about_icons.txt
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTaskFactory.java
Log:
fixes #854 Some model organism icons are added to the resource directory.
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/CyActivator.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -1,7 +1,14 @@
package org.cytoscape.ding;
+import static org.cytoscape.work.ServiceProperties.ID;
+import static org.cytoscape.work.ServiceProperties.TITLE;
+
+import java.net.URL;
+import java.util.Enumeration;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Properties;
+import java.util.Set;
import org.cytoscape.application.CyApplicationConfiguration;
import org.cytoscape.application.CyApplicationManager;
@@ -39,7 +46,6 @@
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyTableFactory;
-import org.cytoscape.model.CyTableManager;
import org.cytoscape.model.subnetwork.CyRootNetworkManager;
import org.cytoscape.property.CyProperty;
import org.cytoscape.property.PropertyUpdatedListener;
@@ -66,16 +72,14 @@
import org.cytoscape.work.undo.UndoSupport;
import org.osgi.framework.BundleContext;
-import static org.cytoscape.work.ServiceProperties.*;
-
public class CyActivator extends AbstractCyActivator {
public CyActivator() {
super();
}
+ @Override
public void start(BundleContext bc) {
-
startSpacial(bc);
startCustomGraphicsMgr(bc);
startPresentationImpl(bc);
@@ -247,7 +251,8 @@
VisualMappingManager vmmServiceRef = getService(bc,
VisualMappingManager.class);
CustomGraphicsManagerImpl customGraphicsManager = new
CustomGraphicsManagerImpl(coreCyPropertyServiceRef,
- dialogTaskManagerServiceRef,
cyApplicationConfigurationServiceRef, eventHelperServiceRef, vmmServiceRef,
cyApplicationManagerServiceRef);
+ dialogTaskManagerServiceRef,
cyApplicationConfigurationServiceRef, eventHelperServiceRef,
+ vmmServiceRef, cyApplicationManagerServiceRef,
getdefaultImageURLs(bc));
CustomGraphicsBrowser browser = new
CustomGraphicsBrowser(customGraphicsManager);
registerAllServices(bc, browser, new Properties());
@@ -257,6 +262,21 @@
registerAllServices(bc, customGraphicsManager, new
Properties());
registerService(bc, customGraphicsManagerAction,
CyAction.class, new Properties());
}
+
+ /**
+ * Get list of default images from resource.
+ *
+ * @param bc
+ * @return Set of default image files in the bundle
+ */
+ private Set<URL> getdefaultImageURLs(BundleContext bc) {
+ Enumeration<URL> e =
bc.getBundle().findEntries("images/sampleCustomGraphics", "*.png", true);
+ final Set<URL> defaultImageUrls = new HashSet<URL>();
+ while (e.hasMoreElements())
+ defaultImageUrls.add(e.nextElement());
+
+ return defaultImageUrls;
+ }
private void startSpacial(BundleContext bc) {
RTreeFactory rtreeFactory = new RTreeFactory();
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/bitmap/URLImageCustomGraphics.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -37,17 +37,8 @@
private BufferedImage originalImage;
private BufferedImage scaledImage;
- private URL sourceUrl;
-
+ private URL sourceUrl;
-// public URLImageCustomGraphics(String url) throws IOException {
-// super(url);
-// this.tags.add(DEF_TAG);
-// createImage(url);
-// buildCustomGraphics(originalImage);
-// }
-
-
public URLImageCustomGraphics(Long id, String url) throws IOException {
super(id, url);
this.tags.add(DEF_TAG);
@@ -55,22 +46,7 @@
buildCustomGraphics(originalImage);
}
-// /**
-// *
-// * @param name
-// * - display name of this object. NOT UNIQUE!
-// * @param img
-// */
-// public URLImageCustomGraphics(String name, BufferedImage img) {
-// super(name);
-// if (img == null)
-// throw new IllegalArgumentException("Image cannot be
null.");
-//
-// this.tags.add(DEF_TAG);
-// this.originalImage = img;
-// buildCustomGraphics(originalImage);
-// }
-
+
/**
*
* @param name
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/vector/GradientRoundRectangleLayer.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -16,7 +16,6 @@
private int r =20;
-
public GradientRoundRectangleLayer(final Long id) {
super(id, NAME);
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/CustomGraphicsManagerImpl.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -3,10 +3,13 @@
import java.io.File;
import java.net.URL;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,7 +41,6 @@
private static final String IMAGE_DIR_NAME = "images3";
private static final String APP_NAME =
"org.cytoscape.ding.customgraphicsmgr";
- private static final String SESSION_IMAGE_DIR_NAME = "custom_graphics";
protected final Map<Long, CyCustomGraphics> graphicsMap = new
ConcurrentHashMap<Long, CyCustomGraphics>();
@@ -63,7 +65,7 @@
*/
public CustomGraphicsManagerImpl(final CyProperty<Properties>
properties, final DialogTaskManager taskManager,
final CyApplicationConfiguration config, final
CyEventHelper eventHelper, final VisualMappingManager vmm,
- final CyApplicationManager applicationManager) {
+ final CyApplicationManager applicationManager, final
Set<URL> defaultImageURLs) {
this.taskManager = taskManager;
this.eventHelper = eventHelper;
@@ -79,14 +81,16 @@
if (props == null)
throw new NullPointerException("Property is missing.");
+ // Usually, this is USER_HOME/.cytoscape/images3
this.imageHomeDirectory = new
File(config.getConfigurationDirectoryLocation(), IMAGE_DIR_NAME);
- logger.debug("\n!!!!!!!!!!!!!!!!! Cytoscape image directory: "
+ imageHomeDirectory.toString());
-
+ // Add NULL graphics. This will be used to reset Custom
Graphics.
graphicsMap.put(NULL.getIdentifier(), NULL);
this.isUsedCustomGraphics.put(NULL, false);
- final RestoreImageTaskFactory taskFactory = new
RestoreImageTaskFactory(imageHomeDirectory, this, eventHelper, vmm,
applicationManager);
+ // Restore Custom Graphics from the directory.
+ final RestoreImageTaskFactory taskFactory = new
RestoreImageTaskFactory(defaultImageURLs, imageHomeDirectory, this, eventHelper,
+ vmm, applicationManager);
taskManager.execute(taskFactory.createTaskIterator());
}
@@ -278,7 +282,7 @@
if (files != null && files.size() != 0) {
// get parent directory
final File parent =
files.get(0).getParentFile();
- final RestoreImageTaskFactory
taskFactory = new RestoreImageTaskFactory(parent, this, eventHelper, vmm,
applicationManager);
+ final RestoreImageTaskFactory
taskFactory = new RestoreImageTaskFactory(new HashSet<URL>(), parent, this,
eventHelper, vmm, applicationManager);
taskManager.execute(taskFactory.createTaskIterator());
}
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTask.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -23,6 +23,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
import javax.imageio.ImageIO;
@@ -33,7 +35,9 @@
import org.cytoscape.ding.customgraphics.vector.GradientOvalLayer;
import org.cytoscape.ding.customgraphics.vector.GradientRoundRectangleLayer;
import
org.cytoscape.ding.customgraphicsmgr.internal.event.CustomGraphicsLibraryUpdatedEvent;
+import org.cytoscape.ding.impl.DNodeView;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.graph.render.stateful.CustomGraphic;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskMonitor;
import org.slf4j.Logger;
@@ -42,6 +46,9 @@
public class RestoreImageTask implements Task {
private static final Logger logger =
LoggerFactory.getLogger(RestoreImageTask.class);
+
+ // Preset image location.
+ private static final String DEF_IMAGE_LOCATION =
"images/sampleCustomGraphics";
private final CustomGraphicsManagerImpl manager;
@@ -55,6 +62,7 @@
private File imageHomeDirectory;
private final CyEventHelper eventHelper;
+ private final Set<URL> defaultImageURLs;
// For image I/O, PNG is used as bitmap image format.
private static final String IMAGE_EXT = "png";
@@ -71,24 +79,25 @@
DEF_VECTORS_NAMES.add(cls.getName());
}
- RestoreImageTask(final File imageLocaiton, final
CustomGraphicsManagerImpl manager, final CyEventHelper eventHelper) {
+ RestoreImageTask(final Set<URL> defaultImageURLs, final File
imageLocaiton, final CustomGraphicsManagerImpl manager, final CyEventHelper
eventHelper) {
this.manager = manager;
this.eventHelper = eventHelper;
// For loading images in parallel.
this.imageLoaderService =
Executors.newFixedThreadPool(NUM_THREADS);
this.imageHomeDirectory = imageLocaiton;
+ this.defaultImageURLs = defaultImageURLs;
}
- RestoreImageTask(final File imageLocaiton, Collection<File> fileList,
final CustomGraphicsManagerImpl manager, final CyEventHelper eventHelper) {
- this.manager = manager;
- this.eventHelper = eventHelper;
+// RestoreImageTask(final File imageLocaiton, Collection<File> fileList,
final CustomGraphicsManagerImpl manager, final CyEventHelper eventHelper) {
+// this.manager = manager;
+// this.eventHelper = eventHelper;
+//
+// // For loading images in parallel.
+// this.imageLoaderService =
Executors.newFixedThreadPool(NUM_THREADS);
+// this.imageHomeDirectory = imageLocaiton;
+// }
- // For loading images in parallel.
- this.imageLoaderService =
Executors.newFixedThreadPool(NUM_THREADS);
- this.imageHomeDirectory = imageLocaiton;
- }
-
private void restoreDefaultVectorImageObjects() {
final Class<?>[] types = { Long.class };
@@ -142,6 +151,7 @@
final long startTime = System.currentTimeMillis();
restoreImages();
+ restoreSampleImages();
restoreDefaultVectorImageObjects();
long endTime = System.currentTimeMillis();
@@ -150,6 +160,26 @@
eventHelper.fireEvent(new
CustomGraphicsLibraryUpdatedEvent(manager));
}
+
+ private void restoreSampleImages() throws IOException {
+ // Filter by display name
+ final Collection<CyCustomGraphics> allGraphics =
manager.getAllCustomGraphics();
+ final Set<String> names = new HashSet<String>();
+ for(CyCustomGraphics cg: allGraphics)
+ names.add(cg.getDisplayName());
+
+ for (final URL imageURL : defaultImageURLs) {
+ final String[] parts = imageURL.getFile().split("/");
+ final String dispNameString = parts[parts.length-1];
+ if (this.manager.getCustomGraphicsBySourceURL(imageURL)
== null && !names.contains(dispNameString)) {
+ final CyCustomGraphics<?> cg = new
URLImageCustomGraphics(manager.getNextAvailableID(), imageURL.toString());
+ if (cg != null) {
+ manager.addCustomGraphics(cg, imageURL);
+ cg.setDisplayName(dispNameString);
+ }
+ }
+ }
+ }
private void restoreImages() {
final CompletionService<BufferedImage> cs = new
ExecutorCompletionService<BufferedImage>(imageLoaderService);
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTaskFactory.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTaskFactory.java
2012-04-27 21:51:48 UTC (rev 29033)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphicsmgr/internal/RestoreImageTaskFactory.java
2012-04-27 21:57:55 UTC (rev 29034)
@@ -1,6 +1,8 @@
package org.cytoscape.ding.customgraphicsmgr.internal;
import java.io.File;
+import java.net.URL;
+import java.util.Set;
import org.cytoscape.application.CyApplicationManager;
import org.cytoscape.event.CyEventHelper;
@@ -16,19 +18,21 @@
private final VisualMappingManager vmm;
private final CyApplicationManager applicationManager;
+ private final Set<URL> defaultImageURLs;
- RestoreImageTaskFactory(final File imageLocation, final
CustomGraphicsManagerImpl manager,
+ RestoreImageTaskFactory(final Set<URL> defaultImageURLs, final File
imageLocation, final CustomGraphicsManagerImpl manager,
final CyEventHelper eventHelper, final
VisualMappingManager vmm, final CyApplicationManager applicationManager) {
this.manager = manager;
this.imageLocation = imageLocation;
this.eventHelper = eventHelper;
this.vmm = vmm;
this.applicationManager = applicationManager;
+ this.defaultImageURLs = defaultImageURLs;
}
@Override
public TaskIterator createTaskIterator() {
- final RestoreImageTask firstTask = new
RestoreImageTask(imageLocation, manager, eventHelper);
+ final RestoreImageTask firstTask = new
RestoreImageTask(defaultImageURLs, imageLocation, manager, eventHelper);
final TaskIterator itr = new TaskIterator(firstTask);
itr.insertTasksAfter(firstTask, new
ReplaceDummyGraphicsTask(vmm, manager, applicationManager));
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Arabidopsis_thaliana_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Caenorhabditis_elegans_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Danio_rerio_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Drosophila_melanogaster_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Escherichia_coli_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Homo_sapiens_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Lotus_japonicus_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Mus_musculus_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Oryza_sativa_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Rattus_norvegicus_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Saccharomyces_cerevisiae_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_L.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_L.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_NL.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/Triticum_aestivum_NL.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/about_icons.txt
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/about_icons.txt
(rev 0)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/sampleCustomGraphics/about_icons.txt
2012-04-27 21:57:55 UTC (rev 29034)
@@ -0,0 +1,5 @@
+Taxonomy icon © Database Center for Life Science licensed under CC
Attribution2.1 Japan
+
+Icons in this directory are available from DBCLS web site:
+
+http://biosciencedbc.jp/taxonomy_icon/taxonomy_icon.cgi?gg=resource_icon&lng=en
\ No newline at end of file
--
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.