Author: pwang
Date: 2010-10-25 10:24:54 -0700 (Mon, 25 Oct 2010)
New Revision: 22356
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/CyFileFilterImpl.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/bookmarks/BookmarkFileFilter.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/cysession/CysessionFileFilter.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLFileFilter.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
Log:
method name changed, accept to accepts
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/CyFileFilterImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/CyFileFilterImpl.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/CyFileFilterImpl.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -99,7 +99,7 @@
* @throws MalformedURLException
*
*/
- public boolean accept(URI uri, DataCategory category) {
+ public boolean accepts(URI uri, DataCategory category) {
// Check data category
if (category != this.category)
@@ -134,7 +134,7 @@
/**
* Must be overridden by subclasses.
*/
- public boolean accept(InputStream stream, DataCategory category) {
+ public boolean accepts(InputStream stream, DataCategory category) {
return false;
}
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/GenericReaderManager.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -75,7 +75,7 @@
CyFileFilter cff = factory.getCyFileFilter();
- if (cff.accept(uri, category) && uri != null ) {
+ if (cff.accepts(uri, category) && uri != null ) {
try {
factory.setInputStream(
uri.toURL().openStream() );
return
(R)factory.getTaskIterator().next();
@@ -101,7 +101,7 @@
// Because we don't know who will provide the
file filter or
// what they might do with the InputStream, we
provide a copy
// of the first 2KB rather than the stream
itself.
- if
(cff.accept(CopyInputStream.copyKBytes(stream,2), category)) {
+ if
(cff.accepts(CopyInputStream.copyKBytes(stream,2), category)) {
factory.setInputStream(stream);
return
(R)factory.getTaskIterator().next();
}
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/bookmarks/BookmarkFileFilter.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/bookmarks/BookmarkFileFilter.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/bookmarks/BookmarkFileFilter.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -32,7 +32,7 @@
}
@Override
- public boolean accept(URI uri, DataCategory category) {
+ public boolean accepts(URI uri, DataCategory category) {
try {
return accept(uri.toURL().openStream(), category);
} catch (IOException e) {
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/cysession/CysessionFileFilter.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/cysession/CysessionFileFilter.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/cysession/CysessionFileFilter.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -32,7 +32,7 @@
}
@Override
- public boolean accept(URI uri, DataCategory category) {
+ public boolean accepts(URI uri, DataCategory category) {
try {
return accept(uri.toURL().openStream(), category);
} catch (IOException e) {
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLFileFilter.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLFileFilter.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLFileFilter.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -24,7 +24,7 @@
}
@Override
- public boolean accept(InputStream stream, DataCategory category) {
+ public boolean accepts(InputStream stream, DataCategory category) {
if (!category.equals(DataCategory.NETWORK)) {
return false;
}
@@ -58,12 +58,12 @@
}
@Override
- public boolean accept(URI uri, DataCategory category) {
+ public boolean accepts(URI uri, DataCategory category) {
if (!category.equals(DataCategory.NETWORK)) {
return false;
}
try {
- return accept(streamUtil.getInputStream(uri.toURL()),
category);
+ return accepts(streamUtil.getInputStream(uri.toURL()),
category);
} catch (IOException e) {
Logger logger = LoggerFactory.getLogger(getClass());
logger.error("Error while reading header", e);
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
2010-10-25 17:22:37 UTC (rev 22355)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/xgmml/XGMMLFileFilter.java
2010-10-25 17:24:54 UTC (rev 22356)
@@ -35,7 +35,7 @@
}
@Override
- public boolean accept(URI uri, DataCategory category) {
+ public boolean accepts(URI uri, DataCategory category) {
try {
return accept(uri.toURL().openStream(), category);
} catch (IOException e) {
--
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.
