Author: mes
Date: 2011-03-30 15:54:30 -0700 (Wed, 30 Mar 2011)
New Revision: 24627
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyNetworkViewReaderManager.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyPropertyReaderManager.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CySessionReaderManager.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyTableReaderManager.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/InputStreamTaskFactory.java
Log:
added input name argument to all readers
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyNetworkViewReaderManager.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyNetworkViewReaderManager.java
2011-03-30 22:51:30 UTC (rev 24626)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyNetworkViewReaderManager.java
2011-03-30 22:54:30 UTC (rev 24627)
@@ -44,18 +44,20 @@
* that can read the URI, will set the InputStream for the factory and
* will return the reader task.
* @param uri The URI we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader than can read the specified URI. Will return null if
* no reader can be found.
*/
- CyNetworkViewReader getReader(URI uri);
+ CyNetworkViewReader getReader(URI uri, String inputName);
/**
* Given an InputStream this method will attempt to find a
InputStreamReaderFactory
* that can read the stream, will set the InputStream for the factory
and
* will return the reader task.
* @param stream The input stream we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader that can read the specified stream. Will return
null if
* no reader can be found.
*/
- CyNetworkViewReader getReader(InputStream stream);
+ CyNetworkViewReader getReader(InputStream stream, String inputName);
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyPropertyReaderManager.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyPropertyReaderManager.java
2011-03-30 22:51:30 UTC (rev 24626)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyPropertyReaderManager.java
2011-03-30 22:54:30 UTC (rev 24627)
@@ -15,18 +15,20 @@
* that can read the URI, will set the InputStream for the factory and
* will return the reader.
* @param uri The URI we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader than can read the specified URI. Will return null if
* no reader can be found.
*/
- CyPropertyReader getReader(URI uri);
+ CyPropertyReader getReader(URI uri, String inputName);
/**
* Given an InputStream this method will attempt to find a
InputStreamReaderFactory
* that can read the stream, will set the InputStream for the factory and
* will return the reader.
* @param stream The input stream we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader than can read the specified stream. Will return null if
* no reader can be found.
*/
- CyPropertyReader getReader(InputStream stream);
+ CyPropertyReader getReader(InputStream stream, String inputName);
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CySessionReaderManager.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CySessionReaderManager.java
2011-03-30 22:51:30 UTC (rev 24626)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CySessionReaderManager.java
2011-03-30 22:54:30 UTC (rev 24627)
@@ -15,18 +15,20 @@
* that can read the URI, will set the InputStream for the factory and
* will return the reader.
* @param uri The URI we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader than can read the specified URI. Will return null if
* no reader can be found.
*/
- CySessionReader getReader(URI uri);
+ CySessionReader getReader(URI uri, String inputName);
/**
* Given an {@link java.io.InputStream} this method will attempt to find a
InputStreamReaderFactory
* that can read the stream, will set the InputStream for the factory and
* will return the reader.
* @param stream The input stream we're attempting to read.
+ * @param inputName The name of the input.
* @return A reader than can read the specified stream. Will return null if
* no reader can be found.
*/
- CySessionReader getReader(InputStream stream);
+ CySessionReader getReader(InputStream stream, String inputName);
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyTableReaderManager.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyTableReaderManager.java
2011-03-30 22:51:30 UTC (rev 24626)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/CyTableReaderManager.java
2011-03-30 22:54:30 UTC (rev 24627)
@@ -45,18 +45,20 @@
* that can read the URI, will set the InputStream for the factory and
* will return the reader.
* @param uri The URI we're attempting to read.
+ * @param inputName A name given to the input.
* @return A reader than can read the specified URI. Will return null
* if no reader can be found.
*/
- CyTableReader getReader(URI uri);
+ CyTableReader getReader(URI uri, String inputName);
/**
* Given an {@link java.io.InputStream} this method will attempt to
find a InputStreamReaderFactory
* that can read the stream, will set the InputStream for the factory
and
* will return the reader.
* @param stream The input stream we're attempting to read.
+ * @param inputName A name given to the input.
* @return A reader than can read the specified stream. Will return null
* if no reader can be found.
*/
- CyTableReader getReader(InputStream stream);
+ CyTableReader getReader(InputStream stream, String inputName);
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/InputStreamTaskFactory.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/InputStreamTaskFactory.java
2011-03-30 22:51:30 UTC (rev 24626)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/InputStreamTaskFactory.java
2011-03-30 22:54:30 UTC (rev 24627)
@@ -15,6 +15,7 @@
* Sets the input stream that will be read by the Reader created from
* this factory.
* @param is The {@link java.io.InputStream} to be read.
+ * @param inputName The name of the input.
*/
- void setInputStream(InputStream is);
+ void setInputStream(InputStream is, String inputName);
}
--
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.
