Author: clopes
Date: 2012-05-08 12:03:32 -0700 (Tue, 08 May 2012)
New Revision: 29149
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/session/SessionUtil.java
Log:
Removed this warning when reading 2.x session files:
-> WARN [org.cytoscape.io.internal.read.session.Cy2SessionReaderImpl] - Unknown
entry found in session zip file!
CytoscapeSession-2012_04_17-12_46/images/image_metadata.props
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
2012-05-08 19:00:01 UTC (rev 29148)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/read/session/Cy2SessionReaderImpl.java
2012-05-08 19:03:32 UTC (rev 29149)
@@ -29,6 +29,7 @@
import static
org.cytoscape.io.internal.util.session.SessionUtil.BOOKMARKS_FILE;
import static
org.cytoscape.io.internal.util.session.SessionUtil.CYSESSION_FILE;
+import static org.cytoscape.io.internal.util.session.SessionUtil.IMAGES_FOLDER;
import static org.cytoscape.io.internal.util.session.SessionUtil.NETWORK_ROOT;
import static
org.cytoscape.io.internal.util.session.SessionUtil.VIZMAP_PROPS_FILE;
import static org.cytoscape.io.internal.util.session.SessionUtil.XGMML_EXT;
@@ -172,7 +173,7 @@
}
} else if (entryName.endsWith(BOOKMARKS_FILE)) {
extractBookmarks(is, entryName);
- } else {
+ } else if (!entryName.contains("/" + IMAGES_FOLDER)) {
logger.warn("Unknown entry found in session zip
file!\n" + entryName);
}
}
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/session/SessionUtil.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/session/SessionUtil.java
2012-05-08 19:00:01 UTC (rev 29148)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/session/SessionUtil.java
2012-05-08 19:03:32 UTC (rev 29149)
@@ -49,6 +49,7 @@
public static final String NETWORK_VIEWS_FOLDER = "views/";
public static final String PROPERTIES_FOLDER = "properties/";
public static final String TABLES_FOLDER = "tables/";
+ public static final String IMAGES_FOLDER = "images/";
public static final String APPS_FOLDER = "apps/";
public static final String BOOKMARKS_FILE = "session_bookmarks.xml";
--
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.
