Author: ruschein
Date: 2011-06-27 11:10:49 -0700 (Mon, 27 Jun 2011)
New Revision: 25952
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Changed ".table" to ".cytable" for Cytoscape session tables.
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-06-27 17:45:33 UTC (rev 25951)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-06-27 18:10:49 UTC (rev 25952)
@@ -1,13 +1,6 @@
/*
- Copyright (c) 2006, The Cytoscape Consortium (www.cytoscape.org)
+ Copyright (c) 2006, 2011, The Cytoscape Consortium (www.cytoscape.org)
- The Cytoscape Consortium is:
- - Institute for Systems Biology
- - University of California San Diego
- - Memorial Sloan-Kettering Cancer Center
- - Institut Pasteur
- - Agilent Technologies
-
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2.1 of the License, or
@@ -31,9 +24,10 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
+*/
package org.cytoscape.io.internal.read.session;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -100,7 +94,7 @@
public static final String CY_PROPS = "cytoscape.props";
public static final String XGMML_EXT = ".xgmml";
public static final String BOOKMARKS_FILE = "session_bookmarks.xml";
- private static final String TABLE_EXT = ".table";
+ private static final String TABLE_EXT = ".cytable";
public static final String NETWORK_ROOT = "Network Root";
public static final int MAJOR_DOC_VERSION = 3;
public static final Pattern NETWORK_PATTERN =
Pattern.compile(".*/([^/]+)[.]xgmml");
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
2011-06-27 17:45:33 UTC (rev 25951)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
2011-06-27 18:10:49 UTC (rev 25952)
@@ -341,7 +341,7 @@
String fileName;
Set<CyNetwork> networks = metadata.getCyNetworks();
if (networks.size() == 0) {
- fileName = String.format("global/%d-%s.table",
table.getSUID(), tableTitle);
+ fileName =
String.format("global/%d-%s.cytable", table.getSUID(), tableTitle);
} else {
CyNetwork network =
findIntersection(includedNetworks, networks);
if (network == null) {
@@ -350,7 +350,7 @@
String networkFileName =
getNetworkFileName(network);
String namespace =
escape(metadata.getNamespace());
String type =
escape(metadata.getType().getCanonicalName());
- fileName = String.format("%s/%s-%s-%s.table",
networkFileName, namespace, type, tableTitle);
+ fileName = String.format("%s/%s-%s-%s.cytable",
networkFileName, namespace, type, tableTitle);
}
zos.putNextEntry(new ZipEntry(sessionDir + fileName));
try {
Modified:
core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-27 17:45:33 UTC (rev 25951)
+++ core3/io-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-27 18:10:49 UTC (rev 25952)
@@ -317,7 +317,7 @@
<bean id="sessionTableFilter"
class="org.cytoscape.io.BasicCyFileFilter">
<constructor-arg index="0">
<set>
- <value>table</value>
+ <value>cytable</value>
</set>
</constructor-arg>
<constructor-arg index="1">
--
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.
